diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm index 790021ee0d5..d579fdae11d 100644 --- a/code/game/verbs/ooc.dm +++ b/code/game/verbs/ooc.dm @@ -41,7 +41,7 @@ var/keyname = key if(prefs.unlock_content) if(prefs.toggles & MEMBER_PUBLIC) - keyname = "[keyname]" + keyname = "[keyname]" msg = emoji_parse(msg) @@ -50,7 +50,7 @@ if(holder) if(!holder.fakekey || C.holder) if(check_rights_for(src, R_ADMIN)) - C << "OOC: [keyname][holder.fakekey ? "/([holder.fakekey])" : ""]: [msg]" + C << "OOC: [keyname][holder.fakekey ? "/([holder.fakekey])" : ""]: [msg]" else C << "OOC: [keyname][holder.fakekey ? "/([holder.fakekey])" : ""]: [msg]" else @@ -77,6 +77,12 @@ var/global/normal_ooc_colour = "#002eb8" set category = "Fun" normal_ooc_colour = sanitize_ooccolor(newColor) +/client/proc/reset_ooc() + set name = "Reset Player OOC Color" + set desc = "Returns player OOC Color to default" + set category = "Fun" + normal_ooc_colour = initial(normal_ooc_colour) + /client/verb/colorooc() set name = "Set Your OOC Color" set category = "Preferences" @@ -91,6 +97,17 @@ var/global/normal_ooc_colour = "#002eb8" 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() + set name = "Reset Your OOC Color" + set desc = "Returns your OOC Color to default" + set category = "Preferences" + + if(!holder || check_rights_for(src, R_ADMIN)) + if(!is_content_unlocked()) return + + prefs.ooccolor = initial(prefs.ooccolor) + prefs.save_preferences() + //Checks admin notice /client/verb/admin_notice() set name = "Adminnotice" diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index ce9bc361b99..9df8f53e3e9 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -83,6 +83,7 @@ var/list/admin_verbs_fun = list( /client/proc/object_say, /client/proc/toggle_random_events, /client/proc/set_ooc, + /client/proc/reset_ooc, /client/proc/forceEvent, /client/proc/bluespace_artillery ) @@ -136,6 +137,7 @@ var/list/admin_verbs_rejuv = list( //verbs which can be hidden - needs work var/list/admin_verbs_hideable = list( /client/proc/set_ooc, + /client/proc/reset_ooc, /client/proc/deadmin_self, /client/proc/deadchat, /client/proc/toggleprayers, diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 6e567705f15..bd6ac94eb7e 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -35,7 +35,7 @@ datum/preferences //game-preferences var/lastchangelog = "" //Saved changlog filesize to detect if there was a change - var/ooccolor = "#002eb8" + var/ooccolor = null var/be_special = 0 //Special role selection var/UI_style = "Midnight" var/toggles = TOGGLES_DEFAULT @@ -94,7 +94,6 @@ datum/preferences /datum/preferences/New(client/C) blood_type = random_blood_type() - ooccolor = normal_ooc_colour custom_names["ai"] = pick(ai_names) custom_names["cyborg"] = pick(ai_names) custom_names["clown"] = pick(clown_names) @@ -273,7 +272,7 @@ datum/preferences dat += "[(toggles & SOUND_ADMINHELP)?"On":"Off"]
" if(unlock_content || check_rights_for(user.client, R_ADMIN)) - dat += "OOC:     Change
" + dat += "OOC:     Change
" if(unlock_content) dat += "BYOND Membership Publicity: [(toggles & MEMBER_PUBLIC) ? "Public" : "Hidden"]
"