From a06144b083c6be5e5926f61af21c81fe81bd9b4f Mon Sep 17 00:00:00 2001 From: Ed Date: Sun, 29 Jun 2025 19:15:12 +0300 Subject: [PATCH] fix second wind alert --- Content.Shared/Damage/Systems/SharedStaminaSystem.cs | 2 +- .../_CP14/Chemistry/ReagentEffect/CP14StaminaChange.cs | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Content.Shared/Damage/Systems/SharedStaminaSystem.cs b/Content.Shared/Damage/Systems/SharedStaminaSystem.cs index de3dc9c115..68d5834d46 100644 --- a/Content.Shared/Damage/Systems/SharedStaminaSystem.cs +++ b/Content.Shared/Damage/Systems/SharedStaminaSystem.cs @@ -212,7 +212,7 @@ public abstract partial class SharedStaminaSystem : EntitySystem TakeStaminaDamage(target, component.Damage, source: uid, sound: component.Sound); } - private void SetStaminaAlert(EntityUid uid, StaminaComponent? component = null) + public void SetStaminaAlert(EntityUid uid, StaminaComponent? component = null) //CP14 public. Need proper RestoreStaminaFunction in upstream. { if (!Resolve(uid, ref component, false) || component.Deleted) return; diff --git a/Content.Shared/_CP14/Chemistry/ReagentEffect/CP14StaminaChange.cs b/Content.Shared/_CP14/Chemistry/ReagentEffect/CP14StaminaChange.cs index 610433f853..81ffcf30e4 100644 --- a/Content.Shared/_CP14/Chemistry/ReagentEffect/CP14StaminaChange.cs +++ b/Content.Shared/_CP14/Chemistry/ReagentEffect/CP14StaminaChange.cs @@ -32,9 +32,10 @@ public sealed partial class CP14StaminaChange : EntityEffect if (args is EntityEffectReagentArgs reagentArgs) scale = ScaleByQuantity ? reagentArgs.Quantity * reagentArgs.Scale : reagentArgs.Scale; + var staminaSys = entityManager.System(); + if (StaminaDelta < 0) //Damage { - var staminaSys = entityManager.System(); staminaSys.TakeStaminaDamage(args.TargetEntity, (float)(-StaminaDelta * scale)); } else //Restore @@ -44,6 +45,7 @@ public sealed partial class CP14StaminaChange : EntityEffect staminaComp.StaminaDamage = Math.Max(0, staminaComp.StaminaDamage - (float)(StaminaDelta * scale)); entityManager.Dirty(args.TargetEntity, staminaComp); + staminaSys.SetStaminaAlert(args.TargetEntity, staminaComp); } } }