Merge pull request #5092 from Citadel-Station-13/upstream-merge-34383

[MIRROR] You can now defib monkeys

code/modules/mob/living/carbon/human/life.dm

@@ -320,30 +320,6 @@
 				if(!has_embedded_objects())
 					clear_alert("embeddedobject")
 
-/mob/living/carbon/human/proc/can_heartattack()
-	CHECK_DNA_AND_SPECIES(src)
-	if(NOBLOOD in dna.species.species_traits)
-		return FALSE
-	return TRUE
-
-/mob/living/carbon/human/proc/undergoing_cardiac_arrest()
-	if(!can_heartattack())
-		return FALSE
-	var/obj/item/organ/heart/heart = getorganslot(ORGAN_SLOT_HEART)
-	if(istype(heart) && heart.beating)
-		return FALSE
-	return TRUE
-
-/mob/living/carbon/human/proc/set_heartattack(status)
-	if(!can_heartattack())
-		return FALSE
-
-	var/obj/item/organ/heart/heart = getorganslot(ORGAN_SLOT_HEART)
-	if(!istype(heart))
-		return
-
-	heart.beating = !status
-
 /mob/living/carbon/human/proc/handle_active_genes()
 	for(var/datum/mutation/human/HM in dna.mutations)
 		HM.on_life(src)

code/modules/mob/living/carbon/life.dm

@@ -460,3 +460,30 @@
 		var/obj/item/organ/brain/B = getorganslot(ORGAN_SLOT_BRAIN)
 		if(B)
 			B.damaged_brain = TRUE
+
+/////////////////////////////////////
+//MONKEYS WITH TOO MUCH CHOLOESTROL//
+/////////////////////////////////////
+
+/mob/living/carbon/proc/can_heartattack()
+	if(dna && dna.species && (NOBLOOD in dna.species.species_traits)) //not all carbons have species!
+		return FALSE
+	return TRUE
+
+/mob/living/carbon/proc/undergoing_cardiac_arrest()
+	if(!can_heartattack())
+		return FALSE
+	var/obj/item/organ/heart/heart = getorganslot(ORGAN_SLOT_HEART)
+	if(istype(heart) && heart.beating)
+		return FALSE
+	return TRUE
+
+/mob/living/carbon/proc/set_heartattack(status)
+	if(!can_heartattack())
+		return FALSE
+
+	var/obj/item/organ/heart/heart = getorganslot(ORGAN_SLOT_HEART)
+	if(!istype(heart))
+		return
+
+	heart.beating = !status