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

Predict healing and bloodstream (#38690)

Browse Source 
* initial commit

* reapply 38126

* fix rootable

* someone missed an important minus sign here

* try this

* fix

* fix

* reenable crit hits

* cleanup

* fix status time dirtying

* fix

* camelCase
This commit is contained in:
slarticodefast
2025-07-03 01:20:31 +02:00
committed by GitHub
parent 8597acd030
commit 38232d2255
37 changed files with 915 additions and 841 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Server/EntityEffects/EntityEffectSystem.cs
View File

@@ -22,6 +22,7 @@ using Content.Server.Temperature.Systems;
using Content.Server.Traits.Assorted;
using Content.Server.Zombies;
using Content.Shared.Atmos;
using Content.Shared.Body.Components;
using Content.Shared.Coordinates.Helpers;
using Content.Shared.EntityEffects.EffectConditions;
using Content.Shared.EntityEffects.Effects.PlantMetabolism;
@@ -558,11 +559,11 @@ public sealed class EntityEffectSystem : EntitySystem
return;
cleanseRate *= reagentArgs.Scale.Float();
_bloodstream.FlushChemicals(args.Args.TargetEntity, reagentArgs.Reagent.ID, cleanseRate);
_bloodstream.FlushChemicals(args.Args.TargetEntity, reagentArgs.Reagent, cleanseRate);
}
else
{
_bloodstream.FlushChemicals(args.Args.TargetEntity, "", cleanseRate);
_bloodstream.FlushChemicals(args.Args.TargetEntity, null, cleanseRate);
}
}
@@ -780,7 +781,7 @@ public sealed class EntityEffectSystem : EntitySystem
amt *= reagentArgs.Scale.Float();
}
_bloodstream.TryModifyBleedAmount(args.Args.TargetEntity, amt, blood);
_bloodstream.TryModifyBleedAmount((args.Args.TargetEntity, blood), amt);
}
}
@@ -796,7 +797,7 @@ public sealed class EntityEffectSystem : EntitySystem
amt *= reagentArgs.Scale;
}
_bloodstream.TryModifyBloodLevel(args.Args.TargetEntity, amt, blood);
_bloodstream.TryModifyBloodLevel((args.Args.TargetEntity, blood), amt);
}
}