Merge remote-tracking branch 'origin/master' into TGUI-3.0

code/modules/mob/living/carbon/human/species_types/jellypeople.dm

@@ -468,6 +468,7 @@
 			if(ReadHSV(temp_hsv)[3] >= ReadHSV("#7F7F7F")[3]) // mutantcolors must be bright
 				H.dna.features["mcolor"] = sanitize_hexcolor(new_color, 6)
 				H.update_body()
+				H.update_hair()
 			else
 				to_chat(H, "<span class='notice'>Invalid color. Your color is not bright enough.</span>")
 	else if(select_alteration == "Hair Style")

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

@@ -1,8 +1,8 @@
 /mob/living/carbon/BiologicalLife(seconds, times_fired)
-	if(stat == DEAD)
-		return FALSE
 	//Reagent processing needs to come before breathing, to prevent edge cases.
 	handle_organs()
+	if(stat == DEAD)
+		return FALSE
 	if(!(. = ..()))
 		return
 	handle_blood()