Skip to content

Commit

Permalink
and this too
Browse files Browse the repository at this point in the history
  • Loading branch information
morrowwolf committed Nov 1, 2023
1 parent d8aa9ff commit 499c8dd
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 18 deletions.
15 changes: 0 additions & 15 deletions code/controllers/configuration/entries/general.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/game/verbs/ooc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion code/modules/client/preferences.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion code/modules/client/preferences_savefile.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 499c8dd

Please sign in to comment.