From fc3a949b73acbfe895827140aa0b208f2dd229e1 Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed, 15 Nov 2023 00:40:31 +0100
Subject: [PATCH] [MIRROR] Hallucinations don't print to newscasters [MDB
IGNORE] (#25011)
* Hallucinations don't print to newscasters
* Update priority_announce.dm
---------
Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: Giz <13398309+vinylspiders@users.noreply.github.com>
---
code/__HELPERS/priority_announce.dm | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/code/__HELPERS/priority_announce.dm b/code/__HELPERS/priority_announce.dm
index 72d6aa0597c..d675b252796 100644
--- a/code/__HELPERS/priority_announce.dm
+++ b/code/__HELPERS/priority_announce.dm
@@ -37,7 +37,7 @@
* * encode_title - if TRUE, the title will be HTML encoded
* * encode_text - if TRUE, the text will be HTML encoded
*/
-/proc/priority_announce(text, title = "", sound, type, sender_override, has_important_message = FALSE, list/mob/players, encode_title = TRUE, encode_text = TRUE, color_override)
+/proc/priority_announce(text, title = "", sound, type, sender_override, has_important_message = FALSE, list/mob/players = GLOB.player_list, encode_title = TRUE, encode_text = TRUE, color_override)
if(!text)
return
@@ -85,7 +85,7 @@
dispatch_announcement_to_players(finalized_announcement, players, sound)
- if(isnull(sender_override))
+ if(isnull(sender_override) && players == GLOB.player_list)
if(length(title) > 0)
GLOB.news_network.submit_article(title + "
" + text, "[command_name()]", "Station Announcements", null)
else
@@ -185,10 +185,7 @@
return jointext(returnable_strings, "")
/// Proc that just dispatches the announcement to our applicable audience. Only the announcement is a mandatory arg.
-/proc/dispatch_announcement_to_players(announcement, list/players, sound_override = null, should_play_sound = TRUE)
- if(!players)
- players = GLOB.player_list
-
+/proc/dispatch_announcement_to_players(announcement, list/players = GLOB.player_list, sound_override = null, should_play_sound = TRUE)
// SKYRAT EDIT CHANGE BEGIN - CUSTOM ANNOUNCEMENTS
/* Original: