From 0d03f87958d2e48a97db849dc5a806803958271c Mon Sep 17 00:00:00 2001 From: cib Date: Wed, 14 Nov 2012 21:40:46 +0100 Subject: [PATCH] Made autopsy age estimates use station time. --- code/WorkInProgress/autopsy.dm | 6 +++--- code/defines/procs/helper_type2type.dm | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/code/WorkInProgress/autopsy.dm b/code/WorkInProgress/autopsy.dm index 2e59beec5c..2137141996 100644 --- a/code/WorkInProgress/autopsy.dm +++ b/code/WorkInProgress/autopsy.dm @@ -72,7 +72,7 @@ var/scan_data = "" if(timeofdeath) - scan_data += "Time since death: [round((world.time - timeofdeath) / (60*10))] minutes

" + scan_data += "Time of death: [worldtime2text(timeofdeath)]

" var/n = 1 for(var/wdata_idx in wdata) @@ -93,7 +93,7 @@ total_score+=W.damage - var/wound_age = world.time - W.time_inflicted + var/wound_age = W.time_inflicted age = max(age, wound_age) var/damage_desc @@ -119,7 +119,7 @@ if(damaging_weapon) scan_data += "Severity: [damage_desc]
" scan_data += "Hits by weapon: [total_hits]
" - scan_data += "Age of wound: [round(age / (60*10))] minutes
" + scan_data += "Approximate time of wound infliction: [worldtime2text(age)]
" scan_data += "Affected limbs: [D.organ_names]
" scan_data += "Possible weapons:
" for(var/weapon_name in weapon_chances) diff --git a/code/defines/procs/helper_type2type.dm b/code/defines/procs/helper_type2type.dm index b98c8c0790..ca0668bfb7 100644 --- a/code/defines/procs/helper_type2type.dm +++ b/code/defines/procs/helper_type2type.dm @@ -260,5 +260,7 @@ proc/tg_list2text(list/list, glue=",") return dir2text(angle2dir(degree)) //Returns the world time in english -proc/worldtime2text() - return "[round(world.time / 36000)+12]:[(world.time / 600 % 60) < 10 ? add_zero(world.time / 600 % 60, 1) : world.time / 600 % 60]" \ No newline at end of file +proc/worldtime2text(var/time = 0) + if(time == 0) + time = world.time + return "[round(time / 36000)+12]:[(time / 600 % 60) < 10 ? add_zero(time / 600 % 60, 1) : time / 600 % 60]" \ No newline at end of file