Strange reagent fix, tod --> timeofdeath

code/modules/awaymissions/mission_code/wildwest.dm

@@ -207,7 +207,7 @@
 			dead_mob_list -= C
 			living_mob_list += C
 		C.stat = CONSCIOUS
-		C.tod = null
+		C.timeofdeath = 0
 		C.setToxLoss(0)
 		C.setOxyLoss(0)
 		C.setCloneLoss(0)

code/modules/mob/living/carbon/alien/death.dm

@@ -53,7 +53,7 @@
 		if(client)	blind.layer = 0
 		update_icons()
 
-	tod = worldtime2text() //weasellos time of death patch
-	if(mind) 	mind.store_memory("Time of death: [tod]", 0)
+	timeofdeath = worldtime2text()
+	if(mind) 	mind.store_memory("Time of death: [timeofdeath]", 0)
 
 	return ..(gibbed)

code/modules/mob/living/carbon/alien/larva/death.dm

@@ -9,8 +9,8 @@
 		update_canmove()
 		if(client)	blind.layer = 0
 
-	tod = worldtime2text() //weasellos time of death patch
-	if(mind)	mind.store_memory("Time of death: [tod]", 0)
+	timeofdeath = worldtime2text()
+	if(mind)	mind.store_memory("Time of death: [timeofdeath]", 0)
 	living_mob_list -= src
 
 	return ..(gibbed)

code/modules/mob/living/carbon/brain/death.dm

@@ -11,8 +11,8 @@
 	see_in_dark = 8
 	see_invisible = SEE_INVISIBLE_LEVEL_TWO
 
-	tod = worldtime2text() //weasellos time of death patch
-	if(mind)	mind.store_memory("Time of death: [tod]", 0)	//mind. ?
+	timeofdeath = worldtime2text()
+	if(mind)	mind.store_memory("Time of death: [timeofdeath]", 0)	//mind. ?
 
 	return ..(gibbed)
 

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

@@ -133,8 +133,8 @@
 		update_canmove()
 		if(client) blind.layer = 0
 
-	tod = worldtime2text()		//weasellos time of death patch
-	if(mind)	mind.store_memory("Time of death: [tod]", 0)
+	timeofdeath = worldtime2text()
+	if(mind)	mind.store_memory("Time of death: [timeofdeath]", 0)
 	if(ticker && ticker.mode)
 //		log_to_dd("k")
 		sql_report_death(src)

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

@@ -22,15 +22,6 @@
 		update_revive()
 	return
 
-/mob/living/carbon/human/proc/update_revive() // handles revival through other means than cloning or adminbus (defib, IPC repair)
-	stat = CONSCIOUS
-	dead_mob_list -= src
-	living_mob_list |= src
-	mob_list |= src
-	ear_deaf = 0
-	tod = 0
-	timeofdeath = 0
-
 /mob/living/carbon/human/adjustBrainLoss(var/amount)
 	if(status_flags & GODMODE)	return 0	//godmode
 

code/modules/mob/living/living.dm

@@ -317,9 +317,16 @@
 			C.reagents.addiction_list.Cut()
 	hud_updateflag |= 1 << HEALTH_HUD
 	hud_updateflag |= 1 << STATUS_HUD
+	
+/mob/living/proc/update_revive() // handles revival through other means than cloning or adminbus (defib, IPC repair)
+	stat = CONSCIOUS
+	dead_mob_list -= src
+	living_mob_list |= src
+	mob_list |= src
+	ear_deaf = 0
+	timeofdeath = 0
 
 /mob/living/proc/rejuvenate()
-
 	// shut down various types of badness
 	setToxLoss(0)
 	setOxyLoss(0)
@@ -367,10 +374,9 @@
 			human_mob.decaylevel = 0
 
 	restore_all_organs()
-	if(stat == 2)
+	if(stat == DEAD)
 		dead_mob_list -= src
 		living_mob_list += src
-		tod = null
 		timeofdeath = 0
 
 	stat = CONSCIOUS

code/modules/mob/living/living_defines.dm

@@ -34,8 +34,6 @@
 
 	var/atom/movable/cameraFollow = null
 
-	var/tod = null // Time of death
-
 	var/on_fire = 0 //The "Are we on fire?" var
 	var/fire_stacks = 0 //Tracks how many stacks of fire we have on, max is usually 20
 

code/modules/mob/living/silicon/ai/death.dm

@@ -53,7 +53,7 @@
 		if (istype(loc, /obj/item/device/aicard))
 			loc.icon_state = "aicard-404"
 
-	tod = worldtime2text() //weasellos time of death patch
-	if(mind)	mind.store_memory("Time of death: [tod]", 0)
+	timeofdeath = worldtime2text()
+	if(mind)	mind.store_memory("Time of death: [timeofdeath]", 0)
 
 	return ..(gibbed)

code/modules/mob/living/silicon/robot/component.dm

@@ -206,8 +206,8 @@
 			user << "<span class='notice'>Analyzing Results for [M]:\n\t Overall Status: [M.stat > 1 ? "fully disabled" : "[M.health - M.halloss]% functional"]</span>"
 			user << "\t Key: <font color='#FFA500'>Electronics</font>/<font color='red'>Brute</font>"
 			user << "\t Damage Specifics: <font color='#FFA500'>[BU]</font> - <font color='red'>[BR]</font>"
-			if(M.tod && M.stat == DEAD)
-				user << "<span class='notice'>Time of Disable: [M.tod]</span>"
+			if(M.timeofdeath && M.stat == DEAD)
+				user << "<span class='notice'>Time of Disable: [M.timeofdeath]</span>"
 			var/mob/living/silicon/robot/H = M
 			var/list/damaged = H.get_damaged_components(1,1,1)
 			user << "<span class='notice'>Localized Damage:</span>"

code/modules/mob/living/silicon/robot/death.dm

@@ -62,8 +62,8 @@
 	see_in_dark = 8
 	see_invisible = SEE_INVISIBLE_LEVEL_TWO
 	update_icons()
-	tod = worldtime2text() //weasellos time of death patch
-	if(mind)	mind.store_memory("Time of death: [tod]", 0)
+	timeofdeath = worldtime2text()
+	if(mind)	mind.store_memory("Time of death: [timeofdeath]", 0)
 
 	sql_report_cyborg_death(src)
 

code/modules/reagents/newchem/medicine.dm

@@ -633,6 +633,7 @@ datum/reagent/strange_reagent/reaction_mob(var/mob/living/M as mob, var/method=T
 		if(method == TOUCH)
 			if(M.stat == DEAD)
 				M.health = M.maxHealth
+				M.update_revive()
 				M.visible_message("<span class='warning'>[M] seems to rise from the dead!</span>")
 	if(istype(M, /mob/living/carbon))
 		if(method == INGEST)
@@ -648,13 +649,12 @@ datum/reagent/strange_reagent/reaction_mob(var/mob/living/M as mob, var/method=T
 					M.visible_message("<span class='notice'>[M] doesn't appear to respond, perhaps try again later?</span>")
 				if(!M.suiciding && !ghost && !(NOCLONE in M.mutations))
 					M.visible_message("<span class='warning'>[M] seems to rise from the dead!</span>")
-					M.stat = 1
 					M.setOxyLoss(0)
 					M.adjustBruteLoss(rand(0,15))
 					M.adjustToxLoss(rand(0,15))
 					M.adjustFireLoss(rand(0,15))
-					dead_mob_list -= M
-					living_mob_list |= list(M)
+					M.update_revive()
+					M.stat = UNCONSCIOUS
 					add_logs(M, M, "revived", object="strange reagent")
 	..()
 	return