]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Metabolizing bloodstream (#35071)
authorNikovnik <116634167+nkokic@users.noreply.github.com>
Wed, 17 Dec 2025 19:21:16 +0000 (20:21 +0100)
committerGitHub <noreply@github.com>
Wed, 17 Dec 2025 19:21:16 +0000 (19:21 +0000)
commit0e76d4e5ed6ae70a31d60beb350b7ce3c1a2f9b7
tree1514fda4ca84eae8aeee7c821e3739abc64b2551
parent4484f0f3514363804343a5443509e8b5b2fc8b31
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>
42 files changed:
Content.Server/Body/Components/MetabolizerComponent.cs
Content.Server/Body/Systems/BloodstreamSystem.cs
Content.Server/Body/Systems/MetabolizerSystem.cs
Content.Server/Chemistry/EntitySystems/SolutionInjectOnEventSystem.cs
Content.Server/Fluids/EntitySystems/SmokeSystem.cs
Content.Server/Medical/HealthAnalyzerSystem.cs
Content.Server/Nutrition/EntitySystems/SmokingSystem.cs
Content.Server/Zombies/ZombieSystem.Transform.cs
Content.Shared/Body/Components/BloodstreamComponent.cs
Content.Shared/Body/Components/StomachComponent.cs
Content.Shared/Body/Events/MetabolismExclusionEvent.cs [new file with mode: 0644]
Content.Shared/Body/Systems/SharedBloodstreamSystem.cs
Content.Shared/Chemistry/EntitySystems/SharedInjectorSystem.cs
Content.Shared/Devour/DevourSystem.cs
Content.Shared/EntityEffects/Effects/Body/CleanBloodstreamEntityEffectSystem.cs
Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs
Content.Shared/Medical/Healing/HealingSystem.cs
Content.Shared/Medical/VomitSystem.cs
Content.Shared/Rootable/RootableSystem.cs
Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml
Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml
Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml
Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml
Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml
Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
Resources/Prototypes/Entities/Mobs/NPCs/space.yml
Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml
Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
Resources/Prototypes/Entities/Mobs/Player/dragon.yml
Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
Resources/Prototypes/Entities/Mobs/Species/diona.yml
Resources/Prototypes/Entities/Mobs/Species/gingerbread.yml
Resources/Prototypes/Entities/Mobs/Species/moth.yml
Resources/Prototypes/Entities/Mobs/Species/slime.yml
Resources/Prototypes/Entities/Mobs/Species/vox.yml
Resources/Prototypes/Entities/Mobs/base.yml
Resources/Prototypes/Recipes/Reactions/drinks.yml
Resources/Prototypes/Recipes/Reactions/fun.yml
Resources/Prototypes/Recipes/Reactions/single_reagent.yml