From 99ad3db8ba76f54bd524d3c7d74f8db727226e4f Mon Sep 17 00:00:00 2001
From: Fox-McCloud <Fox_P_McCloud@hotmail.com>
Date: Sat, 29 Jul 2017 19:28:38 -0400
Subject: [PATCH] Fixes Dead Hearts Allowing you to live.

---
 code/modules/mob/living/carbon/human/life.dm        | 7 +++++--
 code/modules/reagents/chemistry/reagents/disease.dm | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 294c78c4ec0..dbdecf72199 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -1157,8 +1157,11 @@
 	if(!can_heartattack())
 		return FALSE
 	var/obj/item/organ/internal/heart/heart = get_int_organ(/obj/item/organ/internal/heart)
-	if(istype(heart) && heart.beating)
-		return FALSE
+	if(istype(heart))
+		if(heart.status & ORGAN_DEAD)
+			return TRUE
+		if(heart.beating)
+			return FALSE
 	return TRUE
 
 /mob/living/carbon/human/proc/set_heartattack(status)
diff --git a/code/modules/reagents/chemistry/reagents/disease.dm b/code/modules/reagents/chemistry/reagents/disease.dm
index 1f6791d25d1..bac6f475261 100644
--- a/code/modules/reagents/chemistry/reagents/disease.dm
+++ b/code/modules/reagents/chemistry/reagents/disease.dm
@@ -146,6 +146,7 @@
 			var/mob/living/carbon/human/H = M
 			if(!H.undergoing_cardiac_arrest())
 				H.set_heartattack(TRUE) // rip in pepperoni
+	..()
 
 //virus foods