Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 17 commits into from
Aug 12, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
168e2d1
Update chat-dark.scss
blackdragonTOW Aug 10, 2023
2f03a38
Update chat-light.scss
blackdragonTOW Aug 10, 2023
0486281
Update chat-light.scss
blackdragonTOW Aug 10, 2023
599feca
Update chat-dark.scss
blackdragonTOW Aug 10, 2023
22a62bc
Update chat-dark.scss
blackdragonTOW Aug 10, 2023
e50c2aa
Update chat-light.scss
blackdragonTOW Aug 10, 2023
39df172
Merge branch 'cmss13-devs:master' into master
blackdragonTOW Aug 10, 2023
20a8150
Update chat-dark.scss
blackdragonTOW Aug 10, 2023
7430cba
Update chat-light.scss
blackdragonTOW Aug 10, 2023
4bd53f2
Update chat-dark.scss
blackdragonTOW Aug 10, 2023
dd3e783
Update chat-light.scss
blackdragonTOW Aug 10, 2023
22171b6
Update admin_tab.dm
blackdragonTOW Aug 10, 2023
de2d380
Update code/modules/admin/tabs/admin_tab.dm
realforest2001 Aug 10, 2023
d9b0896
tgui say should be the same color too
harryob Aug 11, 2023
0d899d0
Update code/modules/admin/tabs/admin_tab.dm
blackdragonTOW Aug 11, 2023
2ce6399
Merge branch 'master' into master
blackdragonTOW Aug 11, 2023
0a94e86
mods should be able to see this and it should be the correct color
harryob Aug 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions code/datums/redis/callbacks/asay.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
6 changes: 3 additions & 3 deletions code/modules/admin/tabs/admin_tab.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]:"
Expand Down
1 change: 1 addition & 0 deletions code/span_macros.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>")
Expand Down
2 changes: 1 addition & 1 deletion tgui/packages/tgui-say/styles/colors.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ $me: #5975da;
$ooc: #1c52f5;
$looc: #e362b4;
$mentor: #b5850d;
$asay: #9611d4;
$asay: #74471b;

////////////////////////////////////////////////
// Subchannel chat colors
Expand Down