From 883aa972c15771fe5dfed7dd55b2890b312f0b5b Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Wed, 4 Feb 2026 07:12:47 -0500
Subject: [PATCH] Narrate Panel Hotfixes (#21785)

The new Narrate Filters worked great, except that the filters also
stopped the storyteller from seeing their own narrates (Since the
Storyteller's ghost will never be psychic lol). This PR fixes that issue
by making it so that Observers of all types (Including Storytellers) are
always included in a Narrate, regardless of the selected filter.
---
 code/modules/nano/modules/narrate_panel.dm    | 21 ++++++++++++++++++-
 ...ellfirejag-narrate-filter-to-observers.yml |  4 ++++
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 html/changelogs/hellfirejag-narrate-filter-to-observers.yml

diff --git a/code/modules/nano/modules/narrate_panel.dm b/code/modules/nano/modules/narrate_panel.dm
index 6e7ffdd64a4..03bc127bc02 100644
--- a/code/modules/nano/modules/narrate_panel.dm
+++ b/code/modules/nano/modules/narrate_panel.dm
@@ -77,6 +77,10 @@
 		switch(narrate_filter)
 			if ("Skrell-like Psi-sensitives")
 				for(var/mob/filteree in filtered_list)
+					// Keep observers in the list, which includes ghosts, aghosts, and storytellers.
+					if (isghost(filteree))
+						continue
+
 					// This will check for anyone who is capable of receiving and interpreting telepathic messages.
 					// It will include Skrell who don't have a mindshield or the Low Psi-sensitivity trait.
 					// It will also include characters who have Psi-receivers, the High Psi-sensitivity trait, or are under the effects of Psycho-nootropic drugs.
@@ -85,12 +89,20 @@
 						continue
 			if ("Human-like Psi-sensitives")
 				for(var/mob/filteree in filtered_list)
+					// Keep observers in the list, which includes ghosts, aghosts, and storytellers.
+					if (isghost(filteree))
+						continue
+
 					// This will check for anyone who has a Zona Bovina capable of hearing psionics at all.
 					if (IS_TELEPATHY_BLOCKED(filteree, 0))
 						mobs_to_message.Remove(filteree)
 						continue
 			if ("Silicons")
 				for(var/mob/filteree in filtered_list)
+					// Keep observers in the list, which includes ghosts, aghosts, and storytellers.
+					if (isghost(filteree))
+						continue
+
 					// List will include Borgs, Robots, Shipbounds, pAIs, and IPCs.
 					if(issilicon(filteree) || isipc(filteree) || ispAI(filteree))
 						continue
@@ -99,11 +111,14 @@
 					mobs_to_message.Remove(filteree)
 			if ("Silicons + Implants")
 				for(var/mob/filteree in filtered_list)
+					// Keep observers in the list, which includes ghosts, aghosts, and storytellers.
+					if (isghost(filteree))
+						continue
+
 					// List will include Borgs, Robots, Shipbounds, pAIs, and IPCs.
 					if(issilicon(filteree) || isipc(filteree) || ispAI(filteree))
 						continue
 
-
 					if (!ishuman(filteree))
 						// The mob in question can't have a brain at all, filter it early.
 						mobs_to_message.Remove(filteree)
@@ -119,6 +134,10 @@
 					mobs_to_message.Remove(filteree)
 			if ("Hivenet")
 				for(var/mob/filteree in filtered_list)
+					// Keep observers in the list, which includes ghosts, aghosts, and storytellers.
+					if (isghost(filteree))
+						continue
+
 					// Filter anyone who doesn't have the Vaurca language at all.
 					if (!(GLOB.all_languages[LANGUAGE_VAURCA] in filteree.languages))
 						mobs_to_message.Remove(filteree)
diff --git a/html/changelogs/hellfirejag-narrate-filter-to-observers.yml b/html/changelogs/hellfirejag-narrate-filter-to-observers.yml
new file mode 100644
index 00000000000..a0633506e25
--- /dev/null
+++ b/html/changelogs/hellfirejag-narrate-filter-to-observers.yml
@@ -0,0 +1,4 @@
+author: Hellfirejag
+delete-after: True
+changes:
+  - bugfix: "Observers (such as Storytellers) are now always included in Narrates with a filter."