From d6891f3bb21ff8489f34057c70d76b40fa772f29 Mon Sep 17 00:00:00 2001 From: if there were two guys on the moon Date: Fri, 19 Jul 2019 09:07:55 +0100 Subject: [PATCH 1/4] defib scanners --- code/game/objects/items/devices/scanners.dm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index ec121bfed2f..6263c5243db 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -1,3 +1,4 @@ +#define DEFIB_TIME_LIMIT (10 MINUTES) //past this many seconds, defib is useless. /* CONTAINS: T-RAY @@ -81,8 +82,11 @@ HALOGEN COUNTER - Radcount on mobs dat += "\tKey: Suffocation/Toxin/Burns/Brute
" dat += "\tDamage Specifics: [OX] - [TX] - [BU] - [BR]
" dat += "Body Temperature: [M.bodytemperature-T0C]°C ([M.bodytemperature*1.8-459.67]°F)
" - if(M.tod && (M.stat == DEAD || (M.status_flags & FAKEDEATH))) - dat += "Time of Death: [M.tod]
" + if(M.timeofdeath && (M.stat == DEAD || (M.status_flags & FAKEDEATH))) + dat += "Time of Death: [worldtime2stationtime(M.timeofdeath)]
" + var/tdelta = round(world.time - M.timeofdeath) + if(tdelta < (DEFIB_TIME_LIMIT * 10)) + dat += "Subject died [DisplayTimeText(tdelta)] ago- defibrillation may be possible!
" 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) @@ -501,3 +505,5 @@ HALOGEN COUNTER - Radcount on mobs else to_chat(user, "No radiation detected.") return + +#undef DEFIB_TIME_LIMIT \ No newline at end of file From f4f2d6bf0800b39fe7a95e3260dee516d57d27a4 Mon Sep 17 00:00:00 2001 From: if there were two guys on the moon Date: Fri, 19 Jul 2019 09:24:07 +0100 Subject: [PATCH 2/4] defib --- 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 6263c5243db..b9741f41c82 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -86,7 +86,7 @@ HALOGEN COUNTER - Radcount on mobs dat += "Time of Death: [worldtime2stationtime(M.timeofdeath)]
" var/tdelta = round(world.time - M.timeofdeath) if(tdelta < (DEFIB_TIME_LIMIT * 10)) - dat += "Subject died [DisplayTimeText(tdelta)] ago- defibrillation may be possible!
" + dat += "Subject died [DisplayTimeText(tdelta)] ago - resuscitation may be possible!
" 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 4baf7a58e7d04e79fdf46baaaea8bfb9f8f658a1 Mon Sep 17 00:00:00 2001 From: if there were two guys on the moon Date: Fri, 19 Jul 2019 09:29:02 +0100 Subject: [PATCH 3/4] VS edit --- code/game/objects/items/devices/scanners.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index b9741f41c82..6583020c6b9 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -1,4 +1,4 @@ -#define DEFIB_TIME_LIMIT (10 MINUTES) //past this many seconds, defib is useless. +#define DEFIB_TIME_LIMIT (10 MINUTES) //VOREStation addition- past this many seconds, defib is useless. /* CONTAINS: T-RAY @@ -84,9 +84,11 @@ HALOGEN COUNTER - Radcount on mobs dat += "Body Temperature: [M.bodytemperature-T0C]°C ([M.bodytemperature*1.8-459.67]°F)
" if(M.timeofdeath && (M.stat == DEAD || (M.status_flags & FAKEDEATH))) dat += "Time of Death: [worldtime2stationtime(M.timeofdeath)]
" + //VOREStation addition starts var/tdelta = round(world.time - M.timeofdeath) if(tdelta < (DEFIB_TIME_LIMIT * 10)) dat += "Subject died [DisplayTimeText(tdelta)] ago - resuscitation may be possible!
" + //VOREStation addition ends 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) @@ -506,4 +508,4 @@ HALOGEN COUNTER - Radcount on mobs to_chat(user, "No radiation detected.") return -#undef DEFIB_TIME_LIMIT \ No newline at end of file +#undef DEFIB_TIME_LIMIT //VOREStation addition \ No newline at end of file From 2b155eb2a5c37bead73ff515d47dcfb3c459d25c Mon Sep 17 00:00:00 2001 From: if there were two guys on the moon Date: Fri, 19 Jul 2019 09:56:57 +0100 Subject: [PATCH 4/4] VSedit --- code/game/objects/items/devices/scanners.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 6583020c6b9..2467406647b 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -82,13 +82,13 @@ HALOGEN COUNTER - Radcount on mobs dat += "\tKey: Suffocation/Toxin/Burns/Brute
" dat += "\tDamage Specifics: [OX] - [TX] - [BU] - [BR]
" dat += "Body Temperature: [M.bodytemperature-T0C]°C ([M.bodytemperature*1.8-459.67]°F)
" + //VOREStation edit/addition starts if(M.timeofdeath && (M.stat == DEAD || (M.status_flags & FAKEDEATH))) dat += "Time of Death: [worldtime2stationtime(M.timeofdeath)]
" - //VOREStation addition starts var/tdelta = round(world.time - M.timeofdeath) if(tdelta < (DEFIB_TIME_LIMIT * 10)) dat += "Subject died [DisplayTimeText(tdelta)] ago - resuscitation may be possible!
" - //VOREStation addition ends + //VOREStation edit/addition ends 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)