wylab/wylab-station-14
1
1
Fork 0
forked from space-syndicate/space-station-14
Code Pull Requests 2 Actions 27 Wiki Activity

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

Browse Source 
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
This commit is contained in:
Princess Cheeseballs
2025-12-20 12:54:14 -08:00
committed by GitHub
parent c4a798632a
commit 0444896603
2 changed files with 46 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
Content.Shared/Body/Systems/SharedBloodstreamSystem.cs
View File

@@ -1,4 +1,3 @@
using System.Linq;
using Content.Shared.Alert;
using Content.Shared.Body.Components;
using Content.Shared.Body.Events;
@@ -71,49 +70,41 @@ public abstract class SharedBloodstreamSystem : EntitySystem
bloodstream.NextUpdate += bloodstream.AdjustedUpdateInterval;
DirtyField(uid, bloodstream, nameof(BloodstreamComponent.NextUpdate)); // needs to be dirtied on the client so it can be rerolled during prediction
if (!SolutionContainer.ResolveSolution(uid, bloodstream.BloodSolutionName, ref bloodstream.BloodSolution, out var bloodSolution))
if (!SolutionContainer.ResolveSolution(uid, bloodstream.BloodSolutionName, ref bloodstream.BloodSolution))
continue;
// Blood level regulation. Must be alive.
TryRegulateBloodLevel(uid, bloodstream.BloodRefreshAmount);
// Removes blood from the bloodstream based on bleed amount (bleed rate)
// as well as stop their bleeding to a certain extent.
if (bloodstream.BleedAmount > 0)
if (!_mobStateSystem.IsDead(uid))
{
var ev = new BleedModifierEvent(bloodstream.BleedAmount, bloodstream.BleedReductionAmount);
RaiseLocalEvent(uid, ref ev);
TryRegulateBloodLevel(uid, bloodstream.BloodRefreshAmount);
// Blood is removed from the bloodstream at a 1-1 rate with the bleed amount
TryBleedOut((uid, bloodstream), ev.BleedAmount);
TickBleed((uid, bloodstream));
// Bleed rate is reduced by the bleed reduction amount in the bloodstream component.
TryModifyBleedAmount((uid, bloodstream), -ev.BleedReductionAmount);
// deal bloodloss damage if their blood level is below a threshold.
var bloodPercentage = GetBloodLevel(uid);
if (bloodPercentage < bloodstream.BloodlossThreshold)
{
// bloodloss damage is based on the base value, and modified by how low your blood level is.
var amt = bloodstream.BloodlossDamage / (0.1f + bloodPercentage);
_damageableSystem.TryChangeDamage(uid, amt, ignoreResistances: false, interruptsDoAfters: false);
// Apply dizziness as a symptom of bloodloss.
// The effect is applied in a way that it will never be cleared without being healthy.
// Multiplying by 2 is arbitrary but works for this case, it just prevents the time from running out
_status.TrySetStatusEffectDuration(uid, Bloodloss);
}
else
{
// If they're healthy, we'll try and heal some bloodloss instead.
_damageableSystem.TryChangeDamage(uid, bloodstream.BloodlossHealDamage * bloodPercentage, ignoreResistances: true, interruptsDoAfters: false);
_status.TryRemoveStatusEffect(uid, Bloodloss);
}
}
// deal bloodloss damage if their blood level is below a threshold.
var bloodPercentage = GetBloodLevel(uid);
if (bloodPercentage < bloodstream.BloodlossThreshold && !_mobStateSystem.IsDead(uid))
else
{
// bloodloss damage is based on the base value, and modified by how low your blood level is.
var amt = bloodstream.BloodlossDamage / (0.1f + bloodPercentage);
_damageableSystem.TryChangeDamage(uid, amt, ignoreResistances: false, interruptsDoAfters: false);
// Apply dizziness as a symptom of bloodloss.
// The effect is applied in a way that it will never be cleared without being healthy.
// Multiplying by 2 is arbitrary but works for this case, it just prevents the time from running out
_status.TrySetStatusEffectDuration(uid, Bloodloss);
}
else if (!_mobStateSystem.IsDead(uid))
{
// If they're healthy, we'll try and heal some bloodloss instead.
_damageableSystem.TryChangeDamage(
uid,
bloodstream.BloodlossHealDamage * bloodPercentage,
ignoreResistances: true, interruptsDoAfters: false);
_status.TryRemoveStatusEffect(uid, Bloodloss);
TickBleed((uid, bloodstream));
}
}
}
@@ -437,6 +428,23 @@ public abstract class SharedBloodstreamSystem : EntitySystem
return true;
}
public void TickBleed(Entity<BloodstreamComponent> entity)
{
// Removes blood from the bloodstream based on bleed amount (bleed rate)
// as well as stop their bleeding to a certain extent.
if (entity.Comp.BleedAmount <= 0)
return;
var ev = new BleedModifierEvent(entity.Comp.BleedAmount, entity.Comp.BleedReductionAmount);
RaiseLocalEvent(entity, ref ev);
// Blood is removed from the bloodstream at a 1-1 rate with the bleed amount
TryBleedOut(entity.AsNullable(), ev.BleedAmount);
// Bleed rate is reduced by the bleed reduction amount in the bloodstream component.
TryModifyBleedAmount(entity.AsNullable(), -ev.BleedReductionAmount);
}
/// <summary>
/// Removes blood by spilling out the bloodstream.
/// </summary>

2
Resources/Prototypes/Recipes/Reactions/cleaning.yml
View File

@@ -12,6 +12,8 @@
- type: reaction
id: AmmoniaFromBlood
requiredMixerCategories:
- Stir # prevents evaporating vox blood, TODO: make it react only X units per second; make bloodstream an open thermal system
minTemp: 370
reactants:
AmmoniaBlood: