Merge pull request #3169 from Segrain/master

Autopsy bugfix.

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")

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

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. -->
 
+<div class="commit sansserif">
+	<h2 class="date">26.06.2013</h2>
+	<h3 class="author">Segrain updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="bugfix">Autopsy scanner properly displays time of wound infliction and death.</li>
+		<li class="bugfix">Autopsy scanner properly displays wounds by projectile weapons.</li>
+	</ul>
+</div>
+
 <div class="commit sansserif">
 	<h2 class="date">June 22nd 2013</h2>
 	<h3 class="author">Cael_Aislinn updated:</h3>