master #4

wylab · 2025-12-22T21:52:23+01:00

wylab commented

2025-12-22 21:52:23 +01:00

Описание PR

Почему / Баланс

Технические детали

Медиа

Требования

Я прочитал(а) и следую Рекомендациям по оформлению Pull Request и Changelog.
Я добавил(а) медиафайлы к этому PR или он не требует демонстрации в игре.

Критические изменения

Список изменений

## Описание PR  ## Почему / Баланс  ## Технические детали  ## Медиа  ## Требования  - [ ] Я прочитал(а) и следую [Рекомендациям по оформлению Pull Request и Changelog](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html). - [ ] Я добавил(а) медиафайлы к этому PR или он не требует демонстрации в игре.  ## Критические изменения  **Список изменений**

wylab added 212 commits 2025-12-22 21:52:24 +01:00

Change Ephedrine, Desoxyephedrine and Hyperzine properties (#41693 ) d6987343f7

* merff (no numbness)

* I can't feel a thing

* Update self-damage and OD values

* Missed a 5

Automatic changelog update 5c40b501f5

Exo - Botany update and minor fixes (#41598 ) 0b11625278

Exo 1.14

Automatic changelog update 6febe0fa58

Warfarin and Hemorrhinol, Hemophilia turned into a StatusEffect (#41685 ) 405bc6c8f1

* init

* yeah

* move folders

* comments

* i hate cloning sometimes

* review

* review squred

* fix stuff

Automatic changelog update 4ab7209323

Add missing vox unequipped sprite for explorer mask (#41405 ) 5f757bd838

Mask on face

Automatic changelog update 88561d4e83

Fix recharging spray painters (#41725 ) f182004578

change one line

Automatic changelog update f5308cde93

New figurine voicelines (#41723 ) 080ab214c6

Automatic changelog update 8d6097be9a

C# 14 fixes (#41708 ) da3e331366

Necessary for the move to .NET 10 & C# 14. Actual PR to change SS14 to C# 14 will be separate.

Fix shuttle FTL with UI scale (#40933 ) 3944268fe4

Fixed click inputs being broken

Fixed rendering of background parallax.

Automatic changelog update ad8597c198

Remove static IoC from Replay and Shared EntryPoint (#41707 ) e360f6e03a

Cleanup warnings: CS0114, CS0414, CS0618 (#41578 ) fca8d95f03

* Cleanup

* Revert

Replace Vestine-derivatives in plant mutations, change uplink prices & hypopen to reflect changes (#41716 ) 3b69c10fc8

* Initial commit

* It's a toxin!

* Review changes

* Review changes

Automatic changelog update ce0126b725

Vestine now Mutates Plants to Produce Vestine (#41731 ) 8054071c32

* ready freddy!

* remove that shit

* fsasfaf

---------

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

Automatic changelog update 92263d2430

Predict ReactionMixerSystem (#41218 ) 9268cec0c9

* predict

* documentation

* review

move GameMapPrototype and GameMapCondition to shared (#41742 ) 432c9578be

* move GameMapPrototype and GameMapCondition to shared

* fix

Remove explosive component from mothership cpre (#41743 ) d54a431584

remove explosive comp

Automatic changelog update 6de6217242

Adds the sticky grappling hand (#37551 ) 9bd27fd245

* Adds sprites, entity and sounds for sticky grappling hand

* Switched audio to mono

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml

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

* Added empty sound, changed yaml to suit conventions, added description

---------

Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com>
Co-authored-by: āda <ss.adasts@gmail.com>
Co-authored-by: iaada <iaada@users.noreply.github.com>

Automatic changelog update 9e71a4212b

Update Credits (#41750 ) 49656df410

Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>

Add voice mask implant (#41551 ) dd79254a0f

* Add voice mask implant

* Remove voice mask

* Voice mask implant now  overrides your identity

* voice mask implant can now be extracted, when taking out the voice mask implant it now updates your name proplery

* Simplify logic

Automatic changelog update c9ebb1b6b7

Remove Zookeeper and Boxer jobs (#41741 ) 58f884133b

Automatic changelog update 113507d4b4

Fixed hyperzine (micro)injector descriptions (#41755 ) 35ea5f1820

Automatic changelog update e0299c9afa

Snap Booms (fake snap pops) (#38654 ) c164897ead

* snap booms

* damage nerf

* fixing brain issue of being 8am and i havent slept yet

* typo

* Update damage and name

* Fix linter issues

* fixed typo snapPopFake -> snapPopExplosive

---------

Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>

Automatic changelog update 58b23d3162

Fix box shuttle from overloading instantly (#41753 ) (Stable merge) (#41760 ) 7b3c83c565

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

Add GenPop Enter/Leave to ID Card Computer. Add shuffle the accesses a bit. (#41739 ) 34f60c115e

fixe

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

Automatic changelog update 94327566ef

Double bullet speeds (#34971 ) 51b7af73f7

* Double bullet speeds

The only reason we had it at 20m/s was tunneling reasons.

The quick maths is (BodyA size + BodyB size) / frametime. Currently the game is doing substepping AFAIK so we can use 0.016 as the frametime therefore with a 0.40 width body we can get up to 40.625 (assuming the target is no narrower than 0.25 which given my thindows change last year should be a decently safe assumption).

* Fix

* Fix impact visuals, as they overshoot otherwise

* Revert changes

---------

Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>

Automatic changelog update f99b59b7ed

Green Glowsticks are their own entity (#41712 ) 5b7d3757e6

* Addresses and resolves Issue #41145, creates a separate entity for green glowsticks, which were previously just the base glowstick.

* Adds old+new ID for green glowsticks to migration.yml, refactors formatting in glowstick.yml

Make xenoborg light brighter (#41580 ) ee2e1eb932

* make light better

* minor color fix

Automatic changelog update 7cc256890b

TriggerOnUiOpen/Close (#41718 ) 5c70d28927

* feat: TriggerOnUiOpen/Close

* chore: minor clarification

* Update Content.Shared/Trigger/Components/Triggers/TriggerOnUiCloseComponent.cs

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

* Update Content.Shared/Trigger/Components/Triggers/TriggerOnUiOpenComponent.cs

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

* chore: review

---------

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

Hitscans now have names (#41763 ) 5fdba3f0bc

Co-authored-by: RedSpyy <empty@place.com>

Reverts Mop + Glowstick Storage Rotation (#41765 ) 0eead492de

diagonal pixels are ugly, sorry.

Remove map list from station-specific jobs' descriptions (#41748 ) 9d13d348b4

Automatic changelog update d79065bdbb

fix bagel APC powernet (#41769 ) e8462ebe55

Misc Proper Rotation Sprites (#41764 ) 4f2d2208f5

* Proper rotation sprites.

* copyright mentions

* wrong one

* better ointment

Automatic changelog update 7bc1e94b47

fix box APC powernet (#41770 ) 9806153b93

fix CC APC powernet (#41771 ) 8a29a8d813

fix elkridge APC powernet (#41772 ) c8b71f8989

fix fland APC powernet (#41773 ) 84ce9522b7

Automatic changelog update 94ff457967

fix oasis APC powernet (#41776 ) 8dc131dec6

Automatic changelog update 4bfa0a6eaf

Fix Bible Fast Healing (#41777 ) 36e009f21e

* broble

* slightly cleaner I guess actually

* im straight refactoring it, and by it, i mean.... my entity

---------

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

Automatic changelog update 5fa2028ce9

Allow removing species from the RNG pool of a new player's initial auto-generated character (#41678 ) fde6129e5f

* First commit

* Fix it!

* Requested Changes

Automatic changelog update 25bb98c1a2

TriggerOn(Un)Embed (#41720 ) f1443f0cd7

* feat: TriggerOn(Un)Embed

* feat: StopEmbedEvent

* fix: forgot initialize

* chore: better naming

* chore: oops

* Update Content.Shared/Trigger/Components/Triggers/TriggerOnUnembedComponent.cs

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

* Update Content.Shared/Projectiles/EmbedEvents.cs

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

* review

im lazy

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

* Update Content.Shared/Trigger/Components/Triggers/TriggerOnEmbedComponent.cs

* chore: docs

* comment change

---------

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

fix CL AGAIN (#41782 ) 32c1c44367

Merge stable into master (#41781 ) 406231cdb3

Revert "Trip APCs when they exceed a power limit (#41377)" (#41766)

This reverts commit a5c223c0

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

Reapply "Trip APCs when they exceed a power limit (#41377 )" (#41789 ) 0031beca4b

Revert "Merge stable into master"

Clothing equipping doAfter tweak (#41732 ) 9c2dc04519

* clothing moving break

* Rename EquipOnMoving to EquipWhileMoving

* Update InventorySystem.Equip.cs

Sometimes the Bagel Theater doesn't like showing up to work (#41787 ) c0e90815d9

Automatic changelog update a99452fbb8

Fix batteries not counting towards the battery bounty (#41792 ) e8f018bd8f

add PredictedBattery

Bagel Theater will randomly spawn in partially broken (#41794 ) af2fd9950c

* Revert "Sometimes the Bagel Theater doesn't like showing up to work (#41787)"

This reverts commit c0e90815d9.

* Reapply "Sometimes the Bagel Theater doesn't like showing up to work (#41787)"

This reverts commit 114266990897d338ef25fa435d0ad7350457dd63.

* remove blank

* upd CL

Hushpup Shotgun (#41512 ) e038b07a40

* upstream hushpup

* fixes incorrect filename in attribution

* sprite cleanup

* Make the YAML not ass

* Remove redundant line of code

* Resprite, attributes original sources

* More sourcing fixes

* Last minute sprite touchups

* So... don't accidentally copy paste stuff

* Fixes bolt being on the wrong side while wielded

* adjust rolloffFactor

Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>

* Resprite

* No more pegs

* Spanky mind controlled me to commit these changes

---------

Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>

Automatic changelog update 4197dd352f

fix a typo in the changelog (#41798 ) 3b6d0be65f

fix a typo

Snowball update (#41806 ) 66b9df28df

snowball update

Automatic changelog update 7ada931549

Add paper labels to gas canisters (#41737 ) 3a4484b702

* paper? on canisters? are you KIDDING

* woops forgot something

* I think this'll fix the errors?

Automatic changelog update 92482dfb52

Delete license.txt (#41805 ) 3835489af0

Make door bolting powergaming no longer relevant anymore (#41138 ) 67e18a0693

* make door bolting powergaming no longer relevant anymore
port and remove moff guard comments

* update desc

* One line bugefix

---------

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

Automatic changelog update 95deb3d966

Fix mobs not being blindable (#41788 ) dc616f67e7

added blindable component to BaseSimpleMob

Automatic changelog update 9edf121a15

Add BasePaperLabelable and BasePaperLabelableVisualized abstract prototypes (#41807 ) 6dbd2f6acc

* Add BasePaperLabelable to base_item.yml

* CrateGeneric now parents from BasePaperLabelable

* TWO types of BaseParcelWrapable

* Body bags use BasePaperLabelable

* Artifact containers use BasePaperLabelable

* Lockers now use BasePaperLabelable

* Comment cleanup + redundancies

* Seeds now use BasePaperLabelable (but need more paper sprites in the future)

* Parcel wrap bugfix

* Remove redundant components from crates

* Fix testfail tied to ContainerContainer component

* Fixed bad line alignment

* Gas canisters now use BasePaperLabelableVisualized

* Comment updates

* Other comment update

Migrate Bot Speech Catalogs to One Folder (#41478 ) c5d7444af6

migrate bot speech catalogs to one place

Update the erase script to support the latest migration (#41524 ) c6430203cf

No changes needed, its compatible still

Tested in production :3

Chefs start with chef shoes (#41814 ) 452fdf0165

starting chef shoes

Automatic changelog update 5927babfbe

Fix rigged power cells exploding early (#41813 ) 86f4795849

* fix riggable

* fix

Automatic changelog update 00f86e9bd5

Change that specifies escape via the escape shuttle rather than pods in escape objectives (#41809 ) 2834ac2d50

* specifies escape via escape shuttle (because escape pods do not count)

* corrects capitalization of CentComm

* apply fixes to thief objectives aswell

* apply fixes to paradox clone objectives aswell

Automatic changelog update 67b4ba0425

Predict RootableSystem (#41729 ) 19bad6266f

RootableSystem-move-to-shared

Improve ClothingSpeedModifier, Fix Paramedic Void Suit (#41820 ) 4a460468d0

* Add RequireActivated bool

* Fix paramedic voidsuit

* Remove explicit check

This is actually unnecessarily verbose.

* Improve comment

* Update Content.Shared/Clothing/ClothingSpeedModifierSystem.cs

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

* Add cref linking

* Change reference from system to component

* Fix missing closing tag before anyone notices

* Add clarity about when this field is used.

* Add early return if not affected by toggling

---------

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

Automatic changelog update b7251fbdeb

Soap, Banana peel, and Slip entity tables (#41783 ) fffbc654dd

* commit

* self review

* self review 2

* buff

* nerf

* microbalance continues until i'm happy

* requested and more

---------

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

Add small cooldown to NukeKeypadEnterMessages (#41831 ) 6fc487531c

* cooldown

* d

* time offset serializer

* undo button disabling according to feedback

* Update Content.Client/Nuke/NukeBoundUserInterface.cs

Smart Fridges can contain anything edible (#41830 ) d947dd8c6c

I'm sure this will cause zero unintended consequences

diona are now less debilitated by rooting in blood (#41642 ) 59d0df0e7c

* diona are now less debilitated by rooting in blood

* Rerun tests

* Rerun tests

Automatic changelog update c3c24a664e

Re-sprite the Ripley (#41832 ) 429e925608

newish ripley yay

Remove remote detonation/disable from the robotics console. (#41834 ) 6e85abf26d

End the war

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

Automatic changelog update 2d803293ee

ScramOnTrigger teleportation logic rewrite (#41808 ) cbbf978408

* shuffle logic and remove arbitrary line

* actually fix radius for real

* code comment for clarity

* rewrote SelectRandomTileInRange

* Update Content.Shared/Trigger/Systems/ScramOnTriggerSystem.cs

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

* Update Content.Shared/Trigger/Systems/ScramOnTriggerSystem.cs

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

* i love helper methods!

* remove unused dependencies

* check collisiongroup of teleporting entity

* remove unused dep.

* unused query and init

---------

Co-authored-by: āda <ss.adasts@gmail.com>
Co-authored-by: ScarKy0 <scarky0@onet.eu>

Automatic changelog update 51404cc1e4

Changed PullingSystem to use MobStateChangedEvent instead of UpdateMo… (#41835 ) 75bb75539b

Changed PullingSystem to use MobStateChangedEvent instead of UpdateMobStateEvent

Add KI pills to the radsuit locker (#41576 ) 5944f1a817

* Add KI pills

* Add variability

* Remove unnecessary value

Automatic changelog update b3106a4000

Preserve arbitrage by fixing a bug (#41756 ) 6f5e6445b6

no more infinite money

Automatic changelog update bc3fd3c323

Hand labeler can always remove labels (#40330 ) a761100cf5

* Hand labeler can always remove labels

* Simplify labeling functions

* Address review comments

* Use Entity<Component> more places

* Always use default style for remove label verb

Automatic changelog update 6e04013cf1

All Figurines Entity Table (#41775 ) 594ec9acff

* ai talks

* kill cheepo

* mech figures

* finished

* touchup

* wider net

* final changes

* never final

* fix test fail

* review

---------

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

Update Credits (#41848 ) 41e2a5dad3

Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>

Fixed Vulp Hair layering Under Hoods and Hardsuits (#41827 ) 7d1c75c1bb

fix the freakin hair

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

Don't remove borg access without power (#41844 ) 15968acdf6

* init

* comment

Automatic changelog update 5457ce5ec9

Five bounty arbitrage fixes (#41846 ) 6b3ddc6813

* commit

* tweak

* more bounties

---------

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

Automatic changelog update a92d280a39

Killsign cleanup (#41845 ) 40ae49bb85

* init

* rsi

* review

* scale

* it

* cat, dog, nerd

* rsi

* I just microbalanced animation speed

* raider, stinky resprite

* review

* HideFromOwner

* hidden smite

* copyright

* Apply suggestions from code review

---------

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

Automatic changelog update 2b7361cec7

Edible Produce are now also Butcherable (#36786 ) a40d130f0f

Butcherable Produce

Adds Butcherable capabilities to Bananas, Mimanas, Corn, Gatfruit, Capfruit, Bungo, and Cherries.

Co-authored-by: ScarKy0 <scarky0@onet.eu>

TriggerOnUserInteractHand and TriggerOnUserInteractUsing (#41843 ) 231a93e742

* init

* handle check

* oops

* cleanup

* fix resolve

---------

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

Automatic changelog update 482e963227

Admin log now shows APC power toggle interactions (#41839 ) f202880461

Added logging to the APC's toggle interaction

Automatic changelog update c5148750d5

Adding a random gate (#41627 ) 6fc13a5875

* Added random gate

* minor edit

* cleaning up my shit after trying to do something faster

* new lines

* some changes

* joke

* UI

* Long Division

* Dont use ctrl + x in 3 am

* I hope these are the final touches

* One thing, I don't know why

* noname commit

* no way, 1kk of code lines edit

* sudo rm -rf ... and something there...

* update

* sometimes its sad

Automatic changelog update 368fa40f5c

Assorted minor cleanup (and shotgun shell descriptions) in Resources\Prototypes\Entities\Objects\Weapons\Guns\Ammunition\ (#41841 ) 226f910686

* YAML cleanup of shotgun rounds

* Descriptions for all shotgun ammo types

* YAML cleanup of pistol rounds

* YAML cleanup of magnum rounds (and tweaks to uranium ammo descriptions)

* YAML cleanup of rifle rounds

* YAML cleanup of toy rounds

* YAML cleanup of magnum/pistol/rifle/shotgun projectiles

* YAML cleanup of magnum/pistol/toy speedloaders

* YAML cleanup of light rifle rounds

* Descriptions for anti-materiel rounds and boxes

* YAML cleanup of base_cartridge.yml

* YAML cleanup of caseless rounds (plus minor viper-mag description tweaks)

* YAML cleanup of heavy rifle rounds

* YAML cleanup of grenades and explosives

* machine pistol magazine is now Security contraband

* Practice ammunition description updates

* Missed a magnum ammo description tweak

* Whoops, misspelled the word 'description' a lot

* Practice ammunition description updates 2!

* Better name/description for joke L6 foam dart mag

* Tweak to that last commit

* Fixed practice machine pistol magazines using real bullets

Automatic changelog update 30afada8f3

Skeletons are now affected by Holy damage (#41757 ) 410b2c9945

Automatic changelog update ff8a000a0a

Make gun chamber empty by default (#41791 ) cc90ac99f8

gun chamber empty by default now

Co-authored-by: RedSpyy <empty@place.com>

Toys entity tables (#41840 ) 7eb797e7e5

* ai talks

* kill cheepo

* mech figures

* finished

* touchup

* wider net

* final changes

* never final

* fix test fail

* commit

* self review

* self review 2

* buff

* nerf

* microbalance continues until i'm happy

* requested and more

* toys.yml is scary

* pace yourself, hun

* finished tables

* update related tables

* finish tables

* spawners

* new item

* other tables and cargo crate

* move board games

* commit

* last changes

* last last changes

* bounty changes

* remove pies :o(

* readjust prices

* requested microbalance

* friends for life

---------

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

Automatic changelog update faa12d0e66

Fix plant metabolism in guidebook. (#41854 ) 5650e6be0f

* AAAAAAAAAAAAAAAAAAAAAAA

* cleaner

* even cleaner

---------

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

Move logic from EvenHealthChangeEntityEffectSystem to the damage system API (#41684 ) 12b9e3735b

* add two methods

* move stuff to damage system api

* use TryIndex

* simplify

* minor fix

* add helper functions

* fix

* remove random new line

* simplify

* remove unnecessary lines

* rename to GetDamage

* Got it working

* make more clear

* why backwards

* value should be the amount to heal

* fix

* fix all dumb fixedpoint2 edge cases I hope

* One more thing

* fix

* make it more simple

* ops it was backwards

* valueHeal can't be more than remaining

* add all keys beforehand and no need to check and add them inside the loop

* break for loop in case remaining is zero

* comment was wrong

* optimized, works

* remove random spaces

---------

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

Update to Bardrobe to add Pun Pun's outfit (#41705 ) fbb452b60d

bardrobe update to add pun's outfit

Automatic changelog update 841f22dcfd

Remove roundstart tools from some cyborgs (#41823 ) 12992fd75b

* remove tools

* actually let derelict borgs keep it

Automatic changelog update 9206ad9a64

Fix ColorExtensions math (#41717 ) a0817cdbb3

All of this was doing sRGB -> OkLAB conversions without linearizing the sRGB first, so it was broken. I could have sworn I pointed this out in review but I guess that got lost.

Also, add a gamut clipping step since we have out-of-gamut colors and I don't want random negative values causing weird nightmare bugs somewhere. Shouldn't change anything in regular rendering.

Rollersakes heisen bounty (#41859 ) 4d76c13051

commit

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

Fix news console formatting and pda news formating (#41799 ) 42e7bad3df

* Fix news console formatting

* another fix

* Fix review

Un-copy-paste. Twice. *sigh*

---------

Co-authored-by: PJB3005 <pieterjan.briers+git@gmail.com>

Remove most unknown shuttle events (#41860 ) 6c9ef19e9e

All except the hostile ones (which is like, three. I didn't even know we had hostile ones other t han loneop)

These are complete content slop bloat

Automatic changelog update 165d5ecc2e

ERT Overhaul 1/3: Apparel (#37855 ) 5f6c08e101

* Initial commit: Added ERT web vest and sprites, added ERT magboots.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added duffle bag and magboots

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Half finished updating the web vest

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Removed unused items

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added ERT chest rig, changed sprites of backpacks

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Parented all ERT hardsuit stats to nukie hardsuits

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Parented ERT backpacks to syndicate ones

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* changed size of ERT backpacks

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Unparented ERT duffels from syndicate ones

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Fixed belt sprites

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Fixed ERT medic backpack sprite

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added explosion resistance to backpacks

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Removed ERT duffel bag.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

---------

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

Adds crowbar to Mediborg Rescue Module (#41861 ) 2b08ae480d

Added crowbar to Borg Rescue module.

ERT Overhaul 2/3: Equipment (#38105 ) bfb0c1791e

* fixed naming

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added equipment to be used by ERT.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added flamethrower suffix

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added hydra filled with frag grenades

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Made basic grenades centcomm restricted

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Made energy swords central command contraband

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Parented ERT backpacks to syndicate ones

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Revert "Parented ERT backpacks to syndicate ones"

This reverts commit 615526512d90ea17c0e452ed24fdb351f54740bc.

:wq#

* Updated labels and containers

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added ERT survival box with double emergency tank

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* removed flamethrower

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Made C4 CC contra, reverted Incen to syni contra

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* reverted contraband

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* revert the rest of the contraband

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Heisentest

* Added label component to spray bottles.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added suffixes to the space cleaner bottles

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

---------

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

Automatic changelog update 1e01a1ed6b

Revert "Remove most unknown shuttle events" (#41862 ) c65dba54b3

Revert "Remove most unknown shuttle events (#41860)"

This reverts commit 6c9ef19e9e.

Prevent Initial Infected from rolling on evac (#41863 ) 83e1a6a8eb

evac ambuzol

Repairing borgs now takes multiple doafters (#41638 ) d53fe69b86

* borg repair is now multiple doafters

* is a float now

* use else

* remove random new line i added for some reason

* add new line at the end of the file

* add documentation

* made repair system super robust

* borg heal faster from crit

* forgot to make it a datafield

* less overpower

* cant repair futher than the threshold for alive if not alive or dead

* fix math

* more math

* fixes

* some comentary

* more accurate

* simple solution

* new solution

* better numbers

* more accurate

* use helper function

* fine tunning the number

* better way to restart the doafter

* update AutoDoAfter

* not used

* more clear

* remove inline if

* improve helper methods

* updare pop up message

* another unused

* nuke consecutive repair bonus

* increase the repair (so it doesn't take ages to fix a borg)

* back to 10 per repair

* heal evenly

* fix for edge case

* fix

* fix

* it works now

* add / fix comments

* small clean up

* make easier to understand

* use FixedPoint2.Zero

* make it smaller

* add support for group even heal

* ops

* easier to read

* typo

* make the HealEvenly better

* rename to GetDamage

* negative value

* Update Content.Shared/Repairable/RepairableSystem.cs

---------

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

Automatic changelog update d602541c1d

Add tile atmosphere tests (#41228 ) 2619bc47ef

* Tile atmosphere tests

* master markers

* TryLoadMap

* whoopsie

* Dirty

* Add new abstract class, room spacing tests

* review

Ignite atmosphere on explosions (#41262 ) b17ee1c882

* Ignite atmosphere on explosions

* Fixed to add a temperature property

* Code review corrections

* Removed unused usings

* Correction to use TryComp instead of EntityManager to make it prettier

* Code review corrections

* Code review corrections

* Corrections

* misc fixes

---------

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

Automatic changelog update 61bf74e4e3

Add myself to atmos codeowners (#41869 ) 574cdf9c4c

yep thats right

Exo - Exomas Version (revertable) (#41715 ) a0e7fe8233

kill

Automatic changelog update 5e96325001

Cryogenics evenheal + New chem "Arcyrox" (#41696 ) 10b989e7bf

* Cryo chems

* Actually cryo eats a lot of this stuff, should probably buff the amount you get...

* minor necrosol buff

* fuck it old recipe

* Fucked up my math, half is closer to 6 here.

* cryox

---------

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

Automatic changelog update 971d4efca8

Xenoborg door control module (#41546 ) 0fb6f26edb

* add door control module

* some commentary

* can't eject stuff anymore

* make xenoborg door remote eletrify doors

* clean yml

* anchors and aliases

* not show stuff about id in xenoborg access config

* engi xenoborg can see eletrified doors

Automatic changelog update 7d0f1b335b

Remove unused tags tied to unused entities (#41366 ) 49743515ee

* commit

* fix for haunted

* not a magazine

* unused sprites

* the lost tags

---------

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

Add audio collections for Weh, Hew, and Honk to Vulps (so that they have audio when they do that) (#41610 ) 8fba285cdb

Vulps can weh and honk now

Automatic changelog update 619f807b97

Fix mothership core fixture (#41745 ) 45eb268247

fix mothership core fixture

Station AI now rolls before most standard crew (#41663 ) ab64807e2c

* Station AI now rolls before standard crew

* github tests are high

---------

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

Automatic changelog update 5e907889d9

Add foolbox (#41473 ) 186b6460c7

* Add foolbox to clown lockers

* this is beter

* updated table w/ new items

* more clown like

* Tweaks

* thank you iaada

* cleanup

* review

* fun!

* fixes and microbalance

* clowns start with it inhand now

Automatic changelog update 13638bd655

Tweak Killer Tomato Size (#35866 ) 870b8db076

* Update miscellaneous.yml

y tho

* Apply suggestions from code review

---------

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

Automatic changelog update 110b8e16dd

Small improvement to suit sensor update loop (#41872 ) b0b88b216d

commit

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

Decouple standing state and drop item behavior (#41566 ) 2a596d283c

* removed DropHandsItemEvent from standing state system, added DropHandsItemEvent calls in slippery system and shared stun system

* added DropHandItemsEvent calls in mobstate system subscribers

* Added DropHandItemsEvent call in SharedBodySystem.Parts

* Add a standingState check in RemoveLeg so removing the legs of a downed person won't cause them to drop items

* new method for downing + dropping held items in mobstatesystem

* mild cleanup

* Bugfix

* update BuckleTest to reflect new item dropping behavior when removing legs

* light cleanup

---------

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

Automatic changelog update 20600ab700

Arcryox Metabolism Fix (#41881 ) 4643bb8bbb

* fix arcryox metabolism

* dont change that shit wrong branch

---------

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

fix AI battery alert (#41879 ) 5facf93b4a

* fix AI battery alert

* fix copy paste error

Automatic changelog update 41042fcfb7

wallmount debug overlay (#38495 ) 19126949c3

* wallmount debug overlay

* make circles a little smoother

* add permissions

* Update Resources/Locale/en-US/commands/show-wallmounts-command.ftl

Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com>

* fix

---------

Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

Fix destructible benchmark OOMing (#41880 ) f079ec6233

* not working

* fix

Prevent Vestine and all other Botany chemicals from affecting all seeds. (#41883 ) 4aa7a963dc

* EnsureUniqueSeed

* mfw

* aaaaaaaaaaaaa

---------

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

TriggerOnIngested (#41875 ) 2ef64bd5cc

* init

* nobody will ever know i copy paste

* i hate these names

* comment

---------

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

Remove flammability mass (#41803 ) 2455dbbdb0

* Remove flammability mass

* Adjust mass fudge number

* Remove fudge

Automatic changelog update 511b66df0f

Fix prototypes so they pass analyzer checks (again) (AGAIN) (#41882 ) 4484f0f351

fix

Metabolizing bloodstream (#35071 ) 0e76d4e5ed

* merged chemical into bloodstream

* changed injectable to bloodstream

* separated bleeding and direct blood removal

* removed blood gain from protein

* reduced blood gain from saline

* rejuvenating fills to reference volume

* fixed blood regulation

* red mead requires stirring to make

* reverted accidental line deletion

* cleared the skeletons from the closet

* additional routing

* field rename for xeno

* removed mention of chemstream and field rename for asteroid mobs

* minor optimizations

* Revert "reduced blood gain from saline"

This reverts commit de26fd1c0d99f3019fe7dd1451a50230cc90f058.

* Revert "removed blood gain from protein"

This reverts commit 7a1648caf39fe26406db73c2a5afa389b82c612f.

* removed unused component fetch

* dead check mini refactor

* eventized blood exclusion

* quick fix

* Pain

* Commit of doom

* COMMIT

* renamed bloodMaxFactor to MaxVolumeFactor

* addressed floating point error

* returned vomiting chemicals

* blood reagent always skips the flush

* no need to mention blood reagent

* fixed passing blood flush

* adadsafasfasfassfasf

* whoops

* merge fixed injectors

* Revert "adadsafasfasfassfasf"

This reverts commit 0a5313a68dd6484d36d28d08930c76851b72ae38.

* simplify reagent removal

* enabled foreign blood transfusion

* Revert "COMMIT"

This reverts commit 19abd679cd7761ebd47bb242bd644176a3006a42.

* simplified reagent removal when modifying blood level

* removed misleading coment since the changes

* documented MetabolismExclusionEvent

* fixed negative negative modification of blood level

* fixed hypervolemia not normalizing

* constrainted blood modification

* returned bloodpack stop on fully healed

* forgot to stage this

* band aid for diona blood

* swapping GetReagent with GetPrototype

* optimize blood filtering

* multiplicative multi reagent blood level calculation

* removed unused stuff

* optimized blood calculation a tiny bit

* added per reagent blood regulation

* optimized (referenceVolume + bloodReagents) into referenceSolution

* polished coded to proper function

* forgot to stage rootable system change

* clean up, unnecessary GetBloodLevel call

* rename method name to TryAddToBloodstream instead of Chemicals

* placed overfill safety

* cleanup and final touches

* final touch

---------

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

Automatic changelog update 3032251444

Update nix dev env (#41886 ) 97508e81a8

Update flake

Adds BallisticAmmoSelfRefillerComponent (#38537 ) 3c15d9f312

* Adds BallisticAmmoSelfRefillerComponent

And uses it to replace battery-based refilling of the Syndicate L6 and Viper modules.

# Automagic Ballistic Ammo Refilling
- Add `BallisticAmmoSelfRefillerComponent`
- Handle `EmpPulseEvent` to pause refilling behavior for EMP's duration

# Supporting Changes
- Change `Content.Server.Weapons.Ranged.Systems.Update` override in `GunSystem.AutoFire.cs` to `UpdateAutoFire`
- Add `Content.Server.Weapons.Ranged.Systems.Update` to `GunSystem.cs` so that it can call `UpdateAutoFire` and `UpdateBallistic`
- Add public methods to GunSystem for use by refilling implementation
  - PauseSelfRefill
  - IsFullBallistic (same as #299)
  - CanInsertBallistic (same as #299)
  - TryBallisticInsert (same as #299)

* _timing -> Timing

* unspawned count stuff

* imagine building the code before pushing

* - apply to c20r ROW
- make predicted/shared

* revert server system import only changes

* oop

* o great and wise Slarti

* Scar comments

* field deltas + correct serializer

* review

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>

Automatic changelog update 31c91ce342

Give Vulps "Unique" Stomachs (#41893 ) 926a81abe5

* Bit funny init?

* remove reptilianfood tag

* oops too muchgit add Resources/Prototypes/Body/Organs/vulpkanin.yml!

---------

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

Automatic changelog update e9ecdeec65

Fix xenoborg modules (#41625 ) 1bb4b935af

* 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>

Automatic changelog update 13ddce2a09

[Bugfix/Optimization] Metabolize Foreign Blood (#41892 ) c93fea42dd

* Metabolize foreign blood

* fix

* misc

---------

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

Fix loadout entity names not being exported/imported (#41891 ) b4fa6f4a07

Fix entity names not being saved in loadouts.

Just missing a [DataField]

Automatic changelog update a1f4ea8365

Mirror contrib guidelines to GitHub (#41896 ) ecd876cab9

add contrib guidelines

Adds debug wizard's grimoire (#41900 ) 4fe48ec3cc

Automatic changelog update 89b25adf52

Make StaminaModifier into a status effect, apply to Hyperzine (#41902 ) bb95787af7

* Initial commit

* Probably better this way.

* Review fixes

* cleanup

---------

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

Automatic changelog update 55fef2ab2e

[Staging] Fix certain projectiles moving faster than intended (#41905 ) c4a798632a

Return to original value (25)

[Staging/Hotfix] A couple bloodstream fixes. (#41906 ) 0444896603

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

Stable release for 2025-12-20 (#41934 ) 78189bbe64

merge remote wizden stable 4f4b71e8de

upstream bugfix 787dee44b0

blood upstream update 313bb55923

Merge pull request #3474 from DIMMoon1/upstream12.2

CRLF Check / CRLF Check (pull_request) Successful in 19s

Details

RSI Validator / Validate RSIs (pull_request) Failing after 57s

Details

RGA schema validator / YAML RGA schema validator (pull_request) Successful in 1m23s

Details

Close PRs on master / run (pull_request_target) Failing after 12s

Details

Check Merge Conflicts / check-conflicts (pull_request_target) Successful in 7s

Details

Labels: Review / add_label (pull_request_target) Failing after 9s

Details

Map file schema validator / YAML map schema validator (pull_request) Successful in 2m34s

Details

Labels: Size / size-label (pull_request_target) Failing after 4s

Details

Labels: PR / labeler (pull_request_target) Failing after 1m18s

Details

YAML Linter / YAML Linter (pull_request) Successful in 9m32s

Details

Build & Test Map Renderer / Build & Test Debug (push) Has been cancelled

Details

Build & Test Map Renderer / build (ubuntu-latest) (push) Has been cancelled

Details

Build & Test Debug / Build & Test Debug (push) Has been cancelled

Details

Build & Test Debug / build (ubuntu-latest) (push) Has been cancelled

Details

Test Packaging / Test Packaging (push) Has been cancelled

Details

Update Wiki / Build and Publish JSON blobs to wiki (push) Has been cancelled

Details

RGA schema validator / YAML RGA schema validator (push) Has been cancelled

Details

RSI Validator / Validate RSIs (push) Has been cancelled

Details

Map file schema validator / YAML map schema validator (push) Has been cancelled

Details

YAML Linter / YAML Linter (push) Has been cancelled

Details

907f013467

Upstream12.2

gitea-actionsbot commented

2025-12-22 21:54:05 +01:00

Благодарим вас за вклад в репозиторий Space Station 14. К сожалению, похоже, что вы отправили свой PR из master-ветки. Мы предлагаем вам следовать нашей документации по использованию git

Вы можете переместить текущую работу из master-ветки в другую ветку, выполнив команду git branch <название_ветки> и сбросив измененив в master-ветке.

Благодарим вас за вклад в репозиторий Space Station 14. К сожалению, похоже, что вы отправили свой PR из master-ветки. Мы предлагаем вам следовать [нашей документации по использованию git](https://docs.spacestation14.com/en/general-development/setup/git-for-the-ss14-developer.html) Вы можете переместить текущую работу из master-ветки в другую ветку, выполнив команду `git branch <название_ветки>` и сбросив измененив в master-ветке.

wylab added the S: Merge Conflict label 2025-12-22 21:54:11 +01:00

wylab commented

2025-12-22 21:54:13 +01:00

This pull request has conflicts, please resolve those before we can evaluate the pull request.

wylab closed this pull request

2025-12-23 03:22:32 +01:00

wylab commented

2025-12-23 05:52:32 +01:00

Closed: No longer relevant after clean fork reset (2025-12-23). The new-main branch has been deleted.

Closed: No longer relevant after clean fork reset (2025-12-23). The `new-main` branch has been deleted.

wylab commented

2025-12-23 06:10:29 +01:00

Closed as part of clean fork reset. Branch structure reorganized - master now tracks upstream directly with wylab commits rebased on top.

CRLF Check / CRLF Check (pull_request) Successful in 19s

Details

RSI Validator / Validate RSIs (pull_request) Failing after 57s

Details

RGA schema validator / YAML RGA schema validator (pull_request) Successful in 1m23s

Details

Close PRs on master / run (pull_request_target) Failing after 12s

Details

Check Merge Conflicts / check-conflicts (pull_request_target) Successful in 7s

Details

Labels: Review / add_label (pull_request_target) Failing after 9s

Details

Map file schema validator / YAML map schema validator (pull_request) Successful in 2m34s

Details

Labels: Size / size-label (pull_request_target) Failing after 4s

Details

Labels: PR / labeler (pull_request_target) Failing after 1m18s

Details

YAML Linter / YAML Linter (pull_request) Successful in 9m32s

Details

Build & Test Map Renderer / Build & Test Debug (push) Has been cancelled

Details

Build & Test Map Renderer / build (ubuntu-latest) (push) Has been cancelled

Details

Build & Test Debug / Build & Test Debug (push) Has been cancelled

Details

Build & Test Debug / build (ubuntu-latest) (push) Has been cancelled

Details

Test Packaging / Test Packaging (push) Has been cancelled

Details

Update Wiki / Build and Publish JSON blobs to wiki (push) Has been cancelled

Details

RGA schema validator / YAML RGA schema validator (push) Has been cancelled

Details

RSI Validator / Validate RSIs (push) Has been cancelled

Details

Map file schema validator / YAML map schema validator (push) Has been cancelled

Details

YAML Linter / YAML Linter (push) Has been cancelled

Details

Pull request closed

This pull request cannot be reopened because the branch was deleted.

Sign in to join this conversation.

2 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: wylab/wylab-station-14#4

Allow edits from maintainers