mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-22 20:43:10 +01:00
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.
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user