From 15c5459e4b3238c78bdf37bcc21d6aad4d033752 Mon Sep 17 00:00:00 2001
From: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Date: Tue, 14 Nov 2023 14:51:59 -0600
Subject: [PATCH 1/2] Hallucinations don't print to newscasters (#79711)

## About The Pull Request

Fixes #79709

I thought it was clever to use `priority_announce` for the
hallucinations, as means for maintaining parity, unfortunately the proc
is not pure and prints reports to the newscasters. Oopsie.

This makes it so only reports sent to all players are printed to
newscasters.

## Changelog

:cl: Melbert
fix: Fixes hallucination and encrypted announcements printing to the
Newscaster.
/:cl:
---
 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 7d716e5eaf6..f36ab36becb 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 + "<br><br>" + 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)
 	var/sound_to_play = !isnull(sound_override) ? sound_override : 'sound/misc/notice2.ogg'
 
 	for(var/mob/target in players)

From d56121ad63baf3c63dd545149626fff40188131c Mon Sep 17 00:00:00 2001
From: NaakaKo <naakako+github@pm.me>
Date: Tue, 14 Nov 2023 20:52:52 +0000
Subject: [PATCH 2/2] (upstream PR 79711)