From 9f4d43b080c2309968115ce73c9ba69db5b0215e Mon Sep 17 00:00:00 2001
From: Crazylemon64 <tlrgue17@gmail.com>
Date: Wed, 31 Aug 2016 11:02:54 -0700
Subject: [PATCH] BEHOLD MY POWERS OVER LIFE AND DEATH

(ports over the fix for infinite death when bleeding,
and updating your health doll when you come back from the dead)
---
 code/modules/mob/living/carbon/human/death.dm | 7 +++++++
 code/modules/mob/living/carbon/human/life.dm  | 8 ++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm
index c1d8ec9a187..df78c286254 100644
--- a/code/modules/mob/living/carbon/human/death.dm
+++ b/code/modules/mob/living/carbon/human/death.dm
@@ -142,6 +142,13 @@
 
 	return ..(gibbed)
 
+/mob/living/carbon/human/update_revive()
+	..()
+	// Update healthdoll
+	if(healthdoll)
+		// We're alive again, so re-build the entire healthdoll
+		healthdoll.cached_healthdoll_overlays.Cut()
+
 /mob/living/carbon/human/proc/makeSkeleton()
 	var/obj/item/organ/external/head/H = get_organ("head")
 	if(SKELETON in src.mutations)	return
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index a7e451bcc7e..78e9098f434 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -803,10 +803,6 @@
 		if(REGEN in mutations)
 			heal_overall_damage(0.1, 0.1)
 
-		if(!in_stasis)
-			handle_organs()
-			handle_blood()
-
 		if(paralysis)
 			blinded = 1
 			stat = UNCONSCIOUS
@@ -893,6 +889,10 @@
 		if(gloves && germ_level > gloves.germ_level && prob(10))
 			gloves.germ_level += 1
 
+		if(!in_stasis)
+			handle_organs()
+			handle_blood()
+
 
 	else //dead
 		blinded = 1