Commit Graph

38043 Commits

Author SHA1 Message Date
Nikovnik 7fc0e3cb26 Metabolizing bloodstream (#35071)
* 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>
2026-04-04 16:57:18 +02:00
slarticodefast 8bfca87c4d Fix prototypes so they pass analyzer checks (again) (AGAIN) (#41882)
fix
2026-04-04 16:57:18 +02:00
Connor Huffine 88b1f3e053 Remove flammability mass (#41803)
* Remove flammability mass

* Adjust mass fudge number

* Remove fudge
2026-04-04 16:57:18 +02:00
ScarKy0 f34424d9cd TriggerOnIngested (#41875)
* init

* nobody will ever know i copy paste

* i hate these names

* comment

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
2026-04-04 16:57:18 +02:00
Princess Cheeseballs 11c1ebcc8f Prevent Vestine and all other Botany chemicals from affecting all seeds. (#41883)
* EnsureUniqueSeed

* mfw

* aaaaaaaaaaaaa

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2026-04-04 16:57:18 +02:00
ArtisticRoomba 73301e68a6 Fix destructible benchmark OOMing (#41880)
* not working

* fix
2026-04-04 16:57:18 +02:00
slarticodefast f19ee48df9 wallmount debug overlay (#38495)
* 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>
2026-04-04 16:57:18 +02:00
Princess Cheeseballs 07b74a9e75 Arcryox Metabolism Fix (#41881)
* fix arcryox metabolism

* dont change that shit wrong branch

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2026-04-04 16:57:18 +02:00
alexalexmax 9991a5aefc Decouple standing state and drop item behavior (#41566)
* 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>
2026-04-04 16:57:18 +02:00
āda b4903348df Small improvement to suit sensor update loop (#41872)
commit

Co-authored-by: iaada <iaada@users.noreply.github.com>
2026-04-04 16:57:18 +02:00
Pancake b8b75c456b Tweak Killer Tomato Size (#35866)
* Update miscellaneous.yml

y tho

* Apply suggestions from code review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2026-04-04 16:57:18 +02:00
beck-thompson a126886756 Add foolbox (#41473)
* 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
2026-04-04 16:57:18 +02:00
Hitlinemoss 5054caa29f Station AI now rolls before most standard crew (#41663)
* Station AI now rolls before standard crew

* github tests are high

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2026-04-04 16:57:18 +02:00
Samuka 740cc10e83 Fix mothership core fixture (#41745)
fix mothership core fixture
2026-04-04 16:57:18 +02:00
āda 3d66275984 Remove unused tags tied to unused entities (#41366)
* commit

* fix for haunted

* not a magazine

* unused sprites

* the lost tags

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
2026-04-04 16:57:18 +02:00
Samuka 42fcf00920 Xenoborg door control module (#41546)
* 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
2026-04-04 16:57:18 +02:00
JesterX666 3e4a468921 Ignite atmosphere on explosions (#41262)
* 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>
2026-04-04 16:57:17 +02:00
psykana 961ab11293 Add tile atmosphere tests (#41228)
* Tile atmosphere tests

* master markers

* TryLoadMap

* whoopsie

* Dirty

* Add new abstract class, room spacing tests

* review
2026-04-04 16:56:53 +02:00
Samuka afa3838d38 Repairing borgs now takes multiple doafters (#41638)
* 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>
2026-04-04 16:56:53 +02:00
MissKay1994 b9cb30e71e Prevent Initial Infected from rolling on evac (#41863)
evac ambuzol
2026-04-04 16:56:53 +02:00
Nox 2f4a8e6812 ERT Overhaul 2/3: Equipment (#38105)
* 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>
2026-04-04 16:56:53 +02:00
Meara 38dce9b12c Adds crowbar to Mediborg Rescue Module (#41861)
Added crowbar to Borg Rescue module.
2026-04-04 16:56:53 +02:00
Nox 321ba725da ERT Overhaul 1/3: Apparel (#37855)
* 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>
2026-04-04 16:56:53 +02:00
beck-thompson b9c3c8cecb Fix news console formatting and pda news formating (#41799)
* Fix news console formatting

* another fix

* Fix review

Un-copy-paste. Twice. *sigh*

---------

Co-authored-by: PJB3005 <pieterjan.briers+git@gmail.com>
2026-04-04 16:56:52 +02:00
āda ec9b13694b Rollersakes heisen bounty (#41859)
commit

Co-authored-by: iaada <iaada@users.noreply.github.com>
2026-04-04 16:56:52 +02:00
Pieter-Jan Briers 1c4806740c Fix ColorExtensions math (#41717)
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.
2026-04-04 16:56:52 +02:00
ScarKy0 091b7d98b6 Remove roundstart tools from some cyborgs (#41823)
* remove tools

* actually let derelict borgs keep it
2026-04-04 16:56:52 +02:00
JackspajfMain 608730bbe7 Update to Bardrobe to add Pun Pun's outfit (#41705)
bardrobe update to add pun's outfit
2026-04-04 16:56:52 +02:00
Samuka 29aceb4e03 Move logic from EvenHealthChangeEntityEffectSystem to the damage system API (#41684)
* 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>
2026-04-04 16:56:52 +02:00
Princess Cheeseballs c9d52d8a03 Fix plant metabolism in guidebook. (#41854)
* AAAAAAAAAAAAAAAAAAAAAAA

* cleaner

* even cleaner

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2026-04-04 16:56:52 +02:00
āda 1a9aa6f24d Toys entity tables (#41840)
* 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>
2026-04-04 16:56:52 +02:00
RedSpy 30d17745d4 Make gun chamber empty by default (#41791)
gun chamber empty by default now

Co-authored-by: RedSpyy <empty@place.com>
2026-04-04 16:56:52 +02:00
Hitlinemoss edfc084441 Skeletons are now affected by Holy damage (#41757) 2026-04-04 16:56:52 +02:00
BarryNorfolk 489287970b Add pistol overrides for descriptions 2026-04-04 16:56:52 +02:00
BarryNorfolk 456c970f42 Move magazines still used by deltav over to our namespace 2026-04-04 16:56:52 +02:00
Hitlinemoss cbe5c81070 Assorted minor cleanup (and shotgun shell descriptions) in Resources\Prototypes\Entities\Objects\Weapons\Guns\Ammunition\ (#41841)
* 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
2026-04-04 16:56:52 +02:00
BarryNorfolk c2dffca063 Update some magazines to use new stripes and inhand sprites where possible 2026-04-04 16:56:52 +02:00
Seam_Less 558ef54978 Magazine rsi Cleanup + Magazine Type Recolor (#37709) 2026-04-04 16:56:52 +02:00
K-Dynamic 4890d47093 Take 2: Rename ammunition box (.50), Liberation Station .50 stock (#35326)
ammunition box (.50), .50 shell pellet

also die robust toolbox commits
2026-04-04 16:56:52 +02:00
Borsh 0b2c9671d6 Adding a random gate (#41627)
* 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
2026-04-04 16:56:52 +02:00
AshBats 56b3ef91d7 Admin log now shows APC power toggle interactions (#41839)
Added logging to the APC's toggle interaction
2026-04-04 16:56:52 +02:00
ScarKy0 f11978b28d TriggerOnUserInteractHand and TriggerOnUserInteractUsing (#41843)
* init

* handle check

* oops

* cleanup

* fix resolve

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2026-04-04 16:56:52 +02:00
Mehnix 9ce1ce5be5 Edible Produce are now also Butcherable (#36786)
Butcherable Produce

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

Co-authored-by: ScarKy0 <scarky0@onet.eu>
2026-04-04 16:56:52 +02:00
ScarKy0 de23957918 Killsign cleanup (#41845)
* 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>
2026-04-04 16:56:52 +02:00
ScarKy0 4a47f4784f Don't remove borg access without power (#41844)
* init

* comment
2026-04-04 16:56:52 +02:00
āda a62ac0dce5 All Figurines Entity Table (#41775)
* 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>
2026-04-04 16:56:52 +02:00
Absotively e0341441dd Hand labeler can always remove labels (#40330)
* 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
2026-04-04 16:56:52 +02:00
K-Dynamic 0824c48bd6 Preserve arbitrage by fixing a bug (#41756)
no more infinite money
2026-04-04 16:56:51 +02:00
Connor Huffine fc94af3e7e Add KI pills to the radsuit locker (#41576)
* Add KI pills

* Add variability

* Remove unnecessary value
2026-04-04 16:56:51 +02:00
WS01 e8e906a14f Changed PullingSystem to use MobStateChangedEvent instead of UpdateMo… (#41835)
Changed PullingSystem to use MobStateChangedEvent instead of UpdateMobStateEvent
2026-04-04 16:56:51 +02:00