From e6e67b95ac98568463d16004ad9110694ccdf738 Mon Sep 17 00:00:00 2001
From: Wickedtemp <mdnugget@yahoo.com>
Date: Tue, 26 Jan 2021 19:49:17 -0600
Subject: [PATCH] Modified Cells No Longer Work on Corpses

---
 .../guns/energy/cell_loaded_vr/ml3m_cells.dm  | 59 +++++++++++--------
 1 file changed, 36 insertions(+), 23 deletions(-)

diff --git a/code/modules/projectiles/guns/energy/cell_loaded_vr/ml3m_cells.dm b/code/modules/projectiles/guns/energy/cell_loaded_vr/ml3m_cells.dm
index f1df1a8c977..6663d6e3805 100644
--- a/code/modules/projectiles/guns/energy/cell_loaded_vr/ml3m_cells.dm
+++ b/code/modules/projectiles/guns/energy/cell_loaded_vr/ml3m_cells.dm
@@ -31,7 +31,8 @@
 
 /obj/item/projectile/beam/medical_cell/brute/on_hit(var/mob/living/carbon/human/target)
 	if(istype(target, /mob/living/carbon/human))
-		target.adjustBruteLoss(-10)
+		if(target.stat != DEAD)
+			target.adjustBruteLoss(-10)
 	else
 		return 1
 
@@ -43,7 +44,8 @@
 
 /obj/item/projectile/beam/medical_cell/burn/on_hit(var/mob/living/carbon/human/target)
 	if(istype(target, /mob/living/carbon/human))
-		target.adjustFireLoss(-10)
+		if(target.stat != DEAD)
+			target.adjustFireLoss(-10)
 	else
 		return 1
 
@@ -83,7 +85,8 @@
 
 /obj/item/projectile/beam/medical_cell/toxin/on_hit(var/mob/living/carbon/human/target)
 	if(istype(target, /mob/living/carbon/human))
-		target.adjustToxLoss(-10)
+		if(target.stat != DEAD)
+			target.adjustToxLoss(-10)
 	else
 		return 1
 
@@ -95,10 +98,11 @@
 
 /obj/item/projectile/beam/medical_cell/omni/on_hit(var/mob/living/carbon/human/target)
 	if(istype(target, /mob/living/carbon/human))
-		target.adjustBruteLoss(-5)
-		target.adjustFireLoss(-5)
-		target.adjustToxLoss(-5)
-		target.adjustOxyLoss(-20)
+		if(target.stat != DEAD)
+			target.adjustBruteLoss(-5)
+			target.adjustFireLoss(-5)
+			target.adjustToxLoss(-5)
+			target.adjustOxyLoss(-20)
 	else
 		return 1
 
@@ -110,8 +114,9 @@
 
 /obj/item/projectile/beam/medical_cell/antirad/on_hit(var/mob/living/carbon/human/target)
 	if(istype(target, /mob/living/carbon/human))
-		target.adjustToxLoss(-5)
-		target.radiation = max(target.radiation - 350, 0) //same as 5 units of arithrazine, sans the brute damage
+		if(target.stat != DEAD)
+			target.adjustToxLoss(-5)
+			target.radiation = max(target.radiation - 350, 0) //same as 5 units of arithrazine, sans the brute damage
 	else
 		return 1
 
@@ -123,7 +128,8 @@
 
 /obj/item/projectile/beam/medical_cell/brute2/on_hit(var/mob/living/carbon/human/target)
 	if(istype(target, /mob/living/carbon/human))
-		target.adjustBruteLoss(-20)
+		if(target.stat != DEAD)
+			target.adjustBruteLoss(-20)
 	else
 		return 1
 
@@ -135,7 +141,8 @@
 
 /obj/item/projectile/beam/medical_cell/burn2/on_hit(var/mob/living/carbon/human/target)
 	if(istype(target, /mob/living/carbon/human))
-		target.adjustFireLoss(-20)
+		if(target.stat != DEAD)
+			target.adjustFireLoss(-20)
 	else
 		return 1
 
@@ -170,10 +177,11 @@
 
 /obj/item/projectile/beam/medical_cell/omni2/on_hit(var/mob/living/carbon/human/target)
 	if(istype(target, /mob/living/carbon/human))
-		target.adjustBruteLoss(-10)
-		target.adjustFireLoss(-10)
-		target.adjustToxLoss(-10)
-		target.adjustOxyLoss(-60)
+		if(target.stat != DEAD)
+			target.adjustBruteLoss(-10)
+			target.adjustFireLoss(-10)
+			target.adjustToxLoss(-10)
+			target.adjustOxyLoss(-60)
 	else
 		return 1
 
@@ -185,7 +193,8 @@
 
 /obj/item/projectile/beam/medical_cell/toxin2/on_hit(var/mob/living/carbon/human/target)
 	if(istype(target, /mob/living/carbon/human))
-		target.adjustToxLoss(-20)
+		if(target.stat != DEAD)
+			target.adjustToxLoss(-20)
 	else
 		return 1
 
@@ -253,7 +262,8 @@
 
 /obj/item/projectile/beam/medical_cell/brute3/on_hit(var/mob/living/carbon/human/target)
 	if(istype(target, /mob/living/carbon/human))
-		target.adjustBruteLoss(-40)
+		if(target.stat != DEAD)
+			target.adjustBruteLoss(-40)
 	else
 		return 1
 
@@ -265,7 +275,8 @@
 
 /obj/item/projectile/beam/medical_cell/burn3/on_hit(var/mob/living/carbon/human/target)
 	if(istype(target, /mob/living/carbon/human))
-		target.adjustFireLoss(-40)
+		if(target.stat != DEAD)
+			target.adjustFireLoss(-40)
 	else
 		return 1
 
@@ -277,7 +288,8 @@
 
 /obj/item/projectile/beam/medical_cell/toxin3/on_hit(var/mob/living/carbon/human/target)
 	if(istype(target, /mob/living/carbon/human))
-		target.adjustToxLoss(-40)
+		if(target.stat != DEAD)
+			target.adjustToxLoss(-40)
 	else
 		return 1
 
@@ -289,10 +301,11 @@
 
 /obj/item/projectile/beam/medical_cell/omni3/on_hit(var/mob/living/carbon/human/target)
 	if(istype(target, /mob/living/carbon/human))
-		target.adjustBruteLoss(-20)
-		target.adjustFireLoss(-20)
-		target.adjustToxLoss(-20)
-		target.adjustOxyLoss(-120)
+		if(target.stat != DEAD)
+			target.adjustBruteLoss(-20)
+			target.adjustFireLoss(-20)
+			target.adjustToxLoss(-20)
+			target.adjustOxyLoss(-120)
 	else
 		return 1