Merge pull request #2403 from caelaislinn/bleeding-edge-freeze

Miscellaneous minor things

code/controllers/configuration.dm

@@ -63,8 +63,8 @@
 
 	var/server
 	var/banappeals
-	var/wikiurl
-	var/forumurl
+	var/wikiurl = "http://baystation12.net/wiki/index.php?title=Main_Page"
+	var/forumurl = "http://baystation12.net/forums/"
 
 	//Alert level description
 	var/alert_desc_green = "All threats to the station have passed. Security may not have weapons visible, privacy laws are once again fully enforced."

code/game/verbs/ooc.dm

@@ -41,22 +41,25 @@ var/global/normal_ooc_colour = "#002eb8"
 
 	log_ooc("[mob.name]/[key] : [msg]")
 
+	var/display_colour = normal_ooc_colour
+	if(holder && !holder.fakekey)
+		display_colour = "#0099cc"	//light blue
+		if(holder.rights & R_MOD)
+			display_colour = "#184880"	//dark blue
+		else if(holder.rights & R_ADMIN)
+			if(config.allow_admin_ooccolor)
+				display_colour = src.prefs.ooccolor
+			else
+				display_colour = "#b82e00"	//orange
+
 	for(var/client/C in clients)
 		if(C.prefs.toggles & CHAT_OOC)
 			var/display_name = src.key
-			var/display_colour = normal_ooc_colour
-
-			if(holder)
-				if(holder.fakekey)
-					if(C.holder)
-						display_name = "[holder.fakekey]/([src.key])"
-					else
-						display_name = holder.fakekey
-				else if(config.allow_admin_ooccolor)
-					display_colour = src.prefs.ooccolor
+			if(holder.fakekey)
+				if(C.holder)
+					display_name = "[holder.fakekey]/([src.key])"
 				else
-					display_colour = "#b82e00"
-
+					display_name = holder.fakekey
 			C << "<font color='[display_colour]'><span class='ooc'><span class='prefix'>OOC:</span> <EM>[display_name]:</EM> <span class='message'>[msg]</span></span></font>"
 
 			/*

code/modules/mob/say.dm

@@ -50,7 +50,7 @@
 	for(var/mob/M in player_list)
 		if(istype(M, /mob/new_player))
 			continue
-		if(M.client && M.client.holder && (M.client.prefs.toggles & CHAT_DEAD)) //admins can toggle deadchat on and off. This is a proc in admin.dm and is only give to Administrators and above
+		if(M.client && M.client.holder && M.client.holder.rights & R_ADMIN && (M.client.prefs.toggles & CHAT_DEAD)) //admins can toggle deadchat on and off. This is a proc in admin.dm and is only give to Administrators and above
 			M << rendered	//Admins can hear deadchat, if they choose to, no matter if they're blind/deaf or not.
 		else if(M.stat == DEAD)
 			M.show_message(rendered, 2) //Takes into account blindness and such.