From 499c8dd978fac8f0b271a57eeb5028995bcf4d5b Mon Sep 17 00:00:00 2001 From: Morrow Date: Wed, 1 Nov 2023 12:30:20 -0400 Subject: [PATCH] and this too --- code/controllers/configuration/entries/general.dm | 15 --------------- code/game/verbs/ooc.dm | 2 +- code/modules/client/preferences.dm | 2 +- code/modules/client/preferences_savefile.dm | 2 +- 4 files changed, 3 insertions(+), 18 deletions(-) diff --git a/code/controllers/configuration/entries/general.dm b/code/controllers/configuration/entries/general.dm index 640eb12ea9..4e0fb9422c 100644 --- a/code/controllers/configuration/entries/general.dm +++ b/code/controllers/configuration/entries/general.dm @@ -144,21 +144,6 @@ Administrative related. /datum/config_entry/string/ooc_color_normal config_entry_value = "#1c52f5" -/datum/config_entry/string/ooc_color_other - config_entry_value = "#2e78d9" - -/datum/config_entry/string/ooc_color_mods - config_entry_value = "#ffbf00" - -/datum/config_entry/string/ooc_color_debug - config_entry_value = "#6bd1b4" - -/datum/config_entry/string/ooc_color_admin - config_entry_value = "#ff8000" - -/datum/config_entry/string/ooc_color_default - config_entry_value = "#b82e00" - /datum/config_entry/flag/usewhitelist /datum/config_entry/flag/usealienwhitelist diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm index 719565852e..1d5ad124b8 100644 --- a/code/game/verbs/ooc.dm +++ b/code/game/verbs/ooc.dm @@ -46,7 +46,7 @@ else if(donator) display_colour = prefs.ooccolor if(!display_colour) // if invalid R_COLOR choice - display_colour = CONFIG_GET(string/ooc_color_default) + display_colour = CONFIG_GET(string/ooc_color_normal) msg = process_chat_markup(msg, list("*")) var/ooc_prefix = handle_ooc_prefix() diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 2e1f8f33f2..7cd33aa67b 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -254,7 +254,7 @@ var/const/MAX_SAVE_SLOTS = 10 if(load_character()) return if(!ooccolor) - ooccolor = CONFIG_GET(string/ooc_color_default) + ooccolor = CONFIG_GET(string/ooc_color_normal) gender = pick(MALE, FEMALE) real_name = random_name(gender) gear = list() diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index c885e9b73a..aa02e580b5 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -208,7 +208,7 @@ S["tooltips"] >> tooltips //Sanitize - ooccolor = sanitize_hexcolor(ooccolor, CONFIG_GET(string/ooc_color_default)) + ooccolor = sanitize_hexcolor(ooccolor, CONFIG_GET(string/ooc_color_normal)) lastchangelog = sanitize_text(lastchangelog, initial(lastchangelog)) UI_style = sanitize_inlist(UI_style, list("white", "dark", "midnight", "orange", "old"), initial(UI_style)) tgui_say = sanitize_integer(tgui_say, FALSE, TRUE, TRUE)