From 5568476574aca11c0150dddd11bd4e89c3d81c5d Mon Sep 17 00:00:00 2001 From: Contrabang <91113370+Contrabang@users.noreply.github.com> Date: Sat, 14 Dec 2024 14:10:16 -0500 Subject: [PATCH] Fixes some messages showing up in the Unsorted Chat Tab (#27614) * Fixes some messages showing up in the Unsorted Chat Tab * yes * yes * Apply suggestions from code review Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Signed-off-by: Contrabang <91113370+Contrabang@users.noreply.github.com> --------- Signed-off-by: Contrabang <91113370+Contrabang@users.noreply.github.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> --- code/controllers/subsystem/SSghost_spawns.dm | 2 +- code/modules/admin/misc_admin_procs.dm | 4 ++-- code/modules/admin/verbs/pray.dm | 8 ++++---- code/modules/mob/mob_misc_procs.dm | 2 +- code/modules/paperwork/faxmachine.dm | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/code/controllers/subsystem/SSghost_spawns.dm b/code/controllers/subsystem/SSghost_spawns.dm index 815268c3b34..9815d413f56 100644 --- a/code/controllers/subsystem/SSghost_spawns.dm +++ b/code/controllers/subsystem/SSghost_spawns.dm @@ -132,7 +132,7 @@ SUBSYSTEM_DEF(ghost_spawns) if(isatom(source)) act_jump = "\[Teleport]" var/act_signup = "\[Sign Up]" - to_chat(M, "Now looking for candidates [role ? "to play as \an [role_cleanname || get_roletext(role)]" : "\"[question]\""]. [act_jump] [act_signup] [reason ? "\nReason: [sanitize(reason)]" : ""]") + to_chat(M, "Now looking for candidates [role ? "to play as \an [role_cleanname || get_roletext(role)]" : "\"[question]\""]. [act_jump] [act_signup] [reason ? "\nReason: [sanitize(reason)]" : ""]", MESSAGE_TYPE_DEADCHAT) // Start processing it so it updates visually the timer START_PROCESSING(SSprocessing, A) diff --git a/code/modules/admin/misc_admin_procs.dm b/code/modules/admin/misc_admin_procs.dm index 7e2d33e1581..afec64f2619 100644 --- a/code/modules/admin/misc_admin_procs.dm +++ b/code/modules/admin/misc_admin_procs.dm @@ -473,9 +473,9 @@ GLOBAL_VAR_INIT(disable_explosions, FALSE) GLOB.dsay_enabled = !(GLOB.dsay_enabled) if(GLOB.dsay_enabled) - to_chat(world, "Deadchat has been globally enabled!") + to_chat(world, "Deadchat has been globally enabled!", MESSAGE_TYPE_DEADCHAT) else - to_chat(world, "Deadchat has been globally disabled!") + to_chat(world, "Deadchat has been globally disabled!", MESSAGE_TYPE_DEADCHAT) log_admin("[key_name(usr)] toggled deadchat.") message_admins("[key_name_admin(usr)] toggled deadchat.", 1) SSblackbox.record_feedback("tally", "admin_verb", 1, "Toggle Deadchat") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm index 1c1cb0965b6..5a9e9990f33 100644 --- a/code/modules/admin/verbs/pray.dm +++ b/code/modules/admin/verbs/pray.dm @@ -46,7 +46,7 @@ msg = "CENTCOMM: [key_name(Sender, 1)] ([ADMIN_PP(Sender,"PP")]) ([ADMIN_VV(Sender,"VV")]) ([ADMIN_TP(Sender,"TP")]) ([ADMIN_SM(Sender,"SM")]) ([admin_jump_link(Sender)]) ([ADMIN_BSA(Sender,"BSA")]) ([ADMIN_CENTCOM_REPLY(Sender,"RPLY")])): [msg]" for(var/client/X in GLOB.admins) if(R_EVENT & X.holder.rights) - to_chat(X, msg) + to_chat(X, msg, MESSAGE_TYPE_ADMINPM) if(X.prefs.sound & SOUND_ADMINHELP) SEND_SOUND(X, sound('sound/effects/adminhelp.ogg')) @@ -55,7 +55,7 @@ msg = "SYNDICATE: [key_name(Sender, 1)] ([ADMIN_PP(Sender,"PP")]) ([ADMIN_VV(Sender,"VV")]) ([ADMIN_TP(Sender,"TP")]) ([ADMIN_SM(Sender,"SM")]) ([admin_jump_link(Sender)]) ([ADMIN_BSA(Sender,"BSA")]) ([ADMIN_SYNDICATE_REPLY(Sender,"RPLY")]): [msg]" for(var/client/X in GLOB.admins) if(check_rights(R_EVENT,0,X.mob)) - to_chat(X, msg) + to_chat(X, msg, MESSAGE_TYPE_ADMINPM) if(X.prefs.sound & SOUND_ADMINHELP) SEND_SOUND(X, sound('sound/effects/adminhelp.ogg')) @@ -72,7 +72,7 @@ msg += "
WARNING: ERT request has gone 5 minutes with no reply!" for(var/client/X in GLOB.admins) if(check_rights(R_EVENT,0,X.mob)) - to_chat(X, msg) + to_chat(X, msg, MESSAGE_TYPE_ADMINPM) if(X.prefs.sound & SOUND_ADMINHELP) SEND_SOUND(X, sound('sound/effects/adminhelp.ogg')) @@ -83,7 +83,7 @@ msg = "NUKE CODE REQUEST: [key_name(Sender)] ([ADMIN_PP(Sender,"PP")]) ([ADMIN_VV(Sender,"VV")]) ([ADMIN_TP(Sender,"TP")]) ([ADMIN_SM(Sender,"SM")]) ([admin_jump_link(Sender)]) ([ADMIN_BSA(Sender,"BSA")]) ([ADMIN_CENTCOM_REPLY(Sender,"RPLY")]): [msg]" for(var/client/X in GLOB.admins) if(check_rights(R_EVENT,0,X.mob)) - to_chat(X, msg) + to_chat(X, msg, MESSAGE_TYPE_ADMINPM) if(nuke_status == NUKE_MISSING) to_chat(X, "The nuclear device is not on station!") else diff --git a/code/modules/mob/mob_misc_procs.dm b/code/modules/mob/mob_misc_procs.dm index 9412c112aac..b3813704f36 100644 --- a/code/modules/mob/mob_misc_procs.dm +++ b/code/modules/mob/mob_misc_procs.dm @@ -566,7 +566,7 @@ /proc/notify_ghosts(message, ghost_sound = null, enter_link = null, title = null, atom/source = null, image/alert_overlay = null, flashwindow = TRUE, action = NOTIFY_JUMP, role = null) //Easy notification of ghosts. for(var/mob/O in GLOB.player_list) if(O.client && HAS_TRAIT(O, TRAIT_RESPAWNABLE) && (!role || (role in O.client.prefs.be_special))) - to_chat(O, "[message][(enter_link) ? " [enter_link]" : ""]") + to_chat(O, "[message][(enter_link) ? " [enter_link]" : ""]", MESSAGE_TYPE_DEADCHAT) if(ghost_sound) SEND_SOUND(O, sound(ghost_sound)) if(flashwindow) diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index bcf5c8118a8..c2aa0c5330e 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -416,7 +416,7 @@ GLOBAL_LIST_EMPTY(fax_blacklist) var/fax_sound = sound('sound/effects/adminhelp.ogg') for(var/client/C in GLOB.admins) if(check_rights(R_EVENT, 0, C.mob)) - to_chat(C, msg) + to_chat(C, msg, MESSAGE_TYPE_ADMINPM) if(C.prefs.sound & SOUND_ADMINHELP) SEND_SOUND(C, fax_sound)