From b311c9e2c9fd58f018d2e68de9d0d8d97d008e02 Mon Sep 17 00:00:00 2001
From: mirrorcult <lunarautomaton6@gmail.com>
Date: Sat, 16 Apr 2022 23:29:31 -0700
Subject: [PATCH] Stop healing when target is dead (#7224)

---
 Content.Server/Medical/HealingSystem.cs | 7 +++++++
 1 file changed, 7 insertions(+)

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<MobStateComponent>(uid, out var state) && state.IsDead())
+            return;
+
         if (TryComp<StackComponent>(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<MobStateComponent>(target, out var state) && state.IsDead())
+            return;
+
         if (!TryComp<DamageableComponent>(target, out var targetDamage))
             return;