From 80ff8690772288160d90ea38c8762ac89b4fe7eb Mon Sep 17 00:00:00 2001 From: nervere <26285377+nervere@users.noreply.github.com> Date: Tue, 2 Apr 2019 17:51:24 -0400 Subject: [PATCH] Fixes for asay, asay darkmode, and asay when custom asay colors enabled (#43422) About The Pull Request Fixes several annoying and unintentional things about asay. Fixes #43370 Changelog cl Nervere fix: Default color for when custom asay colors is not enabled is now orange, not red. fix: Asay is now properly bolded in lightmode. fix: Asay is now properly bolded in darkmode. tweak: Default color for when custom asay colors is enabled is now orange, not black. /cl closes #43370 --- code/modules/admin/verbs/adminsay.dm | 2 +- code/modules/client/preferences.dm | 2 +- code/modules/goonchat/browserassets/css/browserOutput.css | 2 +- code/modules/goonchat/browserassets/css/browserOutput_white.css | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/admin/verbs/adminsay.dm b/code/modules/admin/verbs/adminsay.dm index 431b89a6e87..ee01ba77242 100644 --- a/code/modules/admin/verbs/adminsay.dm +++ b/code/modules/admin/verbs/adminsay.dm @@ -11,7 +11,7 @@ mob.log_talk(msg, LOG_ASAY) msg = keywords_lookup(msg) - var/custom_asay_color = (CONFIG_GET(flag/allow_admin_asaycolor) && prefs.asaycolor) ? "" : "" + var/custom_asay_color = (CONFIG_GET(flag/allow_admin_asaycolor) && prefs.asaycolor) ? "" : "" msg = "ADMIN: [key_name(usr, 1)] [ADMIN_FLW(mob)]: [custom_asay_color][msg][custom_asay_color ? "":null]" to_chat(GLOB.admins, msg) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 8159bdb2463..7d14656e539 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -15,7 +15,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) //game-preferences var/lastchangelog = "" //Saved changlog filesize to detect if there was a change var/ooccolor = "#c43b23" - var/asaycolor = null + var/asaycolor = "#ff4500" //This won't change the color for current admins, only incoming ones. var/enable_tips = TRUE var/tip_delay = 500 //tip delay in milliseconds diff --git a/code/modules/goonchat/browserassets/css/browserOutput.css b/code/modules/goonchat/browserassets/css/browserOutput.css index 6c258070c21..f79bf982af9 100644 --- a/code/modules/goonchat/browserassets/css/browserOutput.css +++ b/code/modules/goonchat/browserassets/css/browserOutput.css @@ -267,7 +267,7 @@ em {font-style: normal; font-weight: bold;} .adminobserverooc {color: #0099cc; font-weight: bold;} .adminooc {color: #3d5bc3; font-weight: bold;} -.adminsay {color: #ff0000;} +.adminsay {color: #ff4500; font-weight: bold;} .admin {color: #5975da; font-weight: bold;} .name { font-weight: bold;} diff --git a/code/modules/goonchat/browserassets/css/browserOutput_white.css b/code/modules/goonchat/browserassets/css/browserOutput_white.css index 5adc410f62c..cbf1daad751 100644 --- a/code/modules/goonchat/browserassets/css/browserOutput_white.css +++ b/code/modules/goonchat/browserassets/css/browserOutput_white.css @@ -264,7 +264,7 @@ em {font-style: normal; font-weight: bold;} .adminobserverooc {color: #0099cc; font-weight: bold;} .adminooc {color: #700038; font-weight: bold;} -.adminsay {color: #ff0000;} +.adminsay {color: #ff4500; font-weight: bold;} .admin {color: #4473ff; font-weight: bold;} .name { font-weight: bold;}