Merge branch 'master' into no_bluespace_fun

code/game/objects/items/devices/lighting/flashlight.dm

@@ -104,7 +104,7 @@
 			user.visible_message(SPAN_NOTICE("\The [user] directs [src] to [M]'s eyes."), SPAN_NOTICE("You direct [src] to [M]'s eyes."))
 
 			if (H != user)	//can't look into your own eyes buster
-				if(M.stat == DEAD || M.blinded)	//mob is dead or fully blind
+				if(M.stat == DEAD || M.blinded || M.status_flags & FAKEDEATH)	//mob is dead or fully blind
 					to_chat(user, SPAN_WARNING("\The [M]'s pupils do not react to the light!"))
 					return
 				if(XRAY in M.mutations)

code/game/objects/items/devices/scanners.dm

@@ -112,8 +112,8 @@ BREATH ANALYZER
 	var/brain_result = H.get_brain_status()
 	dat += "Brain activity: [brain_result]."
 
-	if(H.stat == DEAD || (H.status_flags & FAKEDEATH))
-		dat += "<span class='scan_warning'>[b]Time of Death:[endb] [time2text(worldtime2text(H.timeofdeath), "hh:mm")]</span>"
+	if(H.stat == DEAD || H.status_flags & FAKEDEATH)
+		dat += "<span class='scan_warning'>[b]Time of Death:[endb] [worldtime2text(H.timeofdeath)]</span>"
 
 	// Pulse rate.
 	var/pulse_result = "normal"
@@ -169,7 +169,7 @@ BREATH ANALYZER
 	dat += temperature_string
 
 	// Traumatic shock.
-	if(H.is_asystole())
+	if(H.is_asystole() || (H.status_flags & FAKEDEATH))
 		dat += "<span class='scan_danger'>Patient is suffering from cardiovascular shock. Administer CPR immediately.</span>"
 	else if(H.shock_stage > 80)
 		dat += "<span class='scan_warning'>Patient is at serious risk of going into shock. Pain relief recommended.</span>"

code/game/objects/structures/morgue.dm

@@ -38,6 +38,7 @@
 				var/mob/living/carbon/C = M
 				if(C.status_flags & FAKEDEATH)
 					icon_state = "morgue2"
+					break
 				switch(C.stat)
 					if(DEAD)
 						icon_state = "morgue2"