Commit Graph

10052 Commits

Author SHA1 Message Date
Tobias Berger 36ee8429c5
Fix cherrypick mistakes 2026-06-03 21:52:36 +02:00
Ilya246 368918d46a
more
(cherry picked from commit c033e516f20478efd8509eac6ee15930a5d473e8)
2026-06-03 21:32:01 +02:00
Ilya246 04efdf82f6
ops
(cherry picked from commit 5a925c0f1bf8db999728ceaeba458f0c81f128e4)
2026-06-03 21:30:38 +02:00
deltanedas ac50abeab8
make lathes automatable
(cherry picked from commit 3767aba3a1036db46acc9bd1087c4497dbe53a7a)
2026-06-03 21:10:52 +02:00
KOTOB 0eca06ccdf
RandomHumanoidApperance keep gender parameter (#5932)
gender AND sex? #notverywokeofyou
2026-05-31 16:25:29 +02:00
pathetic meowmeow 6ab48778fb
Merge pull request #5798 from sowelipililimute/work/jblackquill/es-audiovisual-sauce-bundle
The audiovisual sauce bundle
2026-05-30 09:34:27 -04:00
Nemanja 132b3d829d Hark, Sparks! (#491)
* Basic improvements to sparks

* Pull spark configuration out of SparkOnHit component

* Add various sparks to tasers, batons, RCD

* Add sparks back to electrocution

* Adjust new projectiles

* Tile fires on cable cuts

* That's a terrible idea, actually

* Add a custom PreventCollide system

* Make the new prevent collide component prevent collisions
2026-05-30 09:16:20 -04:00
Nemanja 00ff4d5d9b Sparks (#273)
* Add pointlight despawning visuals for sparks

* Add sprite fade out

* Add spark prototypes

* Add sparking behavior to lights

* Integrate sparks with some different stuff

* Remove invalid field
2026-05-30 09:16:20 -04:00
DisposableCrewmember42 2999917b39
tweak: enable preset cooldowns (#5489)
tweak: properly document and enable preset cooldowns in config, adjust cooldown values
2026-05-30 14:25:28 +02:00
BarryNorfolk 438e83ec1e
[K9] Give Laika and other secdogs Access + Tracking (#5001)
* Add dataset for Secdog names

* Split secdog into a base + other dogs so laika keeps her name

* Add new system for enabling subdermal ID cards

* Check for subdermal ID cards for access and sensor information

* Add MindOnlyAccess marker component

* Add new generic K9 officer role for secdogs

* Add Laika/K9 officers to security

* Update Laika's role to match K9 officer

* Add subdermal implants and mind only access for K9 officers

* Set MobSecDogBase to abstract

* Set K9Officer card to sec colours

* Update comments for Subdermal IDCard

* Move mind check for access above log for access

* Re-use ImplanterComponent's slot name

* Move idcard container const into component as well

* Add missing setPreference and requirements to k9 officer

* Ensure admin tricks work on subdermal ID cards

* Remove subdermal ID cards from showing in nanochat

* Move secdogs.yml to _DV namespace

* Fix typo

* Unduplicate container id name
2026-05-29 22:33:11 +02:00
Apachito a5c651d372
Port Portable Chem Mixer from Goob (#5532)
* Port

* Update tags.ftl

* Update portable_chem_master.yml

* Update portable_chem_master.yml

* new sprites

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Trying to put the new sprites

* New sprites work now yippe

* Changed crafting recipe

* FIxed recipe

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update portable_chem_master.yml

* Rename equipped-suitStorage.png to equipped-SUITSTORAGE.png

Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com>

* Update Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml

Co-authored-by: Radezolid <snappednexus@gmail.com>
Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com>

* Update tags.ftl

* Update tags.ftl

* Update tags.ftl

* Update RobustToolbox

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update RobustToolbox

* Revert "Update RobustToolbox"

This reverts commit d3fd3d5f68.

* Revert "Update RobustToolbox"

This reverts commit d3fd3d5f68.

* Reapply "Update RobustToolbox"

This reverts commit 6cc86f3707.

* Revert "Reapply "Update RobustToolbox""

This reverts commit 8d38d2d327.

* Update RobustToolbox

* Fix RobustToolbox version

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Removed fill sprites and ability in the yaml file

---------

Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Radezolid <snappednexus@gmail.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>
2026-05-29 13:08:48 +02:00
Sir Warock 8d4401ccaf
Buff Zap (#5694)
* Buff Zap

* Typo fix

* Reduced Glimmer Generation

* fix

* Rewrite with Events

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2026-05-28 20:56:45 +02:00
Sir Warock 455e232a38
Buff MassSleep (#5692)
* Buff Masssleep

* Increase Glimmer Creation

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Removed Stupidness

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Fix

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2026-05-28 20:06:11 +02:00
DisposableCrewmember42 e9b74fbef4
feat: OOC/LOOC/Deadchat muting (#5858)
* feat: LOOC/OOC/Deadchat muting

* refactor: split OocMuteCommands.cs into 3 files

* tweak: use proper admin logging

* refactor: remove unused loc args

* feat: one mute command, channel as argument

- properly marked target player in admin log so it actually alerts.

* refactor: completion options made named constant, used in error message

* tweak: display supported channels in help too

* fix: pass command to help string again

* style: add whitespace

Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>
Signed-off-by: DisposableCrewmember42 <disposablecrewmember42@proton.me>

---------

Signed-off-by: DisposableCrewmember42 <disposablecrewmember42@proton.me>
Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>
2026-05-28 12:56:19 -04:00
Theo 42589dc185
Prisoner arrivals fix (#5885)
* doesn't work

* akesi fixed it

* Apply suggestions from code review

Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>
Signed-off-by: pathetic meowmeow <uhhadd@gmail.com>

---------

Signed-off-by: pathetic meowmeow <uhhadd@gmail.com>
Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>
2026-05-25 14:59:40 +00:00
KOTOB 9122a1ba4c
Real Trait System™ tweaks (#5598)
* tweakies

* BUT WAIT! THERE'S MORE!

* Trait priority

yoinked from a couple changes made in 1c69ec2035 (diff-e92e9895e4a58647a9e8958c891cae3104f45517f933efff4e0c10491fe48930)

* not confident enough to try comparison godo
2026-05-25 16:57:36 +02:00
KOTOB 82bde19134
Make Psionic Eruption less dangerous (#5878)
* we hate fun!

* popup rewording

* adjustment
2026-05-25 08:43:46 -05:00
pathetic meowmeow 0ed24648aa
Announce job joins to their departments only (#5863) 2026-05-24 09:13:26 -05:00
Stxcking 7b80369206
PORT: Added Holoflare Gun from Frontier (#5837)
* Holoflare Gun

-Created a bunch of file in _NF namespace
-Added flare ammo to energy gun systems
-Basically anything relating the holoflare from the NF repo :>

* DV related

-Added the holoflare gun to any place that made sense to have it

* Engi Borg + Fix

* yaml liner fixes

* voucher is true

* Added FlareGunPellet deletion to Skia Scream

Other CR requests

* Update Content.Shared/_DV/Psionics/Systems/PsionicPowers/PsychokineticScreamPowerSystem.cs

Signed-off-by: pathetic meowmeow <uhhadd@gmail.com>

---------

Signed-off-by: pathetic meowmeow <uhhadd@gmail.com>
Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>
2026-05-22 16:18:46 +00:00
Coryn cb62b27fcf
Nubody (2/3) - ShitMed removal (#5844)
* Reapply "Nubody Merge" (#5807)

This reverts commit d62f7cef10.

* Revert "Nubody Merge (#5670)"

This reverts commit b465cfb3fd.

* Revert "IPC fibers (#4968)"

This reverts commit c2b42211f0.

* Revert "IPC Polymorph fix (#4545)"

This reverts commit fa03d8c655.

* Revert "fix IPC not having humanoid emotes (#4445)"

This reverts commit 216fdf999f.

* Revert "ipc heat/cold (#4306)"

This reverts commit fafd5cf816.

* Revert "ipc cables (#4283)"

This reverts commit 54958039a1.

* Revert "feat: ipcs now have dynamic power draw based off movement speed (#3917)"

This reverts commit 71e8b7e64b.

* Revert "fix ipcs not being able to disarm (#3374)"

This reverts commit 764c4dcf54.

* Revert "make steel heal caustic for ipcs (#3206)"

This reverts commit 450ac82550.

* Revert "add missing ipc survival boxes (#3065)"

This reverts commit 888c9cdb00.

* Revert "make borgs use ipc repairing (#3064)"

This reverts commit f77a49dd0b.

* Revert "Update hud.yml to add ipcs to diagnostic hud (#3019)"

This reverts commit 7220643531.

* Revert "Tweak IPCs (#2979)"

This reverts commit 98b47476de.

* Revert "fix nukies ipc test fail (#2957)"

This reverts commit 4a1acbf863.

* Revert "fix ipc nukies not getting comms (#2884)"

This reverts commit 8a2254770e.

* Revert "fix ipc encryption key mispredict (#2879)"

This reverts commit f08726efc1.

* Revert "Merge pull request #2800 from Spielern/port-ipc"

This reverts commit 822fa4312c, reversing
changes made to fe4c23c702.

* Remove and Fix rest of IPC Hangons causing crashes

* Integration test Errors

* Expand migration file with removed IPC stuff

* IPC Leg was found and migrated to naught

* Revert "Merge pull request #2542 from deltanedas/shitmed-ops"

This reverts commit 83a8002922, reversing
changes made to baa89b0052.

* Revert "Set up surgical augments infrastructure & add tool panel augments (#3059)"

This reverts commit a40f0be6fd.

* Revert "Psionic Prosthetics (#4689)"

This reverts commit 2679bb238a.

* Revert "Add surgical cleanliness and sanitation (#2847)"

This reverts commit 64565ba4f7.

* Remove unremoved mentions

* Revert "Add autoclave to easily sanitize large amounts of items and faster (#2933)"

This reverts commit d0da90fa2e.

* Shit Med Removed

* Remove _ShitMed Folders and fix Errors in Console

* Add OrganAnimalBrain into the mirgraiton file

* Heads no Input Mover

* Monke

* Full migration file I guess

* oops

* shiv state fix

* Restore accidental deleted recipe

* Forgot one flt mention

* Fix more issues

* Comment out Damage Visual for motorkind for now

* Motorkind...

* Commenting stuff out for now

* thought there'd be more of this to gut

---------

Co-authored-by: Janet Blackquill <uhhadd@gmail.com>
2026-05-21 20:27:04 -04:00
Coryn 1f8afb9ba6
Nubody (1/3) - Ipc removal (#5840)
* Reapply "Nubody Merge" (#5807)

This reverts commit d62f7cef10.

* Revert "Nubody Merge (#5670)"

This reverts commit b465cfb3fd.

* Revert "IPC fibers (#4968)"

This reverts commit c2b42211f0.

* Revert "IPC Polymorph fix (#4545)"

This reverts commit fa03d8c655.

* Revert "fix IPC not having humanoid emotes (#4445)"

This reverts commit 216fdf999f.

* Revert "ipc heat/cold (#4306)"

This reverts commit fafd5cf816.

* Revert "ipc cables (#4283)"

This reverts commit 54958039a1.

* Revert "feat: ipcs now have dynamic power draw based off movement speed (#3917)"

This reverts commit 71e8b7e64b.

* Revert "fix ipcs not being able to disarm (#3374)"

This reverts commit 764c4dcf54.

* Revert "make steel heal caustic for ipcs (#3206)"

This reverts commit 450ac82550.

* Revert "add missing ipc survival boxes (#3065)"

This reverts commit 888c9cdb00.

* Revert "make borgs use ipc repairing (#3064)"

This reverts commit f77a49dd0b.

* Revert "added ipc plushie (batteries not included) (#3023)"

This reverts commit 743cdbb606.

* Revert "Update hud.yml to add ipcs to diagnostic hud (#3019)"

This reverts commit 7220643531.

* Revert "Tweak IPCs (#2979)"

This reverts commit 98b47476de.

* Revert "fix nukies ipc test fail (#2957)"

This reverts commit 4a1acbf863.

* Revert "fix ipc nukies not getting comms (#2884)"

This reverts commit 8a2254770e.

* Revert "fix ipc encryption key mispredict (#2879)"

This reverts commit f08726efc1.

* remove oil

* Revert "Merge pull request #2800 from Spielern/port-ipc"

This reverts commit 822fa4312c, reversing
changes made to fe4c23c702.

* Remove and Fix rest of IPC Hangons causing crashes

* Integration test Errors

* Expand migration file with removed IPC stuff

* IPC Leg was found and migrated to naught

* motorkinds need to inherit an actual species base

* forgot the alerts

* irrelevant coscult code

* excess casualties

---------

Co-authored-by: Janet Blackquill <uhhadd@gmail.com>
2026-05-19 18:53:01 -04:00
DisposableCrewmember42 afc2655c0a
fix: Admin QOL Patches (#5618)
* fix: lslaws should only list when lawbound, no law boards!

* tweak: avoid spamming ssd/cadet search strip alerts

* docs: add missing import comments

* fix: also don't alert when finishing to butcher a monkey

* refactor: rename added function

* refactor: break out target/user values for stripping alerts too

* tweak: a newline less

* fix: use continue instead of return when encountering offline watchlisted player

Signed-off-by: DisposableCrewmember42 <disposablecrewmember42@proton.me>

* tweak: the hands alert doesn't need to always alert on living ssd

Signed-off-by: DisposableCrewmember42 <disposablecrewmember42@proton.me>

* tweak: add ghost check to stripping alerts, different values for hand strip

* fix: check for ghost, not mindshield, oops

* tweak: lower alert on pocket ssd strip, rename vars for clarity

Signed-off-by: DisposableCrewmember42 <disposablecrewmember42@proton.me>

* tweak: hold off hand strip alerts until #5699

Signed-off-by: DisposableCrewmember42 <disposablecrewmember42@proton.me>

---------

Signed-off-by: DisposableCrewmember42 <disposablecrewmember42@proton.me>
2026-05-19 10:00:50 +00:00
DisposableCrewmember42 8bc0ac3b38
tweak: nanotask papers don't provide throwing pushback (#5122) 2026-05-19 10:30:27 +02:00
Hyper 53b126f8c3
Additional Chat Punctuation (#5833)
?,!,…

Signed-off-by: Hyper <45052445+HyperBeast43@users.noreply.github.com>
2026-05-18 20:24:16 -05:00
Minerva d52b986b63
Assorted typo fixes 1 (#5622)
* Assorted typo fixes 1

* Whoops forgot this one

* Requested changes

* Fix a comment

Signed-off-by: Radezolid <snappednexus@gmail.com>

---------

Signed-off-by: Radezolid <snappednexus@gmail.com>
Co-authored-by: Radezolid <snappednexus@gmail.com>
2026-05-18 03:35:41 +00:00
pathetic meowmeow 3267b4c2a8
Doorbells (#5799)
* doored bell

* doored bell

* rezept

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2026-05-16 10:08:49 -05:00
DisposableCrewmember42 9146c59ecf
feat: Fancy Screenshake from Ephemeral Space (#5503)
* cherry-pick: Screenshake (EphemeralSpace/ephemeral-space#627)

* commit your shit at some point maybe

* y

* who knows

* rename?

* debugging  + shit api

* i hope no one fucks my ass

* erm

* p

* replace with shit that makes way more sense

* stuff

* pretty sure this is just fine

* actual fix noise shit

* uhhh hmaybe if i feel like it wrong then later

* explosion shake

* grav shake

* gun shake

* idk

* projectile melee

Co-authored-by: DisposableCrewmember42 <disposablecrewmember42@proton.me>

* tweak: tune recoil on weapons

* docs: add _ES license info to LEGAL.md

* fix: screenshake on spawn fix from ss14Starlight/space-station-14#3664

Co-authored-by: neomoth <69372252+neomoth@users.noreply.github.com>

* feat: add client cvar to disable screenshake

* feat: add screenshake toggle to accessibility settings

* fix: upmerge compatibility

* docs: properly document cvar

* docs: add missing import comments

---------

Co-authored-by: mirrorcult <mirrorcult@pm.me>
Co-authored-by: neomoth <69372252+neomoth@users.noreply.github.com>
2026-05-15 23:32:40 +02:00
Velcroboy 3a05ef885c
Fix Tilewindow CMD (#5816)
* Fix Tilewindow CMD

* Haha...changes

---------

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
2026-05-15 21:43:20 +02:00
Stxcking da885b1b1d
PORT: AAC Tablet Radio Compatibility from Starcup (#5569)
* Allows the AAC to send messages over the radio

* Allows AAC names to be highlighted in chat

* Restores VoiceOverrideComponent to the AAC

* refactor: separate confluent code into new files

Signed-off-by: little-meow-meow <204685920+little-meow-meow@users.noreply.github.com>

* style fix

Signed-off-by: little-meow-meow <204685920+little-meow-meow@users.noreply.github.com>

* Ugh this took me too long to figure out

-Made so many changes to AACTabletBuiState, moved it under _DV: Made it compatible with Wizden #40293 which moved all radio comps and system to shared
-Had issues with having two AAC UI open so made it so one closes before another opens
-Trial and error with the UI window lol

* Reverted Refactor + Comment Clean up

Reverted 0873b66449 which split code between starcup namespace and removed starcup comments because it's editing _DV files.

Fix namespace error due to radio moving the share, seem to work just fine!

---------

Signed-off-by: little-meow-meow <204685920+little-meow-meow@users.noreply.github.com>
Co-authored-by: Oxdeception <9624-oxdeception@users.noreply.gitgud.io>
Co-authored-by: little-meow-meow <204685920+little-meow-meow@users.noreply.github.com>
Co-authored-by: Janet Blackquill <uhhadd@gmail.com>
2026-05-15 17:17:49 +00:00
storm! e80bead714
[new antag] hitman v0.9 (#5506)
* Created Hitman_Case_catalog.yml

Signed-off-by: stormyatt <dratticuscrabs@gmail.com>

* for hitman

credit:stormyatt. thanks for the help those on discord and the host briefcase

Signed-off-by: stormyatt <dratticuscrabs@gmail.com>

* for hitman

credit: stormyatt with help from the discord sever and the hos briefcase pr

Signed-off-by: stormyatt <dratticuscrabs@gmail.com>

* 16/24 items filled

Signed-off-by: stormyatt <dratticuscrabs@gmail.com>

* for hitman

Signed-off-by: stormyatt <dratticuscrabs@gmail.com>

* more added

Signed-off-by: stormyatt <dratticuscrabs@gmail.com>

* top three filled

Signed-off-by: stormyatt <dratticuscrabs@gmail.com>

* for hitman, full disguise kit

Signed-off-by: stormyatt <dratticuscrabs@gmail.com>

* 27/30

Signed-off-by: stormyatt <dratticuscrabs@gmail.com>

* 28/30

Signed-off-by: stormyatt <dratticuscrabs@gmail.com>

* found the doorjack!

Signed-off-by: stormyatt <dratticuscrabs@gmail.com>

* spyCrewMonitor is cool

Signed-off-by: stormyatt <dratticuscrabs@gmail.com>

* found you!

Signed-off-by: stormyatt <dratticuscrabs@gmail.com>

* for hitman

Signed-off-by: stormyatt <dratticuscrabs@gmail.com>

* hitman: icons

Signed-off-by: stormyatt <dratticuscrabs@gmail.com>

* Created Hitman_Case.yml

Signed-off-by: stormyatt <dratticuscrabs@gmail.com>

* Create Hitman_Briefcase.rsi

Signed-off-by: stormyatt <dratticuscrabs@gmail.com>

* Delete Resources/Textures/_DV/Objects/Tools/Hitman_Briefcase.rsi

Signed-off-by: stormyatt <dratticuscrabs@gmail.com>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fixing it all

* I dont get it either but last of the changes which our just righting things

* Hitman_Case_catalog.yml be like that

* goodbye dupe

* renaming a file and removing a duplicate

* attributions changed to repect the caps

* as requested, name changes and useless line removal

* forgot to control S here

* names changed to try and be both simple and actualy describe the goal

* doing review changes and a small change to prototype order to make sense

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* how did i get where i moved this wrong?

* recharging radio jammer to radio jammer.

---------

Signed-off-by: stormyatt <dratticuscrabs@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: stormyatt <stormyatt@users.noreply.github.com>
2026-05-13 22:46:21 -03:00
BarryNorfolk d62f7cef10
Revert "Nubody Merge" (#5807)
Revert "Nubody Merge (#5670)"

This reverts commit b465cfb3fd.
2026-05-12 21:05:30 +00:00
Coryn b465cfb3fd
Nubody Merge (#5670)
* Nubody (#42419)

* Nubody

* fix test fails

* gibbing

* lung test returns

* doc comment

* hand organ test

* giblet test

* yaml formatting

* returning

* relocate

* trimming

* re-smite

* oops thusd tweak

* arachnids have slower metabolism i guess

* never mind the old behaviour is bad actually

* rider whyyy

* style changes and allat

* fix collision

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>

* C# files done

* Visual nubody (humanoid appearance refactor) (#42476)

* initial visual nubody

* oops overlay

* im so pheeming rn

* conversion...

* tests

* comeback of the underwear

* oops eyes

* blabbl

* zeds

* yaml linted

* search and visible count constraints

* reordering

* preserve previously selected markings colors

* fix test

* some ui niceties

* ordering

* make DB changes backwards-compatible/downgrade-friendly

* fix things again

* fix migration

* vulpkanin markings limit increase

* wrapping

* code cleanup and more code cleanup and more code cleanup and more code cleanup and

* fix slop ports

* better sampling API

* make filter work + use the method i made for its intended purpose

* fix test fails real quick

* magic mirror cleanup, remove TODO

* don't 0-init the organ profile data

* remove deltastates

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>

* Let vox eat trash again (#42503)

* C# complete port

* Getting closer

* Harpy Nubody Port

* Port Feroxi, Kitsune. Fix some yml typos and remove ipcs stuff

* Port Oni

* Port Rest, except Motorkind

* Port Motorkind

* Remove more surgery, restore too much deleted stuff

* Fix Typos and change some organ names. Need to split eyes next

* Harpy HAve Wings again

* Some fixes, More Surgeyr Removal, Copying of eye organs

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Use correct Body imports

* Markings Refactoring, Harpy Layering

* Motorkind doesn't crash anymore. Some layer remappings.

* Allow Organs to have Markings Displacements again. (#43604)

* first shtep

* readd markings support

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>

* Fix STalk eyes and several layerings

* Fix sexed organs (#42554)

* Fix markings for several species, fit them for sexed organs and rename some files to fit them for it

* Additional IPC-related removals

* Vulpkanin eyes are now correct again

* Fix Subtle Cultist Marks on species

* Fix Asakim Sprites (sexed) and make CD imports work

* Migration, error fixes, and Height

* Fix humanoid profile voice being broken (#42550)

Fix humanoid appearance voice being broken

* Change Kitsune SexChanged Event to with ref

* Fix asakim issue, Respirator fix

* Simplify hands UI code (#42534)

* Simplify hands UI code

* i remembered about SortedHands in the component

* minor cleanup

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>

* Set size of Analyzer back to 350, Kitsune can't gib themselves no more. Migration

* yml linter errors and an rudimentary onAdd Organ Functionality

* Fixing it trying to remove nothing

* midpoint migration

* Why do you put so many organs everywhere

* More missing prototypes

* Migration of more organs

* Forgot lungs

* Move character preview handling into a specialized control (#41252)

* Move character preview handling into a specialized control

Co-authored-by: Quantum-cross <7065792+Quantum-cross@users.noreply.github.com>

* Restore job name that I accidentally removed from character picker buttons

* Just resolve dependencies the standard way

---------

Co-authored-by: Quantum-cross <7065792+Quantum-cross@users.noreply.github.com>
Co-authored-by: Janet Blackquill <uhhadd@gmail.com>

* Drop ICharacterProfile/ICharacterAppearance interfaces (#42661)

* Ensure profile loading only returns valid species (#42842) (Stable merge) (#42865)

Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>

* Changes to make it work for us.

* No more bald Harpy

* OperatingTables instead of null

* Adding Delta V Comments, commenting out instead of deleting

* Fix broken Height Scale.

* Remove HumanoidSilicon Mention

* Did an error. Readded, uncommented.

* Clean up Marking data structure, add tests for Zombie transformation (#42756)

* Clean up Marking data structure, add tests for Zombie transformation

* empty

* AAAAAAAAAAAAAAAA

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>

* Fix markings colour setting (#42771)

* Fix: Markings Color For Downstream

* Comment out A Leg. Remove Todo

* Revert to original hidden species code

---------

Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>
Co-authored-by: Absotively <jen@jenpollock.ca>
Co-authored-by: Quantum-cross <7065792+Quantum-cross@users.noreply.github.com>
Co-authored-by: Myra <vasilis@pikachu.systems>
2026-05-12 21:55:29 +02:00
pathetic meowmeow 3176645b53
Pagers (#5762)
* Pagers

* pagepage :]
2026-05-10 16:10:22 +02:00
pathetic meowmeow ab62d18431
Give silicons PDAs (#5738)
* Give silicons PDAs

* unsaved

* borgos can have a little notification as a treat

* .Value
2026-05-09 22:19:47 +00:00
Stxcking cbbde367ba
Station Shipyard Console Works Again (#5524)
remove gridID override
2026-05-03 15:08:07 +02:00
Tobias Berger 88c84a2740
Fix blood amount for synths (#5685)
* Fix blood amount for synths

* I just forgot to keep typing the comment like frfr

* tpyo
2026-04-30 10:30:32 +02:00
Vape d4daae93e3
Port: Nuclear Reactor (#5474) 2026-04-26 21:34:23 +00:00
Field Command 2701ccb5f5
DV Escape Pods (#5536)
* DV Escape Pod

* Small update
2026-04-15 20:30:22 -05:00
Sir Warock dabe163385
Hotfix for Telepathy (#5674)
Fix it
2026-04-15 21:22:17 -03:00
Gavreau d81024d883
Psionic Refactor (#4788)
* Refactoring

* Last PR

* forgot to switch

* Redone Psionic System

* more refactoring

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Another refactorio

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* I don't know why I tried to overcomplicate this I could have just made it a popup message from the start instead of wasting three hours

* another big refactorio

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update lighthouse.yml (#4849)

* Pebble hotfix 1: Added ore processor (#4874)

* Added ore processor

* Forgot grills

* Automatic changelog update

* Terra: The Holiday Episode (#4843)

SNOW

* Automatic changelog update

* Academy 1.3.0 (#4863)

* * make festive for winturrr
* fixed emergency light in viro checkpoint
* fixed always on light outside dispo

* fixed light

* Map Edits: The Hive (#4887)

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>

* Automatic changelog update

* Map Hotfix: Tortuga (#4878)

* Map Hotfix: Tortuga

* invalid

* Circuit imprinter

* increase detective 1->2

* return of the circuit imprinter

* fish power

---------

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>

* Automatic changelog update

* And another one!

* Fix yaml linter

* Fix mapping section in CONTRIBUTING.md (#4894)

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>

* Give dummy avali and chitnid moth eye sprites (#4884)

1 commit ops

* Midpoint Festive Season (#4891)

* Midpoint Festive Season

* Made frosty lights not be powered by festive magic

* Automatic changelog update

* Make pride clothing be able to chameleon into similar pieces of pride clothing (#4845)

* Expedite gender reassignment (#36894)

* Remove Misgendering (#40425)

fix misgendering

* make pride scarfs and cloaks chameleon

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* add missing comments

* Attempt Toby's suggestion: rename chameleon stuff

* rename the chameleon verb & window

---------

Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* Automatic changelog update

* kill speedboots (#4883)

* remove speedboots

* no more reverse engineering

* Update Resources/Prototypes/Research/civilianservices.yml

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Proxy also works :3 <98499019+Proxysseia@users.noreply.github.com>

---------

Signed-off-by: Proxy also works :3 <98499019+Proxysseia@users.noreply.github.com>
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>

* Automatic changelog update

* Centcomm roles QOL (#4880)

* first commit yippee

* ERT now gets centcomm implants too. Also fixes ERT not having death rattle implants

* Always bigger fi- oh nevermind (Feroxi Emote) (#4877)

* feroxi changes

Wideswing,10 pierce, tail thump, better storage of body emotes for feroxis

* Direction Changes

Removed wideswing dropped feroxi melee back to 7

Signed-off-by: Halo3moth <mdavid.wininger@gmail.com>

---------

Signed-off-by: Halo3moth <mdavid.wininger@gmail.com>

* Automatic changelog update

* Update Credits (#4897)

Co-authored-by: DeltaV-Bot <github@deltav.gay>

* Add Chemical, Paramedic, and Surgeon wall lockers (#4899)

* woo wall lockers!

* chemical

* clean up

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* Automatic changelog update

* Fix respawn timer (#4895)

* fix

* Automatic changelog update

* Demetashield epsilon part 2 (#4481)

* demetashield epsilon part 2

* bug fix

* annoucement.yml fix

* some redundant stuff removed

fix

* Make the cane loadout group include the librarian cane (#4904)

* Atmos Ops: dP Guidebook Entry  (#4906)

Atmos dP Guidebook Entry (#40194)

* Add Atmos dP guidebook

* Update Resources/ServerInfo/Guidebook/Engineering/DeltaPressure.xml

---------


(cherry picked from commit a93f6b8cdf)

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Automatic changelog update

* Xenoarch tweaks (#4486)

* Initial glimmer change

* Added glimmer multiplier

* Adds scalar of research properly like the old glimmer system

* Left over code

* Glimmer changes for Analysis Console UI

* Accidental Namespace added

* Fixed small Math issue with glimmer values

* Fixed reference to Nyano

* Update Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml

Co-authored-by: KOTOB <59124164+kotobdev@users.noreply.github.com>
Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>

* Update Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml

Co-authored-by: KOTOB <59124164+kotobdev@users.noreply.github.com>
Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>

* Update Content.Shared/Xenoarchaeology/Equipment/Components/ArtifactAnalyzerComponent.cs

Co-authored-by: KOTOB <59124164+kotobdev@users.noreply.github.com>
Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>

* Fixed Deltav comment references

Went though various files and added comments to signify where delta v changes are to the upstream code

* More DeltaV Comment fixes

Added a few more comments for DeltaV specific changes, I also removed an unused line of code, and renamed to variables for better clarity

* Commenting and moving one file to _DV

I cant read apparently and  only saw some fixes requested, here are the rest apologies

* Update Content.Shared/Xenoarchaeology/Equipment/Components/ArtifactAnalyzerComponent.cs

Co-authored-by: Charlie Morley <cmorley191@gmail.com>
Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>

* Update Content.Shared/Xenoarchaeology/Equipment/Components/AnalysisConsoleComponent.cs

Co-authored-by: Charlie Morley <cmorley191@gmail.com>
Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>

* Update Content.Shared/Content.Shared.csproj

Co-authored-by: Charlie Morley <cmorley191@gmail.com>
Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>

* Update Content.Server/Xenoarchaeology/Equipment/ArtifactAnalyzerSystem.cs

Co-authored-by: Charlie Morley <cmorley191@gmail.com>
Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>

* Update Content.Client/Xenoarchaeology/Ui/AnalysisConsoleBoundUserInterface.cs

Co-authored-by: Charlie Morley <cmorley191@gmail.com>
Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>

* Update Content.Shared/_DV/Xenoarchaeology/BUI/AnalysisConsoleBoundUserInterfaceState.cs

Co-authored-by: Charlie Morley <cmorley191@gmail.com>
Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>

* Update Resources/Locale/en-US/xenoarchaeology/artifact-analyzer.ftl

Co-authored-by: Charlie Morley <cmorley191@gmail.com>
Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>

* Addressed issues of cleaning up a function to one that already exists, restoring an old comment from upstream, and moving localization data to _DV folder

* Update Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml.cs

Co-authored-by: Charlie Morley <cmorley191@gmail.com>
Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>

* Update Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml.cs

Co-authored-by: Charlie Morley <cmorley191@gmail.com>
Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>

* Update Content.Server/Xenoarchaeology/Equipment/ArtifactAnalyzerSystem.cs

Co-authored-by: Charlie Morley <cmorley191@gmail.com>
Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>

* Update Content.Server/Xenoarchaeology/Equipment/ArtifactAnalyzerSystem.cs

Co-authored-by: Charlie Morley <cmorley191@gmail.com>
Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>

* Update Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml.cs

Co-authored-by: Charlie Morley <cmorley191@gmail.com>
Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>

* Missed one line to bring over to _DV

* Fixed github and IDE complains about null ref

---------

Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>
Co-authored-by: KOTOB <59124164+kotobdev@users.noreply.github.com>
Co-authored-by: Charlie Morley <cmorley191@gmail.com>

* It Snew On Lady Elegance (Christmas PR) (#4903)

* Update elegance.yml

* Update elegance.yml

* those who snow

* nukes the tattered cloak for real

* Update elegance.yml

* Automatic changelog update

* Winterhouse (#4910)

Update lighthouse.yml

* Hivemas (#4898)

* Hivemas

* variantize

---------

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>

* Automatic changelog update

* It's a Tortuga Xmas! (#4893)

* It's a Tortuga Xmas!

* ...

---------

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>

* Automatic changelog update

* Reinforced Tinted Windows (#4875)

* completion

* fix

* moved directories

* fixed

* Apply suggestion from @Toby222

Signed-off-by: Tobias Berger <toby@tobot.dev>

---------

Signed-off-by: Tobias Berger <toby@tobot.dev>
Co-authored-by: Tobias Berger <toby@tobot.dev>

* Automatic changelog update

* Manual changelog update

* Manual changelog update

* Harpies Flightless No More! (#4888)

* Initial port of EE Harpy flying (#919)

* Added better friction and acceleration modifiers.

* Moved server's flight system to shared. I don't know why it isn't in the first place.

* Shifting things around.

* Code tweaks to make it better

* Comment fixes

* Fixed footsteps and footstep sounds

* Added a quick conditional if InitialStaminaCost greater than zero

* Removed a pop-up that wasn't showing

* Additional adjustments

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Fixed a few more systems to call the Flying system instead of the component

* Comment consistency. DeltaV comments where I made it better. EE comments where they originally had things

* YAML fixes

* Guidebook

* Apply suggestions from code review

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>

* Removed DoAfterDashEvent

* Fixed suggestions

* Updated comment

* Added new copyright free wingflaps with proper attribution

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Appeased YAML gods

---------

Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>

* Automatic changelog update

* Adds nightvision to rat kings and xenos  (#4881)

* ISeeDeadPeople

* Apply suggestions from code review

Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>

---------

Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>

* Automatic changelog update

* Give custom laws to Salv Borg (#4866)

* Give custom laws to Salv Borg

Give a custom lawset to salvage borg

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* updated laws explain it better and look cleaner

Signed-off-by: BungleBoss <100389635+BunglesnortBoss@users.noreply.github.com>

* Update laws.ftl

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: BungleBoss <100389635+BunglesnortBoss@users.noreply.github.com>

---------

Signed-off-by: BungleBoss <100389635+BunglesnortBoss@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>

* Automatic changelog update

* Protect arrivals and evac from meteors (slightly) (#4820)

* Protect arrivals and evac from meteors (slightly)

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* change meteor protection zone to a MarkerBase

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* xenoarch: remove impossible artifact trigger combinations (#4740)

* xenoarch trigger combination blacklists

* minor review comments

* review comments

* Automatic changelog update

* xenoarch: node scanner UI overhaul (#4814)

* xenoarch: node scanner UI overhaul

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.Unlock.cs

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Charlie Morley <cmorley191@gmail.com>

* Update Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.Unlock.cs

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Charlie Morley <cmorley191@gmail.com>

---------

Signed-off-by: Charlie Morley <cmorley191@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>

* Automatic changelog update

* Syndie borg fixes (#4913)

* Moved law boards to their own file, similar to the structure that upstream uses.

* Fixed syndicate medical borg ghost role. Moved DV lawsets.

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* Automatic changelog update

* Feroxi: Blood in the Water (#4902)

* Added shark vision to Feroxi.

* Fixed a bug if someone was holding a container of blood.

* Updated pulse time and useDelay for the pulse.

* Updated guidebook

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Cleanup

* More clean-up

* Removed vision goggles sound from ability

* Got rid of an unused namespace

* last fix I swear

* Apply suggestions from code review

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>

* Apply suggestion from @Toby222

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>

* Removed SharedLightSystem from SharkVisionOverlay

---------

Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>

* Automatic changelog update

* Byoin TEG burn chamber edits! (#4911)

Update byoin.yml

* Automatic changelog update

* Reinforced Tinted Windows Bug Fix (#4918)

fix

* Automatic changelog update

* Vulnerable String Sanitization (Prevent `cmdlink`) (#4922)

* Fix label markup escapeing (#40600)

fix

* Sanitize NanoChat

* Escape PDA Owner/Job

* Escape ID Examine

* Early merge of https://github.com/space-wizards/space-station-14/pull/41799

---------

Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>

* 100% Ion resistance on Ninja Suit and Visor NVG. (#4916)

* Add NVG to visor, Ion Immunity and no EMP armor ignore

* Comments..

* .ftl from up to _DV

* Rewrote visor description.

* Remove ftl newline, forgor desc comment.

* Automatic changelog update

* AI HUD and Comms Update (#4905)

* test one

* Removed mind shield hud

* Automatic changelog update

* Syndicat ghost role description tweak  (#4889)

* final tweaks I promise.

* minor desc change requests

* typo buh

* Automatic changelog update

* Chibi update 08DEC2025 (#4914)

* omg chibi so kawaii!~ >w<

* take a wild fucking guess

* cameras, fixrotations, tilewindows

* Automatic changelog update

* Fixes coffe typo (#4930)

* Add more festive holiday clothing to AutoDrobe (#4909)

* sprites galore

* no Santa monkey

* autodrobe

* cost up

* Automatic changelog update

* EntropicDegen Fix (#4931)

lol

* Automatic changelog update

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Merge Upstream

* One refactor to rule them all (#15)

* Add xenoborg laws to ion storm chance (#41532)

add xenoborg laws to ion storm chance

* Replace (almost) all existing storage fills with entity table container fills (#41360)

* Replace all existing storage fills with container fills, adjust some formatting to accomadate

* Forgot to remove that

* I really need to spell better

* Right, those are 3x3

* Change some NestedSelectors to GroupSelectors

* Actual container fills, test fix (maybe), and a few minor formatting changes

* Fix some more mistakes

* Forgot to add to that comment

* Some parenting fixes

* Test optimisation, maybe

* Roll holiday lights instead of individually listing it

* Move eletrical toolbox to NestedSelector

* Back to entity tables (except for vending)

* More nesting (and a TODO)

* Yet another fix

* Probably shoulda done it this way originally

* Entity tables for vending restocks

* I am good at formatting

* Make added table names consistent

* Make grand lottery weights a little more readable

* Use existing fills for bio suit crates

* Get rid of some more redundant amounts

* Nuke the StorageFill test section and update some comments

* Apply changes from code review

* Split off changes to vending restocks

* Split off changes to vending restocks

* Apply more changes from code review

* Attempt #2 of detangling this mess (oh shit I missed the pin)

* They look so similar

* I am great at formatting

* Missed a newline

* How did I manage to do that

* Move toy in FoodMealHappyHonkClown to top to prioritise

* Apply changes from review and move dank pizza to organise by weight

* Replace all storage fills with entity table container fills

* Balloons now float and slide smoothly. (#41102)

* The balloons became airy

* Attributions + Sound

* Add BaseBalloon

* Proto fixes

---------

Co-authored-by: ReWAFFlution <239567049+brokendot@users.noreply.github.com>

* Add Whitelist.Components yaml valiation (#40916)

* Add Whitelist.Components yaml valiation

* poke_tests

* fix linter

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Remove blacklist methods in EntityWhitelistSystem (#40932)

* replace blacklist methods

* VS is trolling me

* Remove blacklist methods from fork changes

* Add test checking for multiple container fills, mark StorageFillComponent as obsolete (#41562)

add test, obsolete storagefill

* No more sub wizards in xenoborg preset (#41565)

no more sub wizards in xenoborg preset

* Fix gas filters (#41567)

fix gas filters

* Fix stunbaton component namespace (#34790)

* Fixed incorrect namespace

* .Components was weird so I removed it

* Predict powercells, chargers and PowerCellDraw (#41379)

* cleanup

* fix fixtures

* prediction

* fix test

* review

* fix svalinn visuals

* fix chargers

* fix portable recharger and its unlit visuals

* fix borgs

* oomba review

* fix examination prediction

* Fix and mark microwave time addition for BeingMicrowaved

* Fix for missing namespace in Nanochat

* Fix several systems and protos after powercell prediction change

* Fix typo in Ion Storm lawsets (#41574)

Pizzaria → Pizzeria

* Remove commented items (#41577)

* Tourniquets can now fit in medical belts (#41584)

* Fewer War Crimes (#41541)

* Fewer War Crimes

Re-colour the syndicate medical bags to not use the legally restricted Red Cross symbol and instead use the same blue cross colours as used across the rest of the game's medical symbolism.
Because no-one wants to go to the Hauge. Also consistency is nice.

* Update meta.json

* Update another meta.json

* Update meta.json again

additional detail

* Make gameticker spawn code more modular (#41588)

gameticker dospawn

* Meatball Salvage wreck remake (#41589)

Remake-Meatball-Wreck

* Update mothership again (#41491)

* add xenoborg recharging station

* it was backwards

* make it a tad darker

* touch ups

* add xenoborg blast door sprites

* update sprites

* add xenoborg blast door

* improve blast door sprite

* typo

* make it thinner

* update mothership

* moved yml lines

* updated xenoborg charger sprite

* removed unused state

* fixes to the mothership

* Fix helmet lights (#41599)

fix helmet lights

* Change thief backpack ui name and description with Component fields (#41583)

* Add new name and description fields to the thiefbackpack component and ui

* Change fields to locids, remove Title from menu.xaml, add comments to  thiefbackpackui.cs

* Helper method for get charge level (#41601)

* get-charge-percent

* review

* Adds option to whitelist or blacklist store entries based on buyer objectives (#41493)

* BuyerObjectiveWhitelistCondition done

* fix to check every buyer objective for a blacklisted objective before checking whitelisted objectives

* resolved requested changes

* forgot a line

* Update Content.Server/Store/Conditions/BuyerObjectiveWhitelistCondition.cs

* Replaced IsBlacklistPass with IsWhitelistPass

* cleaning up

* placed whitelist == null check above objective loop

* Moved empty whitelist check below foreach loop

* final cleanup i pray

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Fix looking at verbs causing sounds or popups (#41609)

* fix verb popups

* spelling

* Properly document AtmosDeviceEnabled(Disabled)Event (#41613)

kill misnomers

* Felinase/Caninase Reagent Tweaks (#41527)

* Tweaked reagents required for recipes, increased output of recipe, lowered time of accent per unit, and tweaked chem thresholds

* tweaks

i was lazy

* product change

lazy again

* yuh

* pluh

---------

Co-authored-by: NoreUhh <noreuhh@gmail.com>

* Change to add shot glasses to the bartender guidebook entry (#41618)

adds shot glass to bartender guidebook

* Add StatusIcon component to MobBaseAncestor (#41624)

add StatusIcon to ancestor

* Make xenoborg round end text better (#41623)

* make xenoborg win color easier to read

* display the max number of xenoborgs and the number of crew alive in the end

* make it a datafield

* add : (literally)

* add period

* make text better

* Fix EquipmentVerbs not showing up in strip menu (#41631)

commit

Co-authored-by: iaada <iaada@users.noreply.github.com>

* Fix clientsided alerts being overwritten by server (#37033)

Initial commit

* Predict borgs (#41600)

* predict borgs

* small fix

* fix MMI item slot serialization

* fix movement speed for mothership core

* review and minor improvement

* fix resolve

* review

* predict name identifiers (#41605)

* Make Firespread logical (#41636)

* FIRE

* code comment fix

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>

* fix rcd overlay getting stuck for borg modules (#41648)

fix rcd overlay getting stuck

* Add water flower for clowns (#41469)

* Spray!

* Add to clown loadout

* Fix the easy things

* lot nicer

* spray update..

* Fix yaml

* fixes

* changed it to warning!

* review

* review

* sku

* multi reagent bloodstream (#41489)

* multi reagent bloodstream

* pluralize the comments

* fix TryModifyBloodLevel return logic

* now with quantity

* now with solution

* implement suggestions

* fix forensics

* minor thing

* Nevermind undo that caps matters.

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>

* Fork fixes for multi reagent bloodstreams

* [HOTFIX] FIX LIGHT MELEE LOGS (#41655)

God fugcking

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>

* Add Changeling DNA store (#41632)

* created changeling dna currency and locale currency name

* created changeling store category, created changeling-catalog.ftl

* added store and action to Urist McLing

* found the entity

* make armblade a purchase

* comment

* created ApplyToMob datafield and applied to armblade

* ApplyToMob check in storesystem

* Update Resources/Prototypes/Catalog/changeling_catalog.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Fix Damageable API (#41657)

Fix damageable api

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>

* Add debug hitscan weapon (#41658)

* debug gun

* predict

* fix AI battery alert (#41879)

* fix AI battery alert

* fix copy paste error

* Fix rigged power cells exploding early (#41813)

* fix riggable

* fix

* Unify BatteryComponent and PredictedBatteryComponent (#41867)

* unify

* cleanup and merge conflicts

* floating points

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>

* Downstream fixes for battery unification

* Fix xenoborg modules (#41625)

* change name from heavy laser to laser cannon

* fixed some ids

* fix name and description

* change cost of upgrade modules

* remove unwield penalty

* commentary

* change name of scout modules

* same firerate as before

* typo

Co-authored-by: āda <ss.adasts@gmail.com>

* new line at end of file

* duplicated

---------

Co-authored-by: āda <ss.adasts@gmail.com>

* Only run StationPowerTests over stations in DeltaV

* Five bounty arbitrage fixes (#41846)

* commit

* tweak

* more bounties

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>

* Stop the laser gun bounty allowing LaserTag guns

* Fix power draw on Defib cabinet when not charging anything

* Mail Cart (#41482)

* Add mailcart crate type

* Add recent progress, move location of mailcart.rsi

* Allow letters and packages to be inserted

* Add updated sprites for mailcart

* Add storage for letters

* Bugfix for sprite

* Add fix for mincount mailcart sprite updates

* Add dynamic names to packages in mailcart

* Add additional whitelist items

* Update tag comments

* Remove max item size

* Update fixture for mailcart, remove unused code from crates.yml

* Add mail cart to cargo ordering

* Update meta.json

* Remove unused comment

* Update copyright

* Add missing ContainerContainer

* Update ContainerContainer

* Revert "Update ContainerContainer"

This reverts commit 1805dcd58d8c0f52baca9db0d3173940ee241159.

* Remove container slots and increase storage

* Remove unused tags

* Remove LetterDelivery tag

---------

Co-authored-by: Justin Pfeifler <jrpl101998@gmail.com>

* fix solution contents duplication on spill behavior (#33231)

* I’M SCREAMING INTO THE VOID AND IT’S NOT LISTENING

* review

* explodes pancakes with mind

* graaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

* Meteors RAAAAAAAAAAH

* I'm so tired of solutions

* whhop

* revert

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>

* Disable xenoborgs at roundstart

* Fix issue with weaponUids not being passed correctly for weapons used by entities

* Upa APC max load to 40 kW

* Use existing hardsuit extra table

* Move xenoborg lawsets above DeltaV

* Apply #41583 to all thief stash-like entities

* Also apply #41149 to all magazines and ammo boxes

* 1984 engineering holoprojector

* change to 6 charges

* Security longcoat resprite (#5288)

* My coats are so long

* making the hos longcoat more hoslike

* Automatic changelog update

* Printable plasteel (#5284)

* Printable plasteel

* Actually make it a bit faster

* Move to that other recipe pack

* Recipes are named after their result

---------

Co-authored-by: Tobias Berger <toby@tobot.dev>

* Automatic changelog update

* Disable Wizard until Rebalanced (#5228)

* Remove wizard from midround antags until rebalanced

* Removed wizard from roundstart antags

---------

Signed-off-by: Pharaz4 <143268074+Pharaz4@users.noreply.github.com>

* Automatic changelog update

* Apply #41461 to _DV security borg modules

* Tank Dispenser Recolor (#5267)

* Add files via upload

Tank Dispenser Recolor

Signed-off-by: Thingy461 <darmentici@gmail.com>

* Add files via upload

Minor tweak to vending machine YAML for tank dispenser recolor

Signed-off-by: Thingy461 <darmentici@gmail.com>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Fix line endings

* Apply suggestions from code review

Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>

* Apply suggestion from @ShepardToTheStars

Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>

* Update Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml

Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>

---------

Signed-off-by: Thingy461 <darmentici@gmail.com>
Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: zelezniciar1 <39102800+zelezniciar1@users.noreply.github.com>

* epic grammar ops

* hotfix-plasteel (#5298)

* Automatic changelog update

* Make unholy water actually have a color (#5312)

make unholy water actually have a color

* Tiny things not worth requesting changes for

* Changelog stuff!

* Merge pull request #5293 from Pharaz4/cherrypickattempt

LIZARDS GET TAILS ON HARDSUITS!!!

* Automatic changelog update

* Remove Syndie comms from disaster victims and guards (#5280)

* remove syndicomms from disaster victims

* removed from syndicate guard as well. (dropship ruin has a guard)

* fix harpy wing showing on cc hardsuit

* Automatic changelog update

* Halve Space Law Sentencing Times (#5249)

* Reduce times in space law and SOP, in guidebook and wiki

* cat c 12 minutes instead of 10

* update crime assist

* CentComm stuff (#5315)

* CentComm stuff

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* hmm...

---------

Signed-off-by: Field Command <159087063+FieldCommand@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* Automatic changelog update

* Add missing link in changelog

* Uncloneable in my medical scanner? Yes. (#5310)

* Update OrganManipulation.xml

* Merge branch 'DeltaV-Station:master' into master

* Merge branch 'DeltaV-Station:master' into master

* Merge branch 'DeltaV-Station:master' into master

* no more taser!

* Merge branch 'DeltaV-Station:master' into master

* Merge branch 'DeltaV-Station:master' into master

* Merge branch 'DeltaV-Station:master' into master

* Merge branch 'DeltaV-Station:master' into master

* Merge branch 'DeltaV-Station:master' into master

* MMm yummy fixes

* Adsd the UNcloneable to the scanner!

* fixing some guidebook things about the cloning

* Fixed the guidebook entry

* undone a change to splaw

* textlinkd

* COMMENTS RAHHHHH

* Update CryoPodSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: PureBreadBagel <146181383+PureBreadBagel@users.noreply.github.com>

* Update HealthAnalyzerSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: PureBreadBagel <146181383+PureBreadBagel@users.noreply.github.com>

* Update HealthAnalyzerSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: PureBreadBagel <146181383+PureBreadBagel@users.noreply.github.com>

* Automatic changelog update

* Health Analyzer Uncloneable Refactor (#5330)

* Partial revert of #5310

* Refactored uncloneable out of the HealthAnalyzerScannedUserMessage BUI.

* Automatic changelog update

* Centcomm fixes (#5321)

* Automatic changelog update

* epic guidebook ops

* fix EngieeringRegulations type

* minor fixes

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update Credits (#5341)

Co-authored-by: DeltaV-Bot <github@deltav.gay>

* Invisible Guitar Wield Bugfix (#5331)

chec

* Automatic changelog update

* Brigmed Beret (#5333)

brigmed

* Automatic changelog update

* bandolier buff? tweak? (#5313)

ok functional

* Automatic changelog update

* Port admin logging of AAC messages (#5309)

fix: Admin log AAC tablet messages

* Automatic changelog update

* Changed enabled mapped pressure pump to 300 kpa (#5336)

lowered pressure by 10 kpa

* Automatic changelog update

* Port sneaking status icon from Lagrange (#5308)

* Make the icon for sneaking show sneaking status (#358)

* Make the icon for sneaking show sneaking status

* Specify sprite

(cherry picked from commit dd5fa91e1e1b9f350f7dac15579430d503b2ab6b)

* Update from review

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Madison Rye Progress <makyo@drab-makyo.com>

---------

Signed-off-by: Madison Rye Progress <makyo@drab-makyo.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>

* Automatic changelog update

* Updates random solar panel spawner (#5323)

* Updates random solar panel spawner

* Update Resources/Prototypes/_DV/Entities/Markers/Spawners/Random/solar.yml

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>

* Update Resources/Prototypes/_DV/Entities/Markers/Spawners/Random/solar.yml

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>

* Update Resources/Prototypes/_DV/Entities/Markers/Spawners/Random/solar.yml

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>

---------

Signed-off-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>

* feat: Add a few bowls to the perma chefvend (#5304)

* Automatic changelog update

* The Reclaimer MK2 returns! (#5245)

* The Reclaimer returns

* Added the ability to name GridSpawns with a specific name

* formatting

---------

Co-authored-by: Vanessa <vanessalouwagie@gmail.com>

* Automatic changelog update

* Midpoint Updata: CC now have an office on Midpoint (#5231)

* Midpoint CC

* Update maps.yml

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Fixed spelling!

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* Automatic changelog update

* Feroxi Wagging (#5319)

* uno

* fix

* fml

* mark 2

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* Automatic changelog update

* Fix harpy ERT, CC, suits (#5325)

* Fix harpy ERT suits (not elite ones, change enabled mapped pump from 310kPa to 300kPa.

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix harpy suits not working (probably)

* fix the harpy suits not displaying

* Fixed Lizards missing a sprite for the rhino hardsuit, also some minor comment adjustments

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Hid upstream ERT spawners

* added 3 sprites for reptiles

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix firesuit (And its namespace)  and add rd suit sprite for lizards

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* elite ert sprites because toby hasnt reviewed yet

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* still not merged so im adding this, will fix debug test failing on prs

* fixed attributions

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* Automatic changelog update

* Emagnum patch (#5352)

* Update projectiles.yml

* Now that I’m thinking about it giving it opaque could lead to unintended interactions

* Apply suggestion from @ShepardToTheStars

Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>

---------

Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>

* Update Credits (#5356)

Co-authored-by: DeltaV-Bot <github@deltav.gay>

* Small Pebble fixes (#5347)

* Small Pebble fixes

* Small pebble fix

* Automatic changelog update

* Byoin and Basu update (#5232)

* Byoin and Basu update

* Byoin Fixes

* more small edits.

* minor fixes

* Automatic changelog update

* Shoko update (#5334)

* Updayed shokou to modern standard, see pr for more info

* changed stuff based on feedback in discord

* added mailing unit between botany and chem. fixed window in bathroom. added to the 4th wall breaking note in station anchor.

* fixed mail unit placement in botany

* added drain to salv airlock and disposals. redid parts of epistemics. redid perma bathroom and removed condiments. added colors to atmos pipes and changed up the pipe layour of distro and waste. added firebot to teg room.

* added salvage job board to salv dock

* made changes based on feedback from FC

* fixed missing change

* Automatic changelog update

* Map Hotfix: The Hive (#5368)

* Map Hotfix: The Hive

* switcheroo

---------

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>

* Automatic changelog update

* Hotfix: Obliterated the second LO locker on Pebble (#5371)

Obliterated the second LO locker

* Automatic changelog update

* adds 4 new ruins based off of /tg/ stations space ruins. (#5283)

* adds 4 new ruins based off of /tg/ stations space ruins.

* fixed up window missing a grille and made mines a 33% chance to spawn instead of garuntee

* Automatic changelog update

* Update Credits (#5383)

Co-authored-by: DeltaV-Bot <github@deltav.gay>

* the fabled single line change

* Update PlayerProvidedCharacterRecords.cs

* Revert Soretizone buff (#5307)

* Update medicine.yml

Update medicine.yml

Update medicine.yml

Revert "Update medicine.yml"

This reverts commit 905c5cac07.

Update medicine.yml

* Update medicine.yml

* agono make you numb also

* condenser power usage change (10kW ->2kW) (#5365)

* Auto label port

* Make it so it works/comments

* Post review changes.

* Post review change part two.

* review pt 3

* Fixed client UI from not getting updated.

* Gas condenser power usage to 2k

---------

Co-authored-by: Vanessa <vanessalouwagie@gmail.com>

* Automatic changelog update

* shoko update numba 3 (#5401)

* shoko update numba 3

* 88 LINES ADDED 82LINES REMOVED

* Automatic changelog update

* Fix pew sprite, benches, and make these benches constructible. (#5375)

* fix pew sprite, fix incorrect labelling of benches and sofa, add snapgrid center to benches

* make it so you can construct/deconstruct and relocate namespace

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Add migration

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>

* Automatic changelog update

* Fixes to suffix (#5353)

* Reverts Arena weapon spawner change (#5322)

Reverts change from prob to weight

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>

* Removed a dead pixel on a book sprite (#5362)

* Update Credits (#5413)

Co-authored-by: DeltaV-Bot <github@deltav.gay>

* Hotfix: Pebble, small changes. (#5415)

Pebble fixes

* Automatic changelog update

* Lighthouse Tweaks... again... (#5246)

* Update lighthouse.yml

* Update lighthouse.yml

* Update lighthouse.yml

* Update lighthouse.yml

* Update lighthouse.yml

* Update lighthouse.yml

* Update lighthouse.yml

* Update lighthouse.yml

* Automatic changelog update

* old_infiltrator hotfix (#5405)

* oldinfiltrator hotfix

* put command corpse spawner and add exception for cc loot to the infiltrator ruin

* fix wrong file path

* webedit

Signed-off-by: Pharaz4 <143268074+Pharaz4@users.noreply.github.com>

* fuck github

---------

Signed-off-by: Pharaz4 <143268074+Pharaz4@users.noreply.github.com>

* Removed ability for limbs to be trashed

* removed bodyparts ability to be placed in trashbag

* Removed estoc slowdown (#5242)

* Removed estoc slowdown

* Re-added speed penalty, but reduced to 0.9x instead of 0.75x

* Automatic changelog update

* Adding purifying salt to the med vend, and a new cryo chem for holy and shadow (#5276)

* new cryo chem and adding topicals to medivends and med's techfab

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* me when dumb and tired and on phone

Signed-off-by: keekee38 <iamabanana372456@gmail.com>

* woof

* Update Resources/Prototypes/_DV/Recipes/Reactions/medicine.yml

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: keekee38 <iamabanana372456@gmail.com>

* Update Resources/Prototypes/_DV/Reagents/medicine.yml

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: keekee38 <iamabanana372456@gmail.com>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* ok maybe that fixes it if not will look at later

Signed-off-by: keekee38 <iamabanana372456@gmail.com>

* did the />

Signed-off-by: keekee38 <iamabanana372456@gmail.com>

---------

Signed-off-by: keekee38 <iamabanana372456@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>

* Automatic changelog update

* Asterisk fix (#5373)

* first part

* last one

* last

* last one maybe

* last fix

* Automatic changelog update

* Academy 1.6.0 (#5412)

* boxketball court is wooden again
* gave botany a window and moved their machines around, extra crate, extra tools
* added masks to clown and mime rooms, someone complained "it's barren"
* fixed hop diectional sign above robo
* added crashcart to med and viro
* added mailcart to mail
* converted maint passage to hallway between epistemics and cargo, and updated directional signs
* removed christmas cakes from kitchen and cargo cafe
* replaced winter with spring/summer
* added gold and silver to cargo

* Automatic changelog update

* Automatic changelog update

* add emoting component to skia (#5366)

* Automatic changelog update

* Fix shrapnel landmines not triggering properly (#5379)

* Fix shrapnel landmines not triggering properly

* Re-enable landmines in the landmine entity table

* Automatic changelog update

* Make the chemvend's bluespace beaker only available through an emag (#5392)

* move the chemvend bluespace beaker to emaggedInventory

* forgot to commit

* Automatic changelog update

* removing machine pistol mag compatability for the viper and pollock and fixing practice mags (#5296)

* sighs

* :3 oopsie daisy,,,,,

* adding the thingy

Signed-off-by: keekee38 <iamabanana372456@gmail.com>

* Fix comment

Signed-off-by: Stop-Signs <stopsign221@gmail.com>

---------

Signed-off-by: keekee38 <iamabanana372456@gmail.com>
Signed-off-by: Stop-Signs <stopsign221@gmail.com>
Co-authored-by: Stop-Signs <stopsign221@gmail.com>

* Automatic changelog update

* New Gun Safe Sprites (#5314)

* Automatic changelog update

* Automatic changelog update

* Automatic changelog update

* infested frigate ruin fix (#5431)

* Automatic changelog update

* Merge pull request #5218 from DisposableCrewmember42/conspirator-port

feat: add Conspirators from Harmony

* Automatic changelog update

* Slavic Accent character trait (#5264)

* port slavic accent

* change some replacements

* bobr

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* eliminate redundant regex

* bozhe moy

* order matters

* Merge branch 'master' into slavicAccent

Signed-off-by: zelezniciar1 <39102800+zelezniciar1@users.noreply.github.com>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Apply suggestions from code review

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: zelezniciar1 <39102800+zelezniciar1@users.noreply.github.com>

* Update Content.Server/_DV/Speech/EntitySystems/SlavicAccentSystem.cs

Co-authored-by: BarryNorfolk <barrynorfolkman@protonmail.com>
Signed-off-by: zelezniciar1 <39102800+zelezniciar1@users.noreply.github.com>

* tryfix

* Merge branch 'slavicAccent' of https://github.com/zelezniciar1/Delta-v into slavicAccent

* Automatic changelog update

* Free Suit Storage (#5300)

what fun

* Automatic changelog update

* Elegance Update Number I Lost Track (#5387)

* Update elegance.yml

* holy shit is that kris deltarune

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* dghjdsgjkdfs

* that one random brick decal under the window:

* stuff

* Kill that line 

Signed-off-by: This_Is_Gray <167829864+IAmNotGray@users.noreply.github.com>

* Kill that line 2 but it's actually redoing them

Signed-off-by: This_Is_Gray <167829864+IAmNotGray@users.noreply.github.com>

---------

Signed-off-by: This_Is_Gray <167829864+IAmNotGray@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* Automatic changelog update

* Crusher Right Click Wideswing (#5327)

commit

* Automatic changelog update

* Map Edits: The Hive (#5438)

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>

* Automatic changelog update

* Reclaimer MK2 hotfix (#5440)

Fixes #5428

* Map Edits: Arena (#5445)

* Map Edits: Arena

* AI router

---------

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>

* Automatic changelog update

* PKA fixes try 2 (#5311)

* easier to just redo the PR rather then fix the old one

* remove comment

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: AeraAulin <133451603+AeraAuling@users.noreply.github.com>

---------

Signed-off-by: AeraAulin <133451603+AeraAuling@users.noreply.github.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>

* Automatic changelog update

* fix: (re)remove forced accents (#5343)

fix: (re)remove clothing/item/role-forced accents

* Automatic changelog update

* Let Engineering choose their starter suit (#5317)

* test

* a lot of stuff

* Changed voidsuit speed to 15%. Added a locker variant to just have the hardsuit, with a shitty id

* test re-run

* deltaV addition comments

* goob copyright (just in case bro, don't sue us)

* Automatic changelog update

* Add new Lobby and Jukebox music by Darklyac (#5424)

* darkylac muisic real

* the time

* Automatic changelog update

* Add cloth wraps (#5335)

add cloth wraps

* Automatic changelog update

* Borg Crew Monitor Fixes (#5342)

* Update handheld_crew_monitor.yml

* suggested clarity

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* Automatic changelog update

* Update Credits (#5453)

Co-authored-by: DeltaV-Bot <github@deltav.gay>

* Edge fix (#5439)

* Edge

* Edge Part two

* Edge final

* Automatic changelog update

* move bluekies to DV namespace (#5414)

* move bluekies to DV namespace

* FIX FAIL

* fix harpy paramed suit

* Automatic changelog update

* Remove ballistic reflect from energy swords (#5429)

* reduce reflect chance on ninja and cult swords  Energy weapons by default now only reflect energy projectiles

* Revert "reduce reflect chance on ninja and cult swords  Energy weapons by default now only reflect energy projectiles"

This reverts commit 444d9a4921.

* Energy swords only reflect energy shots

* Enable wizard's teleport scroll and wizard's den map (#5215)

* Enable wizard's teleport scroll and wizard's den map

* mapPath

* longer cable in cave

---------

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>

* Automatic changelog update

* add blacklist to cigpackbase for chems (#5402)

* add blacklist to cigpackbase for bottle and vial

* hold up i forgot half the shit

* Automatic changelog update

* Tweak the Health Analyzer Triage System  (#5110)

* guh

* applied suggestions + made medical access only

* Automatic changelog update

* Minor Rat King Tweaks (#5326)

* baby rat king tweaks

* requested changes

* Automatic changelog update

* Port over Funky's unary pipe layers (#5372)

* port over funkies unary layers and put them under _funky namespace

* fix construction thingies having names that cause yaml linter to fail

* why does yamllinter not show errors on my machine

* Apply suggestions from code review

Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>

* addd attributions

Co-authored-by: BarryNorfolk <barrynorfolkman@protonmail.com>
Signed-off-by: Pharaz4 <143268074+Pharaz4@users.noreply.github.com>

* add attributions 2

Co-authored-by: BarryNorfolk <barrynorfolkman@protonmail.com>
Signed-off-by: Pharaz4 <143268074+Pharaz4@users.noreply.github.com>

* add attributions 3

Co-authored-by: BarryNorfolk <barrynorfolkman@protonmail.com>
Signed-off-by: Pharaz4 <143268074+Pharaz4@users.noreply.github.com>

* Update Resources/Prototypes/_Funkystation/Entities/Structures/Piping/Atmospherics/alt_layers.yml

Signed-off-by: BarryNorfolk <barrynorfolkman@protonmail.com>

---------

Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Pharaz4 <143268074+Pharaz4@users.noreply.github.com>
Signed-off-by: BarryNorfolk <barrynorfolkman@protonmail.com>
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Co-authored-by: BarryNorfolk <barrynorfolkman@protonmail.com>

* Automatic changelog update

* Hos Aura Buff (#5425)

* that should do it

* copyright update

* more work done

* Rename Icon.png to icon.png

Signed-off-by: Halo3moth <mdavid.wininger@gmail.com>

---------

Signed-off-by: Halo3moth <mdavid.wininger@gmail.com>

* Automatic changelog update

* Map Edits: Tortuga (#5437)

* Map Edits: Tortuga

* Additional changes

* Passive vents

* oh yeah

* review fixes

---------

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>

* Automatic changelog update

* Submarine Fixes (#5394)

MASS UPDATE

* Automatic changelog update

* Map Edits: Evac Shuttles (#5457)

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>

* Automatic changelog update

* Lighthouse Arrivals (#5419)

* Update lighthouse.yml

* Update lighthouse.yml

* Update lighthouse.yml

* Update lighthouse.yml

* Update lighthouse.yml

* Automatic changelog update

* Update division.yml (#5465)

* Terra Hotfix 4 - It's Alive! (#5432)

* Terra Hotfix 4 - It's Alive!

* Removed all bombing targets from warp points

* Renamed Vault substatin, extended cargo dock, added AI restore to AI Sat, changed arrivals screen

* Automatic changelog update

* fix missing exception on lavaland ruin (#5472)

* Elegance Engineering Crates Hotfix (#5468)

* Update elegance.yml

* Update elegance.yml

* Update elegance.yml

* Automatic changelog update

* Merge Upstream

---------

Signed-off-by: zelezniciar1 <39102800+zelezniciar1@users.noreply.github.com>
Signed-off-by: Pharaz4 <143268074+Pharaz4@users.noreply.github.com>
Signed-off-by: Thingy461 <darmentici@gmail.com>
Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Field Command <159087063+FieldCommand@users.noreply.github.com>
Signed-off-by: PureBreadBagel <146181383+PureBreadBagel@users.noreply.github.com>
Signed-off-by: Madison Rye Progress <makyo@drab-makyo.com>
Signed-off-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
Signed-off-by: keekee38 <iamabanana372456@gmail.com>
Signed-off-by: Stop-Signs <stopsign221@gmail.com>
Signed-off-by: This_Is_Gray <167829864+IAmNotGray@users.noreply.github.com>
Signed-off-by: AeraAulin <133451603+AeraAuling@users.noreply.github.com>
Signed-off-by: BarryNorfolk <barrynorfolkman@protonmail.com>
Signed-off-by: Halo3moth <mdavid.wininger@gmail.com>
Co-authored-by: Samuka <47865393+Samuka-C@users.noreply.github.com>
Co-authored-by: SnappingOpossum <snappingopossum@outlook.com>
Co-authored-by: BarryNorfolk <barrynorfolkman@protonmail.com>
Co-authored-by: Hohenzolaren <153686236+ReWAFFlution@users.noreply.github.com>
Co-authored-by: ReWAFFlution <239567049+brokendot@users.noreply.github.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: Jessey van Hoeijen <114107545+LMSNoise@users.noreply.github.com>
Co-authored-by: Stefano Pigozzi <me@steffo.eu>
Co-authored-by: Connor Huffine <chuffine@gmail.com>
Co-authored-by: YoungThug <ramialanbagy@gmail.com>
Co-authored-by: CDWimmer <31413434+CDWimmer@users.noreply.github.com>
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
Co-authored-by: Alzore <140123969+Blackern5000@users.noreply.github.com>
Co-authored-by: imatsoup <93290208+imatsoup@users.noreply.github.com>
Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com>
Co-authored-by: alexalexmax <149889301+alexalexmax@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Co-authored-by: NoreUhh <85219416+NoreUhh@users.noreply.github.com>
Co-authored-by: NoreUhh <noreuhh@gmail.com>
Co-authored-by: JackspajfMain <105893899+JackspajfMain@users.noreply.github.com>
Co-authored-by: Minemoder5000 <minemoder50000@gmail.com>
Co-authored-by: āda <ss.adasts@gmail.com>
Co-authored-by: iaada <iaada@users.noreply.github.com>
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com>
Co-authored-by: Ignaz "Ian" Kraft <ignaz.k@live.de>
Co-authored-by: Noah Beverly <noahbeverly@gmail.com>
Co-authored-by: Justin Pfeifler <jrpl101998@gmail.com>
Co-authored-by: Milon <milonpl.git@proton.me>
Co-authored-by: zelezniciar1 <39102800+zelezniciar1@users.noreply.github.com>
Co-authored-by: Halo3moth <mdavid.wininger@gmail.com>
Co-authored-by: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com>
Co-authored-by: Astra <226853568+EmberAstra@users.noreply.github.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>
Co-authored-by: Pharaz4 <143268074+Pharaz4@users.noreply.github.com>
Co-authored-by: Thingy461 <darmentici@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Co-authored-by: ConstantlyConfused <67894661+Eternally-Confused@users.noreply.github.com>
Co-authored-by: Theo <rebe83a@gmail.com>
Co-authored-by: Field Command <159087063+FieldCommand@users.noreply.github.com>
Co-authored-by: PureBreadBagel <146181383+PureBreadBagel@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: DeltaV-Bot <github@deltav.gay>
Co-authored-by: verybigman <171044200+verybigman311@users.noreply.github.com>
Co-authored-by: keekee38 <iamabanana372456@gmail.com>
Co-authored-by: Madison Rye Progress <makyo@drab-makyo.com>
Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
Co-authored-by: Vanessa <vanessalouwagie@gmail.com>
Co-authored-by: This_Is_Gray <167829864+IAmNotGray@users.noreply.github.com>
Co-authored-by: marigauge <thesaiyandude3@gmail.com>
Co-authored-by: MD360 <74264906+MantasDab360@users.noreply.github.com>
Co-authored-by: Katie <Katiethekater@gmail.com>
Co-authored-by: turtlemutt <wolfybriggan575@gmail.com>
Co-authored-by: Hamey <jhammett3229@gmail.com>
Co-authored-by: Woljif <243318409+Woljif@users.noreply.github.com>
Co-authored-by: snowywinters <134970424+snowywinters@users.noreply.github.com>
Co-authored-by: biddygelson <4606269+Calis007@users.noreply.github.com>
Co-authored-by: Stop-Signs <stopsign221@gmail.com>
Co-authored-by: Stxcking <217132821+Stxcking@users.noreply.github.com>
Co-authored-by: DisposableCrewmember42 <disposablecrewmember42@proton.me>
Co-authored-by: KOTOB <59124164+kotobdev@users.noreply.github.com>
Co-authored-by: AeraAulin <133451603+AeraAuling@users.noreply.github.com>
Co-authored-by: Cepelinas1 <kakelis01@gmail.com>
Co-authored-by: wesker <53323309+weskified@users.noreply.github.com>
Co-authored-by: pootslap <211648338+pootslap@users.noreply.github.com>
Co-authored-by: Vape <76235372+Vapetastic-Gaming@users.noreply.github.com>
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
Co-authored-by: SirrRequiem <webrules11@yahoo.com>

* Revert "One refactor to rule them all (#15)"

This reverts commit b2a2613ad7.

* fix fails

* THE LAST REFACTOR

* Fix test fails

* more test fails

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Test fails BE GONE

* small fix

* Remove Mime powers from Psionics

* Adress Initial Reviews

Co-Authored-By: BarryNorfolk <190395382+BarryNorfolk@users.noreply.github.com>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Fix csproj file

Signed-off-by: Sir Warock <67167466+SirWarock@users.noreply.github.com>

* Fix the other

Signed-off-by: Sir Warock <67167466+SirWarock@users.noreply.github.com>

* Adress other review

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update Content.Shared.csproj

Signed-off-by: Sir Warock <67167466+SirWarock@users.noreply.github.com>

* Remove CSProj change

Signed-off-by: Sir Warock <67167466+SirWarock@users.noreply.github.com>

* Erase empty space

Signed-off-by: Sir Warock <67167466+SirWarock@users.noreply.github.com>

* das

* UNTOUCH THE GODDAMN FILE

* untouch file

Signed-off-by: Sir Warock <67167466+SirWarock@users.noreply.github.com>

* Fix goidacode

* Merge fixes

* Adhere to the messaiah

---------

Signed-off-by: Proxy also works :3 <98499019+Proxysseia@users.noreply.github.com>
Signed-off-by: Halo3moth <mdavid.wininger@gmail.com>
Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>
Signed-off-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: BungleBoss <100389635+BunglesnortBoss@users.noreply.github.com>
Signed-off-by: Charlie Morley <cmorley191@gmail.com>
Signed-off-by: zelezniciar1 <39102800+zelezniciar1@users.noreply.github.com>
Signed-off-by: Pharaz4 <143268074+Pharaz4@users.noreply.github.com>
Signed-off-by: Thingy461 <darmentici@gmail.com>
Signed-off-by: Field Command <159087063+FieldCommand@users.noreply.github.com>
Signed-off-by: PureBreadBagel <146181383+PureBreadBagel@users.noreply.github.com>
Signed-off-by: Madison Rye Progress <makyo@drab-makyo.com>
Signed-off-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
Signed-off-by: keekee38 <iamabanana372456@gmail.com>
Signed-off-by: Stop-Signs <stopsign221@gmail.com>
Signed-off-by: This_Is_Gray <167829864+IAmNotGray@users.noreply.github.com>
Signed-off-by: AeraAulin <133451603+AeraAuling@users.noreply.github.com>
Signed-off-by: BarryNorfolk <barrynorfolkman@protonmail.com>
Signed-off-by: Sir Warock <67167466+SirWarock@users.noreply.github.com>
Co-authored-by: Sir Warock <67167466+SirWarock@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: AeraAulin <133451603+AeraAuling@users.noreply.github.com>
Co-authored-by: turtlemutt <wolfybriggan575@gmail.com>
Co-authored-by: Field Command <159087063+FieldCommand@users.noreply.github.com>
Co-authored-by: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com>
Co-authored-by: SirrRequiem <webrules11@yahoo.com>
Co-authored-by: biddygelson <4606269+Calis007@users.noreply.github.com>
Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
Co-authored-by: HTML/Crystal <152909599+HTMLSystem@users.noreply.github.com>
Co-authored-by: ConstantlyConfused <67894661+Eternally-Confused@users.noreply.github.com>
Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com>
Co-authored-by: Proxy also works :3 <98499019+Proxysseia@users.noreply.github.com>
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Co-authored-by: Dorragon <101672978+Dorragon@users.noreply.github.com>
Co-authored-by: Halo3moth <mdavid.wininger@gmail.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: DeltaV-Bot <github@deltav.gay>
Co-authored-by: Stxcking <tamthaotran5@outlook.com>
Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com>
Co-authored-by: Cepelinas1 <kakelis01@gmail.com>
Co-authored-by: zelezniciar1 <39102800+zelezniciar1@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>
Co-authored-by: KOTOB <59124164+kotobdev@users.noreply.github.com>
Co-authored-by: Charlie Morley <cmorley191@gmail.com>
Co-authored-by: This_Is_Gray <167829864+IAmNotGray@users.noreply.github.com>
Co-authored-by: verybigman <171044200+verybigman311@users.noreply.github.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>
Co-authored-by: BungleBoss <100389635+BunglesnortBoss@users.noreply.github.com>
Co-authored-by: MD360 <74264906+MantasDab360@users.noreply.github.com>
Co-authored-by: snowywinters <134970424+snowywinters@users.noreply.github.com>
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
Co-authored-by: Minerva <218184747+mnva0@users.noreply.github.com>
Co-authored-by: Samuka <47865393+Samuka-C@users.noreply.github.com>
Co-authored-by: SnappingOpossum <snappingopossum@outlook.com>
Co-authored-by: BarryNorfolk <barrynorfolkman@protonmail.com>
Co-authored-by: Hohenzolaren <153686236+ReWAFFlution@users.noreply.github.com>
Co-authored-by: ReWAFFlution <239567049+brokendot@users.noreply.github.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Co-authored-by: Jessey van Hoeijen <114107545+LMSNoise@users.noreply.github.com>
Co-authored-by: Stefano Pigozzi <me@steffo.eu>
Co-authored-by: Connor Huffine <chuffine@gmail.com>
Co-authored-by: YoungThug <ramialanbagy@gmail.com>
Co-authored-by: CDWimmer <31413434+CDWimmer@users.noreply.github.com>
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
Co-authored-by: Alzore <140123969+Blackern5000@users.noreply.github.com>
Co-authored-by: imatsoup <93290208+imatsoup@users.noreply.github.com>
Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com>
Co-authored-by: alexalexmax <149889301+alexalexmax@users.noreply.github.com>
Co-authored-by: NoreUhh <85219416+NoreUhh@users.noreply.github.com>
Co-authored-by: NoreUhh <noreuhh@gmail.com>
Co-authored-by: JackspajfMain <105893899+JackspajfMain@users.noreply.github.com>
Co-authored-by: Minemoder5000 <minemoder50000@gmail.com>
Co-authored-by: āda <ss.adasts@gmail.com>
Co-authored-by: iaada <iaada@users.noreply.github.com>
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: Ignaz "Ian" Kraft <ignaz.k@live.de>
Co-authored-by: Noah Beverly <noahbeverly@gmail.com>
Co-authored-by: Justin Pfeifler <jrpl101998@gmail.com>
Co-authored-by: Milon <milonpl.git@proton.me>
Co-authored-by: Astra <226853568+EmberAstra@users.noreply.github.com>
Co-authored-by: Pharaz4 <143268074+Pharaz4@users.noreply.github.com>
Co-authored-by: Thingy461 <darmentici@gmail.com>
Co-authored-by: Theo <rebe83a@gmail.com>
Co-authored-by: PureBreadBagel <146181383+PureBreadBagel@users.noreply.github.com>
Co-authored-by: keekee38 <iamabanana372456@gmail.com>
Co-authored-by: Madison Rye Progress <makyo@drab-makyo.com>
Co-authored-by: Vanessa <vanessalouwagie@gmail.com>
Co-authored-by: marigauge <thesaiyandude3@gmail.com>
Co-authored-by: Katie <Katiethekater@gmail.com>
Co-authored-by: Hamey <jhammett3229@gmail.com>
Co-authored-by: Woljif <243318409+Woljif@users.noreply.github.com>
Co-authored-by: Stop-Signs <stopsign221@gmail.com>
Co-authored-by: Stxcking <217132821+Stxcking@users.noreply.github.com>
Co-authored-by: DisposableCrewmember42 <disposablecrewmember42@proton.me>
Co-authored-by: wesker <53323309+weskified@users.noreply.github.com>
Co-authored-by: pootslap <211648338+pootslap@users.noreply.github.com>
Co-authored-by: Vape <76235372+Vapetastic-Gaming@users.noreply.github.com>
Co-authored-by: BarryNorfolk <190395382+BarryNorfolk@users.noreply.github.com>
2026-04-15 22:33:57 +02:00
Tobias Berger 8aceccfb9d
Merge pull request #5316 from BarryNorfolk/merge_dec_jan
Upstream Merge (December 2025 - Jan 16th 2026)
2026-04-11 18:27:39 +00:00
BarryNorfolk 63b2eadada
[K9] Rework Grappling (#5337)
* Remove unused ProtoId

* Remove unused variable

* Move the entire of grappling into shared

* Move grappler to Secdog base to enable all secdogs to grapple

* Fix prediction on grappling from move to shared

* Also block any StandUpAttempt events

* Remove secdog hand disabling and up cooldown to 15 seconds

* Add grapple activation modes

* Implement new activation mode handling

* Allow damage accumlated to release grapples

* Add initial damage to activation mode

* Immediately refresh modifiers on releasing of grapple

* Check accumulated damage constantly, clear damage via timer

* Only emit popups from server side

* Update Laika's grappler component to use new activation mode

* Add event for entering stamina crit

* Release grapple when victim enters crit

* Minor rewording of grapple starting

* Typo

* Rely solely on the shared system for grappling now

* Change activation mode from class to interface
2026-04-11 17:35:25 +02:00
Tobias Berger 9a4e406717
Revert APC max load to 20kW (#5641) 2026-04-09 19:13:30 +02:00
BarryNorfolk 39742fda38
Fix target immune (#5386)
* Add a new filter for checking ObjectiveImmune on both the mind and players' entity

* Swap from TargetObjectiveMind filter to ObjectiveImmune filtering

* Better if statement for checking body
2026-04-07 16:38:47 +00:00
BarryNorfolk ec74175d39
Make both CosmicColossus and Skia immune to tasers (#5374)
* Add blacklisting for StunOnCollide on a tag

* Add new TaserImmune tag and apply it to BulletTaser

* Block Colossus and Skia from being tased
2026-04-07 10:23:17 +00:00
BarryNorfolk 7f8712f086
Fix IPCs losing access to radio implants when locked/unlocked (#5456)
Ensure radio implants are checked when updating channels for IPCs
2026-04-07 09:45:08 +02:00
Theo 47f8d4ddc5
removed shuttle calling ion law (#5591)
* removed shuttle calling law

* make duplicate law roll instead
2026-04-06 13:04:57 +02:00
Stxcking 2998efd4bf
Fix: Energy Gun Fire Mode Pop-up Message (#5624)
buh
2026-04-05 15:24:32 +02:00
DisposableCrewmember42 0ce8d934f4
cherry-pick: upstream's damage-dependent ghost sprites (#5516)
Ghost types  (space-wizards/space-station-14#37949)

* Empty commit

* yeah thingi

* added a GetHighestDamageTypes thingi to the DamageableSystem

* no idea why those files names are different only in github so just in case readding them

* yeah doing that

* first steps of moving the logic somewhere nicer

* still plenty to do

* gosh such a mess but getting progress done

* small fixie push

* big mess of bunch of stuff

* dealing with a conflict and fixing the random numbers

* testing if github will update now

* dealing with the other conflict

* github please update i beg you

* dealing with more conflicts

* hopefully this fixes it

* fixing conflicts again

* cleaning up stuffies

* sprite fixie

* general cleanup

* doing the small fixies first

* getting rid of the new event, gotta handle ashing next

* adding spaces to comments before i forget

* handling ashing

* think that did it?

* small fixies

* more small fixies

* last batch of quickie fixies before i gotta handle the bigger stuff

* last bunch of fixies i do understand

* small bit of progress yknow may as well yeah

* renaming and moving stuff to shared

* comment fixiees

* saving damage in a new component instead of in MindComponent

* protoid's and dict usage instead of the previously ickier methods

* small fixie before biggie fixie

* more fixies im slepy gosh

* thinkie that should fixie it

* smoothed the damage storage systeem so its less repetitive and icki and now itss cooler and i can go eepy

* lots of stuffies x3

* first step of getting git to detect my file name changes

* thinkie that should fixie it

* fixies

* just getting rid of the merge conflict, will check damageable later

* small thingies first

* more small stuffiees

* now all of the sprites have at leeast a 0

* dirtying the lastbody comp

* more fixies

* small thingi first

* another small fixie and a minor sprite fixie

* rng fixie

* moving the damage storage system to shared

* smoothing out code thats likely to be replaced soon but its good to do for now

* just showing progress bcus yis

* general progress stuffies mhm

* pushie

* small cleanup

* general progress :3

* in progress push for helpie

* proper pushie with progress and workies

* removed unnecessary usage of the storedamage component

* minor fixiees

* extra comments

* replaced a couple strings for ProtoId's

* gibbing related fixies :3

Signed-off-by: DisposableCrewmember42 <disposablecrewmember42@proton.me>
Co-authored-by: Thinbug <101073555+Thinbug0@users.noreply.github.com>
2026-04-04 21:39:24 +02:00
Velken d3086de6d6 Admin Anomaly Scanner (#42443)
* admin anom scanner

* improvement

* green

* sprite
2026-04-04 16:57:55 +02:00