cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Made autopsy age estimates use station time.

Browse Source
This commit is contained in:
cib
2012-11-14 21:40:46 +01:00
parent 19d2e9d390
commit 0d03f87958
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/WorkInProgress/autopsy.dm
View File

@@ -72,7 +72,7 @@
var/scan_data = "" var/scan_data = ""
if(timeofdeath) if(timeofdeath)
scan_data += "<b>Time since death:</b> [round((world.time - timeofdeath) / (60*10))] minutes<br><br>" scan_data += "<b>Time of death:</b> [worldtime2text(timeofdeath)]<br><br>"
var/n = 1 var/n = 1
for(var/wdata_idx in wdata) for(var/wdata_idx in wdata)
@@ -93,7 +93,7 @@
total_score+=W.damage total_score+=W.damage
var/wound_age = world.time - W.time_inflicted var/wound_age = W.time_inflicted
age = max(age, wound_age) age = max(age, wound_age)
var/damage_desc var/damage_desc
@@ -119,7 +119,7 @@
if(damaging_weapon) if(damaging_weapon)
scan_data += "Severity: [damage_desc]<br>" scan_data += "Severity: [damage_desc]<br>"
scan_data += "Hits by weapon: [total_hits]<br>" scan_data += "Hits by weapon: [total_hits]<br>"
scan_data += "Age of wound: [round(age / (60*10))] minutes<br>" scan_data += "Approximate time of wound infliction: [worldtime2text(age)]<br>"
scan_data += "Affected limbs: [D.organ_names]<br>" scan_data += "Affected limbs: [D.organ_names]<br>"
scan_data += "Possible weapons:<br>" scan_data += "Possible weapons:<br>"
for(var/weapon_name in weapon_chances) for(var/weapon_name in weapon_chances)

6
code/defines/procs/helper_type2type.dm
View File

@@ -260,5 +260,7 @@ proc/tg_list2text(list/list, glue=",")
return dir2text(angle2dir(degree)) return dir2text(angle2dir(degree))
//Returns the world time in english //Returns the world time in english
proc/worldtime2text() proc/worldtime2text(var/time = 0)
return "[round(world.time / 36000)+12]:[(world.time / 600 % 60) < 10 ? add_zero(world.time / 600 % 60, 1) : world.time / 600 % 60]" if(time == 0)
time = world.time
return "[round(time / 36000)+12]:[(time / 600 % 60) < 10 ? add_zero(time / 600 % 60, 1) : time / 600 % 60]"