From 53be5f549ac3588d51d7d4bf4d7971fbe32cb1c8 Mon Sep 17 00:00:00 2001 From: Josh Date: Wed, 15 Apr 2026 00:34:35 +0100 Subject: [PATCH] Allows admins to set individual players a specific OOC colour (#95734) ## About The Pull Request Add the `ooc_colour` var to a `client`. admins can feel free to set it to whatever. It will even override other admins ooc colour preferences! GO be dickheads to each other! ## Why It's Good For The Game Admin freedom is always good. ## Changelog :cl: admin: admins can more freely mess with ooc colours /:cl: Co-authored-by: Josh Powell --- code/modules/client/client_defines.dm | 3 +++ code/modules/client/verbs/ooc.dm | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/code/modules/client/client_defines.dm b/code/modules/client/client_defines.dm index 8a0d6f56d5f..989ff3efa1e 100644 --- a/code/modules/client/client_defines.dm +++ b/code/modules/client/client_defines.dm @@ -255,3 +255,6 @@ /// The DPI scale of the client. 1 is equivalent to 100% window scaling, 2 will be 200% window scaling var/window_scaling + + /// OOC colour of the clients messages. + var/ooc_colour = null diff --git a/code/modules/client/verbs/ooc.dm b/code/modules/client/verbs/ooc.dm index 9ba52e3a6a6..b1a95e81c2b 100644 --- a/code/modules/client/verbs/ooc.dm +++ b/code/modules/client/verbs/ooc.dm @@ -96,7 +96,7 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8") if(holder) if(!holder.fakekey || receiver.holder) if(check_rights_for(src, R_ADMIN)) - var/ooc_color = prefs.read_preference(/datum/preference/color/ooc_color) + var/ooc_color = ooc_colour ? ooc_colour : prefs.read_preference(/datum/preference/color/ooc_color) to_chat(receiver, span_adminooc("[CONFIG_GET(flag/allow_admin_ooccolor) && ooc_color ? "" :"" ][span_prefix("OOC:")] [keyname][holder.fakekey ? "/([holder.fakekey])" : ""]: [msg]"), avoid_highlighting = avoid_highlight) else to_chat(receiver, span_adminobserverooc(span_prefix("OOC: [keyname][holder.fakekey ? "/([holder.fakekey])" : ""]: [msg]")), avoid_highlighting = avoid_highlight) @@ -107,7 +107,9 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8") to_chat(receiver, span_ooc(span_prefix("OOC: [holder.fakekey ? holder.fakekey : key]: [msg]")), avoid_highlighting = avoid_highlight) else if(!(key in receiver.prefs.ignoring)) - if(GLOB.OOC_COLOR) + if(ooc_colour) + to_chat(receiver, "[span_prefix("OOC:")] [keyname]: [msg]", avoid_highlighting = avoid_highlight) + else if(GLOB.OOC_COLOR) to_chat(receiver, "[span_prefix("OOC:")] [keyname]: [msg]", avoid_highlighting = avoid_highlight) else to_chat(receiver, span_ooc(span_prefix("OOC: [keyname]: [msg]")), avoid_highlighting = avoid_highlight)