Alters ASay chat color back to the old MSay color (#4151)

Changing Asay back to the Msay color that many were used to for a very long time. # Explain why it's good for the game Because this color doesn't blend in with other major chat colors (such as dsay, and others), and it reminds us of simpler times. # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags. </details> # Changelog :cl: admin: Adjustment of ASay color /:cl: --------- Co-authored-by: forest2001 <[email protected]> Co-authored-by: harryob <[email protected]> Co-authored-by: harryob <[email protected]>
cmss13-devs · Aug 12, 2023 · 5d2305b · 5d2305b
1 parent 2470ea7
commit 5d2305b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git 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("<span class='prefix'>[data["rank"]]:</span> <EM>[data["author"]]@[data["source"]]</EM>: <span class='message'>[strip_html(data["message"])]</span>")
+	var/msg = SPAN_MOD("<span class='prefix'>[data["rank"]]:</span> <EM>[data["author"]]@[data["source"]]</EM>: <span class='message'>[strip_html(data["message"])]</span>")
 
 	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/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"
-	if(ishost(usr))
-		color = "headminsay"
+	var/color = "mod"
+	if(check_rights(R_PERMISSIONS, show_msg = FALSE))
+		color = "adminmod"
 
 	var/channel = "ADMIN:"
 	channel = "[admin_holder.rank]:"

diff --git a/code/span_macros.dm b/code/span_macros.dm
@@ -46,6 +46,7 @@
 #define SPAN_ADMIN(X) "<span class='admin'>[X]</span>"
 #define SPAN_ADMINHELP(X) ("<span class='adminhelp'>" + X + "</span>")
 #define SPAN_ADMINSAY(str) ("<span class='adminsay'>" + str + "</span>")
+#define SPAN_MOD(str) ("<span class='mod'>" + str + "</span>")
 #define SPAN_MENTORHELP(X) ("<span class='mentorhelp'>" + X + "</span>")
 #define SPAN_MENTORSAY(X) ("<span class='mentorsay'>" + X + "</span>")
 #define SPAN_MENTORBODY(X) ("<span class='mentorbody'>" + X + "</span>")

diff --git 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