Make Blood Deficiency Bloodloss Consistent

Content.Server/Body/Components/BloodstreamComponent.cs

@@ -181,9 +181,9 @@ public sealed partial class BloodstreamComponent : Component
         public bool HasBloodDeficiency = false;
 
         /// <summary>
-        ///     How much reagent of blood should be removed with blood deficiency in each update interval?
+        ///     How much percentage of max blood volume should be removed with blood deficiency in each update interval?
         /// </summary>
         [DataField]
-        public FixedPoint2 BloodDeficiencyLossAmount;
+        public float BloodDeficiencyLossPercentage;
     }
 }

Content.Server/Body/Systems/BloodstreamSystem.cs

@@ -122,7 +122,7 @@ public override void Update(float frameTime)
             if (bloodstream.HasBloodDeficiency)
             {
                 if (!_mobStateSystem.IsDead(uid))
-                    RemoveBlood(uid, bloodstream.BloodDeficiencyLossAmount, bloodstream);
+                    RemoveBlood(uid, bloodstream.BloodMaxVolume * bloodstream.BloodDeficiencyLossPercentage, bloodstream);
             }
             // Adds blood to their blood level if it is below the maximum.
             else if (bloodSolution.Volume < bloodSolution.MaxVolume && !_mobStateSystem.IsDead(uid))
@@ -349,6 +349,14 @@ public void SetBloodLossThreshold(EntityUid uid, float threshold, BloodstreamCom
         comp.BloodlossThreshold = threshold;
     }
 
+    public void SetBloodMaxVolume(EntityUid uid, FixedPoint2 volume, BloodstreamComponent? comp = null)
+    {
+        if (!Resolve(uid, ref comp))
+            return;
+
+        comp.BloodMaxVolume = volume;
+    }
+
     /// <summary>
     ///     Attempts to modify the blood level of this entity directly.
     /// </summary>

Content.Server/HeightAdjust/BloodstreamAdjustSystem.cs

@@ -1,4 +1,5 @@
 using Content.Server.Body.Components;
+using Content.Server.Body.Systems;
 using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Shared.CCVar;
 using Content.Shared.Chemistry.Reagent;
@@ -10,6 +11,7 @@ namespace Content.Server.HeightAdjust;
 
 public sealed class BloodstreamAdjustSystem : EntitySystem
 {
+    [Dependency] private readonly BloodstreamSystem _bloodstream = default!;
     [Dependency] private readonly IConfigurationManager _config = default!;
     [Dependency] private readonly ContestsSystem _contests = default!;
     [Dependency] private readonly SolutionContainerSystem _solutionContainer = default!;
@@ -40,6 +42,8 @@ public bool TryAdjustBloodstream(Entity<BloodstreamAffectedByMassComponent> ent)
         bloodSolution.MaxVolume = newVolume;
         bloodSolution.SetContents([new ReagentQuantity(bloodstream.BloodReagent, newBloodLevel, null)], false);
 
+        _bloodstream.SetBloodMaxVolume(ent.Owner, newVolume, bloodstream);
+
         return true;
     }
 }

Content.Server/Traits/BloodDeficiencyComponent.cs

@@ -7,8 +7,8 @@ namespace Content.Server.Traits.Assorted;
 public sealed partial class BloodDeficiencyComponent : Component
 {
     // <summary>
-    //     How much reagent of blood should be removed in each update interval?
+    ///     How much percentage of max blood volume should be removed in each update interval?
     // </summary>
     [DataField(required: true)]
-    public float BloodLossAmount;
+    public float BloodLossPercentage;
 }

Content.Server/Traits/BloodDeficiencySystem.cs

@@ -18,6 +18,6 @@ private void OnStartup(EntityUid uid, BloodDeficiencyComponent component, Compon
             return;
 
         bloodstream.HasBloodDeficiency = true;
-        bloodstream.BloodDeficiencyLossAmount = component.BloodLossAmount;
+        bloodstream.BloodDeficiencyLossPercentage = component.BloodLossPercentage;
     }
 }

Resources/Prototypes/Traits/disabilities.yml

@@ -168,8 +168,8 @@
       species:
         - IPC
   components:
-    - type: BloodDeficiency  # 0.07 = start taking bloodloss damage at around ~21.4 minutes,
-      bloodLossAmount: 0.07  # then become crit ~10 minutes later
+    - type: BloodDeficiency              # by default, start taking bloodloss damage at around ~21.4 minutes,
+      bloodLossPercentage: 0.0002333333  # then become crit ~10 minutes
 
 - type: trait
   id: Hemophilia