From 866a486ad694fd28d6d5968996e15fa6b0f47f4a Mon Sep 17 00:00:00 2001
From: Whitellama <whitellama@users.noreply.github.com>
Date: Tue, 15 Jul 2014 12:55:21 -0700
Subject: [PATCH] Made LOOC show character names of living players and BYOND
 keys of observing/dead players

---
 code/game/verbs/ooc.dm | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm
index c87d375e97..12d2b9a067 100644
--- a/code/game/verbs/ooc.dm
+++ b/code/game/verbs/ooc.dm
@@ -130,6 +130,10 @@ var/global/normal_ooc_colour = "#002eb8"
 	log_ooc("(LOCAL) [mob.name]/[key] : [msg]")
 
 	var/list/heard = get_mobs_in_view(7, src.mob)
+	var/mob/S = src.mob
+	var/display_name = S.key
+	if(S.stat != DEAD)
+		display_name = S.name
 	for(var/mob/M in heard)
 		if(!M.client)
 			continue
@@ -138,7 +142,6 @@ var/global/normal_ooc_colour = "#002eb8"
 			continue //they are handled after that
 
 		if(C.prefs.toggles & CHAT_LOOC)
-			var/display_name = src.key
 			if(holder)
 				if(holder.fakekey)
 					if(C.holder)
@@ -148,7 +151,8 @@ var/global/normal_ooc_colour = "#002eb8"
 			C << "<font color='#6699CC'><span class='ooc'><span class='prefix'>LOOC:</span> <EM>[display_name]:</EM> <span class='message'>[msg]</span></span></font>"
 	for(var/client/C in admins)
 		if(C.prefs.toggles & CHAT_LOOC)
-			var/prefix = "(R)LOOC"
-			if (C.mob in heard)
-				prefix = "LOOC"
-			C << "<font color='#6699CC'><span class='ooc'><span class='prefix'>[prefix]:</span> <EM>[src.key]:</EM> <span class='message'>[msg]</span></span></font>"
\ No newline at end of file
+			var/prefix = "LOOC"
+			if (!(C.mob in heard))
+				prefix = "(R)LOOC"
+				display_name = S.key
+			C << "<font color='#6699CC'><span class='ooc'><span class='prefix'>[prefix]:</span> <EM>[display_name]:</EM> <span class='message'>[msg]</span></span></font>"
\ No newline at end of file