Fixes Dead Hearts Allowing you to live.

This commit is contained in:
Fox-McCloud
2017-07-29 19:28:38 -04:00
parent 5539572988
commit 99ad3db8ba
2 changed files with 6 additions and 2 deletions
+5 -2
View File
@@ -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)
@@ -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