diff --git a/Content.Server/Medical/HealingSystem.cs b/Content.Server/Medical/HealingSystem.cs index be6952e8da..7013812244 100644 --- a/Content.Server/Medical/HealingSystem.cs +++ b/Content.Server/Medical/HealingSystem.cs @@ -9,6 +9,7 @@ using Content.Shared.Damage; using Content.Shared.Database; using Content.Shared.Interaction; using Content.Shared.Interaction.Events; +using Content.Shared.MobState.Components; using Content.Shared.Stacks; using Robust.Shared.Audio; using Robust.Shared.Player; @@ -35,6 +36,9 @@ public sealed class HealingSystem : EntitySystem private void OnHealingComplete(EntityUid uid, DamageableComponent component, HealingCompleteEvent args) { + if (TryComp(uid, out var state) && state.IsDead()) + return; + if (TryComp(args.Component.Owner, out var stack) && stack.Count < 1) return; if (component.DamageContainerID is not null && @@ -95,6 +99,9 @@ public sealed class HealingSystem : EntitySystem return; } + if (TryComp(target, out var state) && state.IsDead()) + return; + if (!TryComp(target, out var targetDamage)) return;