tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Spill some of the chemstream when bleeding (#6772)

Browse Source
This commit is contained in:
mirrorcult
2022-02-17 23:00:50 -07:00
committed by GitHub
parent 9a8e942ed9
commit 3010de33fc
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Body/Components/BloodstreamComponent.cs
View File

@@ -71,7 +71,7 @@ namespace Content.Server.Body.Components
/// How much blood needs to be in the temporary solution in order to create a puddle? /// How much blood needs to be in the temporary solution in order to create a puddle?
/// </summary> /// </summary>
[DataField("bleedPuddleThreshold")] [DataField("bleedPuddleThreshold")]
public FixedPoint2 BleedPuddleThreshold = 10.0f; public FixedPoint2 BleedPuddleThreshold = 5.0f;
/// <summary> /// <summary>
/// A modifier set prototype ID corresponding to how damage should be modified /// A modifier set prototype ID corresponding to how damage should be modified

7
Content.Server/Body/Systems/BloodstreamSystem.cs
View File

@@ -90,7 +90,7 @@ public sealed class BloodstreamSystem : EntitySystem
component.ChemicalSolution.MaxVolume = component.ChemicalMaxVolume; component.ChemicalSolution.MaxVolume = component.ChemicalMaxVolume;
component.BloodSolution.MaxVolume = component.BloodMaxVolume; component.BloodSolution.MaxVolume = component.BloodMaxVolume;
component.BloodTemporarySolution.MaxVolume = component.BleedPuddleThreshold * 2; // give some leeway component.BloodTemporarySolution.MaxVolume = component.BleedPuddleThreshold * 4; // give some leeway, for chemstream as well
// Fill blood solution with BLOOD // Fill blood solution with BLOOD
_solutionContainerSystem.TryAddReagent(uid, component.BloodSolution, component.BloodReagent, _solutionContainerSystem.TryAddReagent(uid, component.BloodSolution, component.BloodReagent,
@@ -168,8 +168,11 @@ public sealed class BloodstreamSystem : EntitySystem
var newSol = component.BloodSolution.SplitSolution(-amount); var newSol = component.BloodSolution.SplitSolution(-amount);
component.BloodTemporarySolution.AddSolution(newSol); component.BloodTemporarySolution.AddSolution(newSol);
if (component.BloodTemporarySolution.MaxVolume > component.BleedPuddleThreshold) if (component.BloodTemporarySolution.CurrentVolume > component.BleedPuddleThreshold)
{ {
// Pass some of the chemstream into the spilled blood.
var temp = component.ChemicalSolution.SplitSolution(component.BloodTemporarySolution.CurrentVolume / 10);
component.BloodTemporarySolution.AddSolution(temp);
_spillableSystem.SpillAt(uid, component.BloodTemporarySolution, "PuddleBlood", false); _spillableSystem.SpillAt(uid, component.BloodTemporarySolution, "PuddleBlood", false);
component.BloodTemporarySolution.RemoveAllSolution(); component.BloodTemporarySolution.RemoveAllSolution();
} }