From f911f84bbd363eadb8ceee47b498c255c3f16cd8 Mon Sep 17 00:00:00 2001
From: DJSnapshot <trevornaze@gmail.com>
Date: Fri, 10 Jan 2014 12:49:32 -0800
Subject: [PATCH 1/2] Replaces modwho and adminwho with staffwho.

(Also, stealthfix.)
---
 code/game/verbs/who.dm                   | 61 ++++++++----------------
 code/modules/customitems/item_defines.dm |  2 +-
 2 files changed, 20 insertions(+), 43 deletions(-)

diff --git a/code/game/verbs/who.dm b/code/game/verbs/who.dm
index 1608a81a748..a8920ef3c71 100644
--- a/code/game/verbs/who.dm
+++ b/code/game/verbs/who.dm
@@ -42,11 +42,12 @@
 	msg += "<b>Total Players: [length(Lines)]</b>"
 	src << msg
 
-/client/verb/adminwho()
+/client/verb/staffwho()
 	set category = "Admin"
-	set name = "Adminwho"
+	set name = "Staffwho"
 
 	var/msg = ""
+	var/modmsg = ""
 	var/num_mods_online = 0
 	var/num_admins_online = 0
 	if(holder)
@@ -70,7 +71,20 @@
 
 				num_admins_online++
 			else
+				modmsg += "\t[C] is a [C.holder.rank]"
+
+				if(isobserver(C.mob))
+					modmsg += " - Observing"
+				else if(istype(C.mob,/mob/new_player))
+					modmsg += " - Lobby"
+				else
+					modmsg += " - Playing"
+
+				if(C.is_afk())
+					modmsg += " (AFK)"
+				modmsg += "\n"
 				num_mods_online++
+
 	else
 		for(var/client/C in admins)
 			if(R_ADMIN & C.holder.rights || !(R_MOD & C.holder.rights))
@@ -78,44 +92,7 @@
 					msg += "\t[C] is a [C.holder.rank]\n"
 					num_admins_online++
 			else
-				num_mods_online++
+				modmsg += "\t[C] is a [C.holder.rank]\n"
 
-	msg = "<b>Current Admins ([num_admins_online]):</b>\n" + msg
-	msg += "<b>There are also [num_mods_online] moderators online.</b> To view online moderators, type 'modwho'\n"
-	src << msg
-
-/client/verb/modwho()
-	set category = "Admin"
-	set name = "Modwho"
-
-	var/msg = ""
-	var/num_admins_online = 0
-	var/num_mods_online = 0
-	if(holder)
-		for(var/client/C in admins)
-			if(R_ADMIN & C.holder.rights || !(R_MOD & C.holder.rights))
-				num_admins_online++
-			else
-				msg += "\t[C] is a [C.holder.rank]"
-
-				if(isobserver(C.mob))
-					msg += " - Observing"
-				else if(istype(C.mob,/mob/new_player))
-					msg += " - Lobby"
-				else
-					msg += " - Playing"
-
-				if(C.is_afk())
-					msg += " (AFK)"
-				msg += "\n"
-				num_mods_online++
-	else
-		for(var/client/C in admins)
-			if(R_ADMIN & C.holder.rights || !(R_MOD & C.holder.rights))
-				num_admins_online++
-			else
-				msg += "\t[C] is a [C.holder.rank]\n"
-
-	msg = "<b>Current Moderators ([num_mods_online]):</b>\n" + msg
-	msg += "<b>There are also [num_admins_online] admins online.</b> To view online admins, type 'adminwho'\n"
-	src << msg
+	msg = "<b>Current Admins ([num_admins_online]):</b>\n" + msg + "\n<b> Current Moderators([num_mods_online]):</b>\n" + modmsg
+	src << msg
\ No newline at end of file
diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index f6fe3a4854d..9bd93713b28 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -737,7 +737,7 @@
 /obj/item/clothing/under/fluff/lillian_amsel_1
 	name = "Black Dress"
 	desc = "A knee-length, dark gray and black dress made of a sfot, velvety material."
-	icon = "icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "lillian_dress"
 	item_state = "lillian_dress"
 	item_color = "lillian_dress"

From 46c6145cf7eeba0e37aeb29842f84981b613f49b Mon Sep 17 00:00:00 2001
From: DJSnapshot <trevornaze@gmail.com>
Date: Fri, 10 Jan 2014 13:39:40 -0800
Subject: [PATCH 2/2] Made it so asay is not the same color as adminlogs.

---
 code/modules/admin/verbs/adminsay.dm | 2 +-
 code/stylesheet.dm                   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/modules/admin/verbs/adminsay.dm b/code/modules/admin/verbs/adminsay.dm
index 3d9ab9dffee..086baa5877b 100644
--- a/code/modules/admin/verbs/adminsay.dm
+++ b/code/modules/admin/verbs/adminsay.dm
@@ -10,7 +10,7 @@
 	log_admin("[key_name(src)] : [msg]")
 
 	if(check_rights(R_ADMIN,0))
-		msg = "<span class='admin'><span class='prefix'>ADMIN:</span> <EM>[key_name(usr, 1)]</EM> (<a href='?_src_=holder;adminplayerobservejump=\ref[mob]'>JMP</A>): <span class='message'>[msg]</span></span>"
+		msg = "<span class='adminsay'><span class='prefix'>ADMIN:</span> <EM>[key_name(usr, 1)]</EM> (<a href='?_src_=holder;adminplayerobservejump=\ref[mob]'>JMP</A>): <span class='message'>[msg]</span></span>"
 		for(var/client/C in admins)
 			if(R_ADMIN & C.holder.rights)
 				C << msg
diff --git a/code/stylesheet.dm b/code/stylesheet.dm
index fda3fb64e25..946013dfcb5 100644
--- a/code/stylesheet.dm
+++ b/code/stylesheet.dm
@@ -19,6 +19,7 @@ em						{font-style: normal;	font-weight: bold;}
 
 .adminobserver			{color: #996600;	font-weight: bold;}
 .admin					{color: #386aff;	font-weight: bold;}
+.adminsay				{color: #9611D4;	font-weight: bold;}
 
 .name					{					font-weight: bold;}