From b1e5c5886782fd6f3de64a976a8ef6174da1412b Mon Sep 17 00:00:00 2001 From: Robertha89 Date: Sun, 11 Oct 2015 22:40:26 +0200 Subject: [PATCH 1/3] Fixes reagent scanner not showing time of death correctly --- code/game/objects/items/devices/scanners.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 74a612762e7..80f42a72f4a 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -124,6 +124,7 @@ REAGENT SCANNER origin_tech = "magnets=1;biotech=1" var/upgraded = 0 var/mode = 1; + var/timeofdeath = null /obj/item/device/healthanalyzer/attack(mob/living/M as mob, mob/living/user as mob) @@ -162,7 +163,7 @@ REAGENT SCANNER 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.timeofdeath && (M.stat == DEAD || (M.status_flags & FAKEDEATH))) - user.show_message("\blue Time of Death: [M.timeofdeath]") + user.show_message("\blue Time of Death: [worldtime2text(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) From b17b6a7225c08a4f1d5ab62a7230c74dc532a06c Mon Sep 17 00:00:00 2001 From: Robertha89 Date: Sun, 11 Oct 2015 23:34:19 +0200 Subject: [PATCH 2/3] Fixes my derp --- code/game/objects/items/devices/scanners.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 80f42a72f4a..9ce33b7582f 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -163,7 +163,7 @@ REAGENT SCANNER 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.timeofdeath && (M.stat == DEAD || (M.status_flags & FAKEDEATH))) - user.show_message("\blue Time of Death: [worldtime2text(timeofdeath)]") + user.show_message("\blue Time of Death: [worldtime2text(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) From e2f91d4bd7b6e7b017d12ab234788532fba0996f Mon Sep 17 00:00:00 2001 From: Robertha89 Date: Sun, 11 Oct 2015 23:55:17 +0200 Subject: [PATCH 3/3] Fixes redundancy --- code/game/objects/items/devices/scanners.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 9ce33b7582f..e7337e1042d 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -124,7 +124,6 @@ REAGENT SCANNER origin_tech = "magnets=1;biotech=1" var/upgraded = 0 var/mode = 1; - var/timeofdeath = null /obj/item/device/healthanalyzer/attack(mob/living/M as mob, mob/living/user as mob)