Give members a predefined OOC color

code/game/verbs/ooc.dm

@@ -1,5 +1,8 @@
-
 var/global/normal_ooc_colour = "#002eb8"
+var/global/member_ooc_colour = "#035417"
+var/global/mentor_ooc_colour = "#0099cc"
+var/global/moderator_ooc_colour = "#184880"
+var/global/admin_ooc_colour = "#b82e00"
 
 /client/verb/ooc(msg as text)
 	set name = "OOC" //Gave this shit a shorter name so you only have to time out "ooc" rather than "ooc message" to use it --NeoFite
@@ -44,19 +47,19 @@ var/global/normal_ooc_colour = "#002eb8"
 
 	var/display_colour = normal_ooc_colour
 	if(holder && !holder.fakekey)
-		display_colour = "#0099cc"	//light blue
+		display_colour = mentor_ooc_colour
 		if(check_rights(R_MOD,0) && !check_rights(R_ADMIN,0))
-			display_colour = "#184880"	//dark blue
+			display_colour = moderator_ooc_colour
 		else if(check_rights(R_ADMIN,0))
 			if(config.allow_admin_ooccolor)
 				display_colour = src.prefs.ooccolor
 			else
-				display_colour = "#b82e00"	//orange
+				display_colour = admin_ooc_colour
 	
 	if(prefs.unlock_content)
 		if(display_colour == normal_ooc_colour)
-			if((prefs.toggles & MEMBER_PUBLIC) && prefs.ooccolor)
-				display_colour = prefs.ooccolor
+			if((prefs.toggles & MEMBER_PUBLIC))
+				display_colour = member_ooc_colour
 	
 	for(var/client/C in clients)
 		if(C.prefs.toggles & CHAT_OOC)
@@ -85,49 +88,58 @@ var/global/normal_ooc_colour = "#002eb8"
 
 /client/proc/set_ooc(newColor as color)
 	set name = "Set Player OOC Colour"
-	set desc = "Modifies a player's OOC color."
+	set desc = "Modifies the default player OOC color."
 	set category = "Server"
 	
 	if(!check_rights(R_SERVER))	return
+	
 	normal_ooc_colour = newColor
+	message_admins("[key_name_admin(usr)] has set the default player OOC color to [newColor]")
+	log_admin("[key_name(usr)] has set the default player OOC color to [newColor]")
+
+
 	feedback_add_details("admin_verb","SOOC")
 	
 /client/proc/reset_ooc()
 	set name = "Reset Player OOC Color"
-	set desc = "Returns a player's OOC color to default."
+	set desc = "Returns the default player OOC color to default."
 	set category = "Server"
 	
 	if(!check_rights(R_SERVER))	return
+	
 	normal_ooc_colour = initial(normal_ooc_colour)
+	message_admins("[key_name_admin(usr)] has reset the default player OOC color")
+	log_admin("[key_name(usr)] has reset the default player OOC color")
+	
 	feedback_add_details("admin_verb","ROOC")
 	
-/client/verb/colorooc()
+/client/proc/colorooc()
 	set name = "Set Your OOC Color"
+	set desc = "Allows you to pick a custom OOC color."
 	set category = "Preferences"
 
-	if(!check_rights(R_ADMIN,0))
-		if(!is_content_unlocked())	return
+	if(!check_rights(R_ADMIN)) return
 
 	var/new_ooccolor = input(src, "Please select your OOC color.", "OOC color", prefs.ooccolor) as color|null
 	if(new_ooccolor)
-		if(check_rights(R_ADMIN,0)) // Admins can pick any color
-			prefs.ooccolor = new_ooccolor
-		else
-			prefs.ooccolor = sanitize_ooccolor(new_ooccolor)
-		prefs.save_preferences()
+		prefs.ooccolor = new_ooccolor
+		prefs.save_preferences(src)
+		usr << "Your OOC color has been set to [new_ooccolor]."
+		
 	feedback_add_details("admin_verb","OC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-	return
 
-/client/verb/resetcolorooc()
+/client/proc/resetcolorooc()
 	set name = "Reset Your OOC Color"
-	set desc = "Returns your OOC color to default"
+	set desc = "Returns your OOC color to default."
 	set category = "Preferences"
 
-	if(!check_rights(R_ADMIN,0))
-		if(!is_content_unlocked())	return
+	if(!check_rights(R_ADMIN)) return
 
 	prefs.ooccolor = initial(prefs.ooccolor)
-	prefs.save_preferences()
+	prefs.save_preferences(src)
+	usr << "Your OOC color has been reset."
+	
+	feedback_add_details("admin_verb","ROC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/verb/looc(msg as text)
 	set name = "LOOC" //Gave this shit a shorter name so you only have to time out "ooc" rather than "ooc message" to use it --NeoFite

code/modules/admin/admin_verbs.dm

@@ -16,6 +16,8 @@ var/list/admin_verbs_admin = list(
 	/datum/admins/proc/toggleenter,		/*toggles whether people can join the current game*/
 	/datum/admins/proc/toggleguests,	/*toggles whether guests can join the current game*/
 	/datum/admins/proc/announce,		/*priority announce something to all clients.*/
+	/client/proc/colorooc,				/*allows us to set a custom colour for everything we say in ooc*/
+	/client/proc/resetcolorooc,			/*allows us to set a reset our ooc color*/
 	/client/proc/admin_ghost,			/*allows us to ghost/reenter body at will*/
 	/client/proc/toggle_view_range,		/*changes how far we can see*/
 	/datum/admins/proc/view_txt_log,	/*shows the server log (diary) for today*/

code/modules/client/preferences.dm

@@ -391,7 +391,7 @@ datum/preferences
 						dat += "<b>Adminhelp sound:</b> "
 						dat += "<a href='?_src_=prefs;preference=hear_adminhelps'><b>[(sound & SOUND_ADMINHELP)?"On":"Off"]</b></a><br>"
 
-					if(unlock_content || check_rights(R_ADMIN,0))
+					if(check_rights(R_ADMIN,0))
 						dat += "<b>OOC:</b> <span style='border: 1px solid #161616; background-color: [ooccolor ? ooccolor : normal_ooc_colour];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=ooccolor;task=input'><b>Change</b></a><br>"
 						
 					if(unlock_content)