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

Prayer and USCM message visibility tweaks #5046

Merged
merged 4 commits into from
Dec 4, 2023
Merged

Prayer and USCM message visibility tweaks #5046

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2336b8f
initial
silencer-pl Nov 27, 2023
a00f751
Update code/modules/admin/verbs/pray.dm
silencer-pl Nov 27, 2023
9018e36
Update code/modules/admin/verbs/pray.dm
silencer-pl Nov 27, 2023
cfd6c67
Update code/modules/admin/verbs/pray.dm
silencer-pl Nov 27, 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
7 changes: 4 additions & 3 deletions code/modules/admin/verbs/pray.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,22 @@
liaison = 1

if(liaison)
msg = SPAN_STAFF_IC("<b><font color=purple>LIAISON: </font>[key_name(src, 1)] [CC_MARK(src)] [ADMIN_PP(src)] [ADMIN_VV(src)] [ADMIN_SM(src)] [ADMIN_JMP_USER(src)] [ADMIN_SC(src)]:</b> [msg]")
msg = "<b><big>[SPAN_STAFF_IC("<font color=purple>LIAISON:</font>")][key_name(src, 1)] [CC_MARK(src)] [ADMIN_PP(src)] [ADMIN_VV(src)] [ADMIN_SM(src)] [ADMIN_JMP_USER(src)] [ADMIN_SC(src)]: [msg]</b></big>"
silencer-pl marked this conversation as resolved.
Show resolved Hide resolved
else
msg = SPAN_STAFF_IC("<b><font color=purple>PRAY: </font>[key_name(src, 1)] [CC_MARK(src)] [ADMIN_PP(src)] [ADMIN_VV(src)] [ADMIN_SM(src)] [ADMIN_JMP_USER(src)] [ADMIN_SC(src)]:</b> [msg]")
msg = "<b><big>[SPAN_STAFF_IC("<font color=purple>PRAY: </font>")][key_name(src, 1)] [CC_MARK(src)] [ADMIN_PP(src)] [ADMIN_VV(src)] [ADMIN_SM(src)] [ADMIN_JMP_USER(src)] [ADMIN_SC(src)]: [msg]</b></big>"
silencer-pl marked this conversation as resolved.
Show resolved Hide resolved
log_admin(msg)
for(var/client/C in GLOB.admins)
if(AHOLD_IS_MOD(C.admin_holder) && C.prefs.toggles_chat & CHAT_PRAYER)
to_chat(C, msg)
C << 'sound/machines/terminal_alert.ogg'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does that work without the sound() ?

Copy link
Contributor Author

@silencer-pl silencer-pl Dec 1, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it does. The USCM message does the same thing below and it also plays the sound.

Or well at least did when I tested it the few days ago before putting it up, I dont think anything has changed in how sounds are handled. I def tested, multiple times, because I wanted to be sure the sound isn't too jarring or annoying to prevent it being ignored or muted ;P

if(liaison)
to_chat(usr, "Your corporate overlords at Weyland-Yutani have received your message.")
else
to_chat(usr, "Your prayers have been received by the gods.")

/proc/high_command_announce(text , mob/Sender , iamessage)
var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN)
msg = "<b>[SPAN_STAFF_IC("<font color=orange>USCM[iamessage ? "IA" : ""]:</font>")][key_name(Sender, 1)] [CC_MARK(Sender)] [ADMIN_PP(Sender)] [ADMIN_VV(Sender)] [ADMIN_SM(Sender)] [ADMIN_JMP_USER(Sender)] [CC_REPLY(Sender)]:</b> [msg]"
msg = "<b><big>[SPAN_STAFF_IC("<font color=orange>USCM[iamessage ? "IA" : ""]:</font>")][key_name(Sender, 1)] [CC_MARK(Sender)] [ADMIN_PP(Sender)] [ADMIN_VV(Sender)] [ADMIN_SM(Sender)] [ADMIN_JMP_USER(Sender)] [CC_REPLY(Sender)]: [msg]</b></big>"
silencer-pl marked this conversation as resolved.
Show resolved Hide resolved
log_admin(msg)
for(var/client/C in GLOB.admins)
if((R_ADMIN|R_MOD) & C.admin_holder.rights)
Expand Down
Loading