From 168e2d13594a8057f073ce8be06bdaba7450a533 Mon Sep 17 00:00:00 2001 From: blackdragonTOW <31581761+blackdragonTOW@users.noreply.github.com> Date: Thu, 10 Aug 2023 03:14:10 -0700 Subject: [PATCH 01/15] Update chat-dark.scss --- tgui/packages/tgui-panel/styles/goon/chat-dark.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tgui/packages/tgui-panel/styles/goon/chat-dark.scss b/tgui/packages/tgui-panel/styles/goon/chat-dark.scss index 28a5639e884d..2fe735f84d87 100644 --- a/tgui/packages/tgui-panel/styles/goon/chat-dark.scss +++ b/tgui/packages/tgui-panel/styles/goon/chat-dark.scss @@ -281,7 +281,7 @@ em { } .adminsay { - color: #9611d4; + color: #7c440c; font-weight: bold; } From 2f03a384ba284b33fc1e801a1898076f8240b293 Mon Sep 17 00:00:00 2001 From: blackdragonTOW <31581761+blackdragonTOW@users.noreply.github.com> Date: Thu, 10 Aug 2023 03:33:22 -0700 Subject: [PATCH 02/15] Update chat-light.scss fine, lightmode can come too --- tgui/packages/tgui-panel/styles/goon/chat-light.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tgui/packages/tgui-panel/styles/goon/chat-light.scss b/tgui/packages/tgui-panel/styles/goon/chat-light.scss index adbb56ed9b89..afd833382d9c 100644 --- a/tgui/packages/tgui-panel/styles/goon/chat-light.scss +++ b/tgui/packages/tgui-panel/styles/goon/chat-light.scss @@ -299,7 +299,7 @@ em { } .adminsay { - color: #ff4500; + color: #7c440c; font-weight: bold; } From 04862817bb0261a91ce3e2a9ea8499725b8759a6 Mon Sep 17 00:00:00 2001 From: blackdragonTOW <31581761+blackdragonTOW@users.noreply.github.com> Date: Thu, 10 Aug 2023 03:39:11 -0700 Subject: [PATCH 03/15] Update chat-light.scss --- tgui/packages/tgui-panel/styles/goon/chat-light.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tgui/packages/tgui-panel/styles/goon/chat-light.scss b/tgui/packages/tgui-panel/styles/goon/chat-light.scss index afd833382d9c..e4d3098e18de 100644 --- a/tgui/packages/tgui-panel/styles/goon/chat-light.scss +++ b/tgui/packages/tgui-panel/styles/goon/chat-light.scss @@ -947,7 +947,7 @@ h2.alert { } .headminsay { - color: #5a0a7f; + color: #4A2807; font-weight: bold; } From 599feca94fd9c61c0280f06e90d012b518973246 Mon Sep 17 00:00:00 2001 From: blackdragonTOW <31581761+blackdragonTOW@users.noreply.github.com> Date: Thu, 10 Aug 2023 03:39:31 -0700 Subject: [PATCH 04/15] Update chat-dark.scss --- tgui/packages/tgui-panel/styles/goon/chat-dark.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tgui/packages/tgui-panel/styles/goon/chat-dark.scss b/tgui/packages/tgui-panel/styles/goon/chat-dark.scss index 2fe735f84d87..98430d7b764d 100644 --- a/tgui/packages/tgui-panel/styles/goon/chat-dark.scss +++ b/tgui/packages/tgui-panel/styles/goon/chat-dark.scss @@ -911,7 +911,7 @@ em { } .headminsay { - color: #653d78; + color: #4A2807; font-weight: bold; } From 22a62bc5fd381daa870c82144736bc43a291cc66 Mon Sep 17 00:00:00 2001 From: blackdragonTOW <31581761+blackdragonTOW@users.noreply.github.com> Date: Thu, 10 Aug 2023 03:44:38 -0700 Subject: [PATCH 05/15] Update chat-dark.scss this fucking code style and capitalization even when color HEX codes are involved... --- tgui/packages/tgui-panel/styles/goon/chat-dark.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tgui/packages/tgui-panel/styles/goon/chat-dark.scss b/tgui/packages/tgui-panel/styles/goon/chat-dark.scss index 98430d7b764d..e8c5986196bd 100644 --- a/tgui/packages/tgui-panel/styles/goon/chat-dark.scss +++ b/tgui/packages/tgui-panel/styles/goon/chat-dark.scss @@ -911,7 +911,7 @@ em { } .headminsay { - color: #4A2807; + color: #4a2807; font-weight: bold; } From e50c2aa761e940de5b93f393bf16d4c70ffa414d Mon Sep 17 00:00:00 2001 From: blackdragonTOW <31581761+blackdragonTOW@users.noreply.github.com> Date: Thu, 10 Aug 2023 03:45:03 -0700 Subject: [PATCH 06/15] Update chat-light.scss big A, small A what's the diff honestly --- tgui/packages/tgui-panel/styles/goon/chat-light.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tgui/packages/tgui-panel/styles/goon/chat-light.scss b/tgui/packages/tgui-panel/styles/goon/chat-light.scss index e4d3098e18de..30f1a4b234a8 100644 --- a/tgui/packages/tgui-panel/styles/goon/chat-light.scss +++ b/tgui/packages/tgui-panel/styles/goon/chat-light.scss @@ -947,7 +947,7 @@ h2.alert { } .headminsay { - color: #4A2807; + color: #4a2807; font-weight: bold; } From 20a81508fafd8cc2d2fa153dc7c1e569cbd9a30d Mon Sep 17 00:00:00 2001 From: blackdragonTOW <31581761+blackdragonTOW@users.noreply.github.com> Date: Thu, 10 Aug 2023 12:39:45 -0700 Subject: [PATCH 07/15] Update chat-dark.scss --- tgui/packages/tgui-panel/styles/goon/chat-dark.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tgui/packages/tgui-panel/styles/goon/chat-dark.scss b/tgui/packages/tgui-panel/styles/goon/chat-dark.scss index e8c5986196bd..2fe735f84d87 100644 --- a/tgui/packages/tgui-panel/styles/goon/chat-dark.scss +++ b/tgui/packages/tgui-panel/styles/goon/chat-dark.scss @@ -911,7 +911,7 @@ em { } .headminsay { - color: #4a2807; + color: #653d78; font-weight: bold; } From 7430cbae041c5674eaab9ba611048de60bbe4339 Mon Sep 17 00:00:00 2001 From: blackdragonTOW <31581761+blackdragonTOW@users.noreply.github.com> Date: Thu, 10 Aug 2023 12:40:15 -0700 Subject: [PATCH 08/15] Update chat-light.scss --- tgui/packages/tgui-panel/styles/goon/chat-light.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tgui/packages/tgui-panel/styles/goon/chat-light.scss b/tgui/packages/tgui-panel/styles/goon/chat-light.scss index 30f1a4b234a8..afd833382d9c 100644 --- a/tgui/packages/tgui-panel/styles/goon/chat-light.scss +++ b/tgui/packages/tgui-panel/styles/goon/chat-light.scss @@ -947,7 +947,7 @@ h2.alert { } .headminsay { - color: #4a2807; + color: #5a0a7f; font-weight: bold; } From 4bd53f2f32ffc8fe0519945c9f0fe7e650072fca Mon Sep 17 00:00:00 2001 From: blackdragonTOW <31581761+blackdragonTOW@users.noreply.github.com> Date: Thu, 10 Aug 2023 14:10:45 -0700 Subject: [PATCH 09/15] Update chat-dark.scss --- tgui/packages/tgui-panel/styles/goon/chat-dark.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tgui/packages/tgui-panel/styles/goon/chat-dark.scss b/tgui/packages/tgui-panel/styles/goon/chat-dark.scss index 2fe735f84d87..28a5639e884d 100644 --- a/tgui/packages/tgui-panel/styles/goon/chat-dark.scss +++ b/tgui/packages/tgui-panel/styles/goon/chat-dark.scss @@ -281,7 +281,7 @@ em { } .adminsay { - color: #7c440c; + color: #9611d4; font-weight: bold; } From dd3e783706f65e1e4354d8cbc7fba09bd213e307 Mon Sep 17 00:00:00 2001 From: blackdragonTOW <31581761+blackdragonTOW@users.noreply.github.com> Date: Thu, 10 Aug 2023 14:11:04 -0700 Subject: [PATCH 10/15] Update chat-light.scss --- tgui/packages/tgui-panel/styles/goon/chat-light.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tgui/packages/tgui-panel/styles/goon/chat-light.scss b/tgui/packages/tgui-panel/styles/goon/chat-light.scss index afd833382d9c..adbb56ed9b89 100644 --- a/tgui/packages/tgui-panel/styles/goon/chat-light.scss +++ b/tgui/packages/tgui-panel/styles/goon/chat-light.scss @@ -299,7 +299,7 @@ em { } .adminsay { - color: #7c440c; + color: #ff4500; font-weight: bold; } From 22171b696adc11b4320d1ed456290bcf6b1c27fe Mon Sep 17 00:00:00 2001 From: blackdragonTOW <31581761+blackdragonTOW@users.noreply.github.com> Date: Thu, 10 Aug 2023 14:12:29 -0700 Subject: [PATCH 11/15] Update admin_tab.dm --- code/modules/admin/tabs/admin_tab.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/admin/tabs/admin_tab.dm b/code/modules/admin/tabs/admin_tab.dm index 6dc08c63e5de..e0050b6c5f05 100644 --- a/code/modules/admin/tabs/admin_tab.dm +++ b/code/modules/admin/tabs/admin_tab.dm @@ -255,9 +255,9 @@ log_adminpm("ADMIN: [key_name(src)] : [msg]") - var/color = "adminsay" + var/color = "mod" if(ishost(usr)) - color = "headminsay" + color = "adminmod" var/channel = "ADMIN:" channel = "[admin_holder.rank]:" From de2d380f40f9e5fbb437e56732bf08f4bd5084a5 Mon Sep 17 00:00:00 2001 From: forest2001 <41653574+realforest2001@users.noreply.github.com> Date: Thu, 10 Aug 2023 23:04:55 +0100 Subject: [PATCH 12/15] Update code/modules/admin/tabs/admin_tab.dm --- code/modules/admin/tabs/admin_tab.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/admin/tabs/admin_tab.dm b/code/modules/admin/tabs/admin_tab.dm index e0050b6c5f05..abcc3fcc87f3 100644 --- a/code/modules/admin/tabs/admin_tab.dm +++ b/code/modules/admin/tabs/admin_tab.dm @@ -256,7 +256,7 @@ log_adminpm("ADMIN: [key_name(src)] : [msg]") var/color = "mod" - if(ishost(usr)) + if(check_rights(R_PERMISSIONS)) color = "adminmod" var/channel = "ADMIN:" From d9b0896ea2803c0fcc26745f96c4faf99c275a13 Mon Sep 17 00:00:00 2001 From: harryob <55142896+harryob@users.noreply.github.com> Date: Fri, 11 Aug 2023 09:44:12 +0100 Subject: [PATCH 13/15] tgui say should be the same color too --- tgui/packages/tgui-say/styles/colors.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tgui/packages/tgui-say/styles/colors.scss b/tgui/packages/tgui-say/styles/colors.scss index e0abb717edf3..318cd481f7ab 100644 --- a/tgui/packages/tgui-say/styles/colors.scss +++ b/tgui/packages/tgui-say/styles/colors.scss @@ -15,7 +15,7 @@ $me: #5975da; $ooc: #1c52f5; $looc: #e362b4; $mentor: #b5850d; -$asay: #9611d4; +$asay: #74471b; //////////////////////////////////////////////// // Subchannel chat colors From 0d899d0fd063d23098bc1a1d6e2516fe0e2d7979 Mon Sep 17 00:00:00 2001 From: blackdragonTOW <31581761+blackdragonTOW@users.noreply.github.com> Date: Fri, 11 Aug 2023 10:51:47 -0700 Subject: [PATCH 14/15] Update code/modules/admin/tabs/admin_tab.dm Co-authored-by: harryob --- code/modules/admin/tabs/admin_tab.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/admin/tabs/admin_tab.dm b/code/modules/admin/tabs/admin_tab.dm index abcc3fcc87f3..1298d6150036 100644 --- a/code/modules/admin/tabs/admin_tab.dm +++ b/code/modules/admin/tabs/admin_tab.dm @@ -256,7 +256,7 @@ log_adminpm("ADMIN: [key_name(src)] : [msg]") var/color = "mod" - if(check_rights(R_PERMISSIONS)) + if(check_rights(R_PERMISSIONS, show_msg = FALSE)) color = "adminmod" var/channel = "ADMIN:" From 0a94e86dd121ba840672b8a624ecdc0169626d13 Mon Sep 17 00:00:00 2001 From: harryob <55142896+harryob@users.noreply.github.com> Date: Sat, 12 Aug 2023 22:41:09 +0100 Subject: [PATCH 15/15] mods should be able to see this and it should be the correct color --- code/datums/redis/callbacks/asay.dm | 4 ++-- code/span_macros.dm | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/datums/redis/callbacks/asay.dm b/code/datums/redis/callbacks/asay.dm index 2ccbca08fb6c..1d994f75b447 100644 --- a/code/datums/redis/callbacks/asay.dm +++ b/code/datums/redis/callbacks/asay.dm @@ -7,10 +7,10 @@ if(data["source"] == SSredis.instance_name) return - var/msg = SPAN_ADMINSAY("[data["rank"]]: [data["author"]]@[data["source"]]: [strip_html(data["message"])]") + var/msg = SPAN_MOD("[data["rank"]]: [data["author"]]@[data["source"]]: [strip_html(data["message"])]") for(var/client/client in GLOB.admins) - if(!(R_ADMIN & client.admin_holder.rights)) + if(!(R_MOD|R_ADMIN & client.admin_holder.rights)) continue to_chat(client, msg) diff --git a/code/span_macros.dm b/code/span_macros.dm index 1eca82ea563f..77e57f2077a0 100644 --- a/code/span_macros.dm +++ b/code/span_macros.dm @@ -46,6 +46,7 @@ #define SPAN_ADMIN(X) "[X]" #define SPAN_ADMINHELP(X) ("" + X + "") #define SPAN_ADMINSAY(str) ("" + str + "") +#define SPAN_MOD(str) ("" + str + "") #define SPAN_MENTORHELP(X) ("" + X + "") #define SPAN_MENTORSAY(X) ("" + X + "") #define SPAN_MENTORBODY(X) ("" + X + "")