diff --git a/code/game/verbs/who.dm b/code/game/verbs/who.dm
index 6450ba49..a51752bc 100644
--- a/code/game/verbs/who.dm
+++ b/code/game/verbs/who.dm
@@ -48,6 +48,8 @@
 
 	var/msg = ""
 	var/modmsg = ""
+	var/devmsg = ""
+	var/num_devs_online = 0
 	var/num_mods_online = 0
 	var/num_admins_online = 0
 	if(holder)
@@ -88,6 +90,20 @@
 					modmsg += " (AFK)"
 				modmsg += "\n"
 				num_mods_online++
+			else if(R_DEV & C.holder.rights)
+				devmsg += "\t[C] is a [C.holder.rank]"
+
+				if(isobserver(C.mob))
+					devmsg += " - Observing"
+				else if(istype(C.mob,/mob/new_player))
+					devmsg += " - Lobby"
+				else
+					devmsg += " - Playing"
+
+				if(C.is_afk())
+					modmsg += " (AFK)"
+				devmsg += "\n"
+				num_devs_online++
 
 	else
 		for(var/client/C in admins)
@@ -98,6 +114,9 @@
 			else if (R_MOD & C.holder.rights)
 				modmsg += "\t[C] is a [C.holder.rank]\n"
 				num_mods_online++
+			else if(R_DEV & C.holder.rights)
+				devmsg += "\t[C] is a [C.holder.rank]\n"
+				num_devs_online++
 
-	msg = "<b>Current Admins ([num_admins_online]):</b>\n" + msg + "\n<b> Current Moderators([num_mods_online]):</b>\n" + modmsg
+	msg = "<b>Current Admins ([num_admins_online]):</b>\n" + msg + "\n<b> Current Moderators([num_mods_online]):</b>\n" + modmsg + "\n<b> Current Moderators([num_devs_online]):</b>\n" + devmsg
 	src << msg
\ No newline at end of file
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index a6995fd2..7e566fc6 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -8,14 +8,14 @@ var/global/floorIsLava = 0
 	msg = "<span class=\"admin\"><span class=\"prefix\">ADMIN LOG:</span> <span class=\"message\">[msg]</span></span>"
 	log_adminwarn(msg)
 	for(var/client/C in admins)
-		if(R_MOD || R_ADMIN & C.holder.rights)
+		if(R_ADMIN & C.holder.rights)
 			C << msg
 
 /proc/msg_admin_attack(var/text) //Toggleable Attack Messages
 	log_attack(text)
 	var/rendered = "<span class=\"admin\"><span class=\"prefix\">ATTACK:</span> <span class=\"message\">[text]</span></span>"
 	for(var/client/C in admins)
-		if(R_ADMIN & C.holder.rights)
+		if(R_MOD || R_ADMIN & C.holder.rights)
 			if(C.prefs.toggles & CHAT_ATTACKLOGS)
 				var/msg = rendered
 				C << msg