As per SoS' request, added a config option ALLOW_ADMIN_OOCCOLOR. If commented out, admins won't be able to have their own personal ooc colours (it will use the default dark red colour).

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5056 316c924e-a436-60f5-8080-3fe189b3f50e

code/controllers/configuration.dm

@@ -16,6 +16,7 @@
 	var/log_pda = 0						// log pda messages
 	var/log_hrefs = 0					// logs all links clicked in-game. Could be used for debugging and tracking down exploits
 	var/sql_enabled = 1					// for sql switching
+	var/allow_admin_ooccolor = 0		// Allows admins with relevant permissions to have their own ooc colour
 	var/allow_vote_restart = 0 			// allow votes to restart
 	var/allow_vote_mode = 0				// allow votes to change mode
 	var/allow_admin_jump = 1			// allows admin jumping
@@ -185,6 +186,9 @@
 				if ("log_hrefs")
 					config.log_hrefs = 1
 
+				if("allow_admin_ooccolor")
+					config.allow_admin_ooccolor = 1
+
 				if ("allow_vote_restart")
 					config.allow_vote_restart = 1
 

code/game/objects/items/blueprints.dm

@@ -64,7 +64,7 @@ move an amendment</a> to the drawing.</p>
 "}
 		if (AREA_SPECIAL)
 			text += {"
-<p>This place doesn't noted on this blueprints.</p>
+<p>This place doesn't noted on these blueprints.</p>
 "}
 		else
 			return

code/game/verbs/ooc.dm

@@ -51,7 +51,7 @@
 			if(holder)
 				if(!holder.fakekey || C.holder)
 					if(holder.rights & R_ADMIN)
-						C << "<font color=[holder.ooccolor]><b><span class='prefix'>OOC:</span> <EM>[key][holder.fakekey ? "/([holder.fakekey])" : ""]:</EM> <span class='message'>[msg]</span></b></font>"
+						C << "<font color=[config.allow_admin_ooccolor ? holder.ooccolor :"#b82e00" ]><b><span class='prefix'>OOC:</span> <EM>[key][holder.fakekey ? "/([holder.fakekey])" : ""]:</EM> <span class='message'>[msg]</span></b></font>"
 					else
 						C << "<span class='adminobserverooc'><span class='prefix'>OOC:</span> <EM>[key][holder.fakekey ? "/([holder.fakekey])" : ""]:</EM> <span class='message'>[msg]</span></span>"
 				else

code/modules/admin/admin_verbs.dm

@@ -54,6 +54,7 @@ var/list/admin_verbs_admin = list(
 	/client/proc/admin_cancel_shuttle,	/*allows us to cancel the emergency shuttle, sending it back to centcomm*/
 	/client/proc/cmd_admin_direct_narrate,	/*send text directly to a player with no padding. Useful for narratives and fluff-text*/
 	/client/proc/cmd_admin_world_narrate,	/*sends text to all players with no padding*/
+	/client/proc/cmd_admin_create_centcom_report,
 	/client/proc/check_words			/*displays cult-words*/
 	)
 var/list/admin_verbs_ban = list(
@@ -79,7 +80,6 @@ var/list/admin_verbs_fun = list(
 	/client/proc/send_space_ninja,
 	/client/proc/cmd_admin_add_freeform_ai_law,
 	/client/proc/cmd_admin_add_random_ai_law,
-	/client/proc/cmd_admin_create_centcom_report,
 	/client/proc/make_sound,
 	/client/proc/toggle_random_events
 	)

code/modules/mob/new_player/preferences.dm

@@ -180,7 +180,7 @@ datum/preferences
 			dat += "<b>Adminhelp sound</b>: "
 			dat += "[(sound_adminhelp)?"On":"Off"] <a href='byond://?src=\ref[user];preference=hear_adminhelps'>toggle</a><br>"
 
-			if(user.client.holder.rights & R_FUN)
+			if(config.allow_admin_ooccolor && check_rights(R_FUN,0))
 				dat += "<br><b>OOC</b><br>"
 				dat += "<a href='byond://?src=\ref[user];preference=ooccolor;task=input'>Change color</a> <font face=\"fixedsys\" size=\"3\" color=\"[ooccolor]\"><table style='display:inline;'  bgcolor=\"[ooccolor]\"><tr><td>__</td></tr></table></font><br>"
 

config/config.txt

@@ -86,6 +86,9 @@ ALLOW_RANDOM_EVENTS
 ## If security is prohibited from being most antagonists
 #PROTECT_ROLES_FROM_ANTAGONIST
 
+## Comment this out to stop admins being able to choose their personal ooccolor
+ALLOW_ADMIN_OOCCOLOR
+
 ## If metadata is supported
 ALLOW_METADATA