diff --git a/code/game/gamemodes/changeling/powers/fakedeath.dm b/code/game/gamemodes/changeling/powers/fakedeath.dm
index 03ea7d14894..dc7454ff7eb 100644
--- a/code/game/gamemodes/changeling/powers/fakedeath.dm
+++ b/code/game/gamemodes/changeling/powers/fakedeath.dm
@@ -18,7 +18,7 @@
 
 	if(user.stat != DEAD)
 		user.emote("deathgasp")
-		user.timeofdeath = worldtime2text()
+		user.timeofdeath = world.time
 
 	spawn(800)
 		if(user && user.mind && user.mind.changeling && user.mind.changeling.purchasedpowers)
@@ -33,4 +33,4 @@
 		return
 	if(!user.stat && alert("Are we sure we wish to fake our death?",,"Yes","No") == "No")//Confirmation for living changelings if they want to fake their death
 		return
-	return ..()
\ No newline at end of file
+	return ..()
diff --git a/code/modules/mob/living/carbon/alien/death.dm b/code/modules/mob/living/carbon/alien/death.dm
index de954cb3c75..645259b1fda 100644
--- a/code/modules/mob/living/carbon/alien/death.dm
+++ b/code/modules/mob/living/carbon/alien/death.dm
@@ -54,7 +54,7 @@
 		update_canmove()
 		update_icons()
 
-	timeofdeath = worldtime2text()
-	if(mind) 	mind.store_memory("Time of death: [timeofdeath]", 0)
+	timeofdeath = world.time
+	if(mind) 	mind.store_memory("Time of death: [worldtime2text(timeofdeath)]", 0)
 
 	return ..(gibbed)
diff --git a/code/modules/mob/living/carbon/alien/larva/death.dm b/code/modules/mob/living/carbon/alien/larva/death.dm
index 03eeeaa5c81..6db93c4ddd2 100644
--- a/code/modules/mob/living/carbon/alien/larva/death.dm
+++ b/code/modules/mob/living/carbon/alien/larva/death.dm
@@ -8,8 +8,8 @@
 		visible_message("<span class='name'>[src]</span> lets out a waning high-pitched cry.")
 		update_canmove()
 
-	timeofdeath = worldtime2text()
-	if(mind)	mind.store_memory("Time of death: [timeofdeath]", 0)
+	timeofdeath = world.time
+	if(mind)	mind.store_memory("Time of death: [worldtime2text(timeofdeath)]", 0)
 	living_mob_list -= src
 
 	return ..(gibbed)
diff --git a/code/modules/mob/living/carbon/brain/death.dm b/code/modules/mob/living/carbon/brain/death.dm
index 9e6a1d08a42..255f3c03897 100644
--- a/code/modules/mob/living/carbon/brain/death.dm
+++ b/code/modules/mob/living/carbon/brain/death.dm
@@ -10,8 +10,8 @@
 	see_in_dark = 8
 	see_invisible = SEE_INVISIBLE_LEVEL_TWO
 
-	timeofdeath = worldtime2text()
-	if(mind)	mind.store_memory("Time of death: [timeofdeath]", 0)	//mind. ?
+	timeofdeath = world.time
+	if(mind)	mind.store_memory("Time of death: [worldtime2text(timeofdeath)]", 0)	//mind. ?
 
 	return ..(gibbed)
 
@@ -39,4 +39,4 @@
 			qdel(loc)//Gets rid of the brain item
 	spawn(15)
 		if(animation)	qdel(animation)
-		if(src)			qdel(src)
\ No newline at end of file
+		if(src)			qdel(src)
diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm
index 384f581cce3..c1d8ec9a187 100644
--- a/code/modules/mob/living/carbon/human/death.dm
+++ b/code/modules/mob/living/carbon/human/death.dm
@@ -128,10 +128,10 @@
 	if(!gibbed)
 		update_canmove()
 
-	timeofdeath = worldtime2text()
+	timeofdeath = world.time
 	med_hud_set_health()
 	med_hud_set_status()
-	if(mind)	mind.store_memory("Time of death: [timeofdeath]", 0)
+	if(mind)	mind.store_memory("Time of death: [worldtime2text(timeofdeath)]", 0)
 	if(ticker && ticker.mode)
 //		log_to_dd("k")
 		sql_report_death(src)
diff --git a/code/modules/mob/living/silicon/ai/death.dm b/code/modules/mob/living/silicon/ai/death.dm
index 4d2cb361b41..1c977296a8a 100644
--- a/code/modules/mob/living/silicon/ai/death.dm
+++ b/code/modules/mob/living/silicon/ai/death.dm
@@ -39,7 +39,7 @@
 		if(istype(loc, /obj/item/device/aicard))
 			loc.icon_state = "aicard-404"
 
-	timeofdeath = worldtime2text()
-	if(mind)	mind.store_memory("Time of death: [timeofdeath]", 0)
+	timeofdeath = world.time
+	if(mind)	mind.store_memory("Time of death: [worldtime2text(timeofdeath)]", 0)
 
 	return ..(gibbed)
diff --git a/code/modules/mob/living/silicon/robot/component.dm b/code/modules/mob/living/silicon/robot/component.dm
index f51325f546b..6943105132b 100644
--- a/code/modules/mob/living/silicon/robot/component.dm
+++ b/code/modules/mob/living/silicon/robot/component.dm
@@ -204,7 +204,7 @@
 			to_chat(user, "\t Key: <font color='#FFA500'>Electronics</font>/<font color='red'>Brute</font>")
 			to_chat(user, "\t Damage Specifics: <font color='#FFA500'>[BU]</font> - <font color='red'>[BR]</font>")
 			if(M.timeofdeath && M.stat == DEAD)
-				to_chat(user, "<span class='notice'>Time of Disable: [M.timeofdeath]</span>")
+				to_chat(user, "<span class='notice'>Time of Disable: [worldtime2text(M.timeofdeath)]</span>")
 			var/mob/living/silicon/robot/H = M
 			var/list/damaged = H.get_damaged_components(1,1,1)
 			to_chat(user, "<span class='notice'>Localized Damage:</span>")
diff --git a/code/modules/mob/living/silicon/robot/death.dm b/code/modules/mob/living/silicon/robot/death.dm
index b0dc5062a95..4b7d0a04a27 100644
--- a/code/modules/mob/living/silicon/robot/death.dm
+++ b/code/modules/mob/living/silicon/robot/death.dm
@@ -63,9 +63,9 @@
 	see_in_dark = 8
 	see_invisible = SEE_INVISIBLE_LEVEL_TWO
 	update_icons()
-	timeofdeath = worldtime2text()
-	if(mind)	mind.store_memory("Time of death: [timeofdeath]", 0)
+	timeofdeath = world.time
+	if(mind)	mind.store_memory("Time of death: [worldtime2text(timeofdeath)]", 0)
 
 	sql_report_cyborg_death(src)
 
-	return ..(gibbed)
\ No newline at end of file
+	return ..(gibbed)
diff --git a/code/modules/pda/utilities.dm b/code/modules/pda/utilities.dm
index 837d0c439f5..558af083eb8 100644
--- a/code/modules/pda/utilities.dm
+++ b/code/modules/pda/utilities.dm
@@ -49,7 +49,7 @@
 	user.show_message("<span class=notice>\t Key: Suffocation/Toxin/Burns/Brute</span>", 1)
 	user.show_message("<span class=notice>\t Body Temperature: [C.bodytemperature-T0C]&deg;C ([C.bodytemperature*1.8-459.67]&deg;F)</span>", 1)
 	if(C.timeofdeath && (C.stat == DEAD || (C.status_flags & FAKEDEATH)))
-		user.show_message("<span class=notice>\t Time of Death: [C.timeofdeath]</span>")
+		user.show_message("<span class=notice>\t Time of Death: [worldtime2text(C.timeofdeath)]</span>")
 	if(istype(C, /mob/living/carbon/human))
 		var/mob/living/carbon/human/H = C
 		var/list/damaged = H.get_damaged_organs(1,1)
@@ -162,7 +162,7 @@
 		// JMO 20140705: Makes scanned document show up properly in the notes. Not pretty for formatted documents,
 		// as this will clobber the HTML, but at least it lets you scan a document. You can restore the original
 		// notes by editing the note again. (Was going to allow you to edit, but scanned documents are too long.)
-		var/raw_scan = sanitize_simple(P.info, list("\t" = "", "ÿ" = ""))
+		var/raw_scan = sanitize_simple(P.info, list("\t" = "", "ÿ" = ""))
 		var/formatted_scan = ""
 		// Scrub out the tags (replacing a few formatting ones along the way)
 		// Find the beginning and end of the first tag.