From 19d2d549e2b00158f6c2afc32d4b3f68009b0a68 Mon Sep 17 00:00:00 2001
From: mwerezak <mwerezak@gmail.com>
Date: Fri, 18 Jul 2014 12:07:43 -0400
Subject: [PATCH] Fixes #5666

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

diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm
index a25fcd63306..8ce09047b90 100644
--- a/code/game/verbs/ooc.dm
+++ b/code/game/verbs/ooc.dm
@@ -120,9 +120,12 @@ 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
+	
+	// Handle non-admins
 	for(var/mob/M in heard)
 		if(!M.client)
 			continue
@@ -138,6 +141,12 @@ var/global/normal_ooc_colour = "#002eb8"
 					else
 						display_name = holder.fakekey
 			C << "<font color='#6699CC'><span class='ooc'><span class='prefix'>LOOC:</span> <EM>[display_name]:</EM> <span class='message'>[msg]</span></span></font>"
+	
+	// Now handle admins
+	display_name = S.key
+	if(S.stat != DEAD)
+		display_name = "[S.name]/([S.key])"
+	
 	for(var/client/C in admins)
 		if(C.prefs.toggles & CHAT_LOOC)
 			var/prefix = "(R)LOOC"