carbons and humans

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

@@ -18,32 +18,21 @@
 #define THERMAL_PROTECTION_HAND_LEFT	0.025
 #define THERMAL_PROTECTION_HAND_RIGHT	0.025
 
-/mob/living/carbon/human/Life(seconds, times_fired)
+/mob/living/carbon/human/BiologicalLife(seconds, times_fired)
-	set invisibility = 0
+	if(!(. = ..()))
-	if (mob_transforming)
 		return
+	handle_active_genes()
+	//heart attack stuff
+	handle_heart()
+	dna.species.spec_life(src) // for mutantraces
+	return (stat != DEAD) && !QDELETED(src)
 
-	. = ..()
+/mob/living/carbon/human/PhysicalLife(seconds, times_fired)
-
+	if(!(. = ..()))
-	if (QDELETED(src))
+		return
-		return 0
-
-	if(.) //not dead
-		handle_active_genes()
-
-	if(stat != DEAD)
-		//heart attack stuff
-		handle_heart()
-
 	//Update our name based on whether our face is obscured/disfigured
 	name = get_visible_name()
 
-	dna.species.spec_life(src) // for mutantraces
-
-	if(stat != DEAD)
-		return 1
-
-
 /mob/living/carbon/human/calculate_affecting_pressure(pressure)
 	var/headless = !get_bodypart(BODY_ZONE_HEAD) //should the mob be perennially headless (see dullahans), we only take the suit into account, so they can into space.
 	if (wear_suit && istype(wear_suit, /obj/item/clothing) && (headless || (head && istype(head, /obj/item/clothing))))

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

@@ -1,24 +1,13 @@
-/mob/living/carbon/Life()
+/mob/living/carbon/BiologicalLife(seconds, times_fired)
-	set invisibility = 0
+	if(stat == DEAD)
-
+		return FALSE
-	if(mob_transforming)
-		return
-
-	if(damageoverlaytemp)
-		damageoverlaytemp = 0
-		update_damage_hud()
-
 	//Reagent processing needs to come before breathing, to prevent edge cases.
 	handle_organs()
-
+	if(!(. = ..()))
-	. = ..()
-
-	if (QDELETED(src))
 		return
-
+	handle_blood()
-	if(.) //not dead
+	// handle_blood *could* kill us.
-		handle_blood()
+	// we should probably have a better system for if we need to check for death or something in the future hmw
-
 	if(stat != DEAD)
 		var/bprv = handle_bodyparts()
 		if(bprv & BODYPART_LIFE_UPDATE_HEALTH)
@@ -35,12 +24,17 @@
 		stop_sound_channel(CHANNEL_HEARTBEAT)
 		handle_death()
 		rot()
+		. = FALSE
 
 	//Updates the number of stored chemicals for powers
 	handle_changeling()
 
-	if(stat != DEAD)
+/mob/living/carbon/PhysicalLife(seconds, times_fired)
-		return 1
+	if(!(. = ..()))
+		return
+	if(damageoverlaytemp)
+		damageoverlaytemp = 0
+		update_damage_hud()
 
 //Procs called while dead
 /mob/living/carbon/proc/handle_death()