diff --git a/code/game/gamemodes/changeling/powers/fakedeath.dm b/code/game/gamemodes/changeling/powers/fakedeath.dm
index 9a4b144cc71..3a0fb785f19 100644
--- a/code/game/gamemodes/changeling/powers/fakedeath.dm
+++ b/code/game/gamemodes/changeling/powers/fakedeath.dm
@@ -18,7 +18,7 @@
if(user.stat != DEAD)
user.emote("deathgasp")
- user.tod = worldtime2text()
+ user.timeofdeath = worldtime2text()
spawn(800)
if(user && user.mind && user.mind.changeling && user.mind.changeling.purchasedpowers)
diff --git a/code/game/gamemodes/changeling/powers/revive.dm b/code/game/gamemodes/changeling/powers/revive.dm
index 8e4313b92b0..e5cc89aeaed 100644
--- a/code/game/gamemodes/changeling/powers/revive.dm
+++ b/code/game/gamemodes/changeling/powers/revive.dm
@@ -5,12 +5,10 @@
//Revive from regenerative stasis
/obj/effect/proc_holder/changeling/revive/sting_action(var/mob/living/carbon/user)
-
if(user.stat == DEAD)
dead_mob_list -= user
- living_mob_list += user
+ living_mob_list |= user
user.stat = CONSCIOUS
- user.tod = null
user.setToxLoss(0)
user.setOxyLoss(0)
user.setCloneLoss(0)
diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index 74c1f2f51ff..f6976502e47 100755
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -1084,8 +1084,8 @@ var/global/list/obj/item/device/pda/PDAs = list()
user.show_message("\blue \t Damage Specifics: [C.getOxyLoss() > 50 ? "\red" : "\blue"][C.getOxyLoss()]-[C.getToxLoss() > 50 ? "\red" : "\blue"][C.getToxLoss()]-[C.getFireLoss() > 50 ? "\red" : "\blue"][C.getFireLoss()]-[C.getBruteLoss() > 50 ? "\red" : "\blue"][C.getBruteLoss()]", 1)
user.show_message("\blue \t Key: Suffocation/Toxin/Burns/Brute", 1)
user.show_message("\blue \t Body Temperature: [C.bodytemperature-T0C]°C ([C.bodytemperature*1.8-459.67]°F)", 1)
- if(C.tod && (C.stat == DEAD || (C.status_flags & FAKEDEATH)))
- user.show_message("\blue \t Time of Death: [C.tod]")
+ if(C.timeofdeath && (C.stat == DEAD || (C.status_flags & FAKEDEATH)))
+ user.show_message("\blue \t Time of Death: [C.timeofdeath]")
if(istype(C, /mob/living/carbon/human))
var/mob/living/carbon/human/H = C
var/list/damaged = H.get_damaged_organs(1,1)
diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index 19812645eea..976fed562c0 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -161,8 +161,8 @@ REAGENT SCANNER
user.show_message("\t Key: Suffocation/Toxin/Burns/Brute", 1)
user.show_message("\t Damage Specifics: [OX] - [TX] - [BU] - [BR]")
user.show_message("\blue Body Temperature: [M.bodytemperature-T0C]°C ([M.bodytemperature*1.8-459.67]°F)", 1)
- if(M.tod && (M.stat == DEAD || (M.status_flags & FAKEDEATH)))
- user.show_message("\blue Time of Death: [M.tod]")
+ if(M.timeofdeath && (M.stat == DEAD || (M.status_flags & FAKEDEATH)))
+ user.show_message("\blue Time of Death: [M.timeofdeath]")
if(istype(M, /mob/living/carbon/human) && mode == 1)
var/mob/living/carbon/human/H = M
var/list/damaged = H.get_damaged_organs(1,1)
diff --git a/code/modules/awaymissions/mission_code/wildwest.dm b/code/modules/awaymissions/mission_code/wildwest.dm
index 3e2910fa556..ce914b6c407 100644
--- a/code/modules/awaymissions/mission_code/wildwest.dm
+++ b/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)
diff --git a/code/modules/mob/living/carbon/alien/death.dm b/code/modules/mob/living/carbon/alien/death.dm
index 40303b03543..693763e4960 100644
--- a/code/modules/mob/living/carbon/alien/death.dm
+++ b/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)
diff --git a/code/modules/mob/living/carbon/alien/larva/death.dm b/code/modules/mob/living/carbon/alien/larva/death.dm
index 67edcfd04ca..574b617ca58 100644
--- a/code/modules/mob/living/carbon/alien/larva/death.dm
+++ b/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)
diff --git a/code/modules/mob/living/carbon/brain/death.dm b/code/modules/mob/living/carbon/brain/death.dm
index 17bf26de838..efcfac98624 100644
--- a/code/modules/mob/living/carbon/brain/death.dm
+++ b/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)
diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm
index a9cf1ea1094..4307c6cbd0b 100644
--- a/code/modules/mob/living/carbon/human/death.dm
+++ b/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)
diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm
index 4f404d1f314..c0587ddee86 100644
--- a/code/modules/mob/living/carbon/human/human_damage.dm
+++ b/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
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 6ead72a36f5..808f8b3e772 100644
--- a/code/modules/mob/living/living.dm
+++ b/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
diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm
index cf6204e710c..08a99c0dba2 100644
--- a/code/modules/mob/living/living_defines.dm
+++ b/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
diff --git a/code/modules/mob/living/silicon/ai/death.dm b/code/modules/mob/living/silicon/ai/death.dm
index dfa05ddc5d0..fe96da3c35e 100644
--- a/code/modules/mob/living/silicon/ai/death.dm
+++ b/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)
diff --git a/code/modules/mob/living/silicon/robot/component.dm b/code/modules/mob/living/silicon/robot/component.dm
index d0469bc42dc..3c81531030d 100644
--- a/code/modules/mob/living/silicon/robot/component.dm
+++ b/code/modules/mob/living/silicon/robot/component.dm
@@ -206,8 +206,8 @@
user << "Analyzing Results for [M]:\n\t Overall Status: [M.stat > 1 ? "fully disabled" : "[M.health - M.halloss]% functional"]"
user << "\t Key: Electronics/Brute"
user << "\t Damage Specifics: [BU] - [BR]"
- if(M.tod && M.stat == DEAD)
- user << "Time of Disable: [M.tod]"
+ if(M.timeofdeath && M.stat == DEAD)
+ user << "Time of Disable: [M.timeofdeath]"
var/mob/living/silicon/robot/H = M
var/list/damaged = H.get_damaged_components(1,1,1)
user << "Localized Damage:"
diff --git a/code/modules/mob/living/silicon/robot/death.dm b/code/modules/mob/living/silicon/robot/death.dm
index cf9427242d8..cafb53d8621 100644
--- a/code/modules/mob/living/silicon/robot/death.dm
+++ b/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)
diff --git a/code/modules/reagents/newchem/medicine.dm b/code/modules/reagents/newchem/medicine.dm
index a54072e9bbb..e79667be06e 100644
--- a/code/modules/reagents/newchem/medicine.dm
+++ b/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("[M] seems to rise from the dead!")
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("[M] doesn't appear to respond, perhaps try again later?")
if(!M.suiciding && !ghost && !(NOCLONE in M.mutations))
M.visible_message("[M] seems to rise from the dead!")
- 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