From 91ab2496818e9e3023b5680326d98d208c4476ca Mon Sep 17 00:00:00 2001 From: Segrain Date: Wed, 26 Jun 2013 16:11:10 +0300 Subject: [PATCH 1/3] Helper update. --- code/__HELPERS/time.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/__HELPERS/time.dm b/code/__HELPERS/time.dm index 6b4dcda2c46..51f56d9d122 100644 --- a/code/__HELPERS/time.dm +++ b/code/__HELPERS/time.dm @@ -1,6 +1,6 @@ //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]" +proc/worldtime2text(time = world.time) + return "[round(time / 36000)+12]:[(time / 600 % 60) < 10 ? add_zero(time / 600 % 60, 1) : time / 600 % 60]" proc/time_stamp() return time2text(world.timeofday, "hh:mm:ss") From a944cda68e4f30c763e2092713c63ab881c245a3 Mon Sep 17 00:00:00 2001 From: Segrain Date: Wed, 26 Jun 2013 16:12:32 +0300 Subject: [PATCH 2/3] Autopsy fix. --- code/modules/organs/organ_external.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index f5092f59325..cecf813dbce 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -95,7 +95,7 @@ if(status & ORGAN_BROKEN && prob(40) && brute) owner.emote("scream") //getting hit on broken hand hurts if(used_weapon) - add_autopsy_data(used_weapon, brute + burn) + add_autopsy_data("[used_weapon]", brute + burn) var/can_cut = (prob(brute*2) || sharp) && !(status & ORGAN_ROBOT) // If the limbs can break, make sure we don't exceed the maximum damage a limb can take before breaking From d5620f9bb074db72d94a8d3e4dc34df38c624013 Mon Sep 17 00:00:00 2001 From: Segrain Date: Wed, 26 Jun 2013 16:18:08 +0300 Subject: [PATCH 3/3] Changelog update. --- html/changelog.html | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/html/changelog.html b/html/changelog.html index b7a3631fe75..56d036eff25 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -57,6 +57,15 @@ Stuff which is in development and not yet visible to players or just code relate (ie. code improvements for expandability, etc.) should not be listed here. They should be listed in the changelog upon commit though. Thanks. --> +
+

26.06.2013

+

Segrain updated:

+
    +
  • Autopsy scanner properly displays time of wound infliction and death.
  • +
  • Autopsy scanner properly displays wounds by projectile weapons.
  • +
+
+

June 22nd 2013

Cael_Aislinn updated: