From 0babfe8098eb29fccdb85005833aeb4d1c81ae86 Mon Sep 17 00:00:00 2001
From: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Date: Mon, 14 Apr 2025 23:31:12 -0400
Subject: [PATCH] Spirit realm ghosts can't observe (#90556)

---
 code/__DEFINES/traits/declarations.dm         |  3 +++
 code/_globalvars/traits/_traits.dm            |  3 +++
 code/modules/antagonists/cult/runes.dm        |  5 +----
 code/modules/mob/dead/observer/observer.dm    |  5 ++++-
 code/modules/mob/dead/observer/orbit.dm       |  1 +
 .../tgui/interfaces/Orbit/OrbitSearchBar.tsx  | 20 ++++++++++---------
 tgui/packages/tgui/interfaces/Orbit/types.ts  |  1 +
 7 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/code/__DEFINES/traits/declarations.dm b/code/__DEFINES/traits/declarations.dm
index 2b820e813eb..080bb3c1df2 100644
--- a/code/__DEFINES/traits/declarations.dm
+++ b/code/__DEFINES/traits/declarations.dm
@@ -1485,6 +1485,9 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 /// Prevents items from being speed potion-ed, but allows their speed to be altered in other ways
 #define TRAIT_NO_SPEED_POTION "no_speed_potion"
 
+/// Prevents observers from being able to observe (seeing their UI and such)
+#define TRAIT_NO_OBSERVE "no_observe"
+
 /// Demolition modifier when hitting this object is inverted (ie, 1 / demolition)
 #define TRAIT_INVERTED_DEMOLITION "demolition_inverted"
 
diff --git a/code/_globalvars/traits/_traits.dm b/code/_globalvars/traits/_traits.dm
index ad79d09dde0..f008779b438 100644
--- a/code/_globalvars/traits/_traits.dm
+++ b/code/_globalvars/traits/_traits.dm
@@ -620,6 +620,9 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_NO_EYELIDS" = TRAIT_NO_EYELIDS,
 		"TRAIT_CRUSHER_MARK_IMMUNE" = TRAIT_CRUSHER_MARK_IMMUNE, // BUBBER EDIT ADDITION
 	),
+	/mob/dead/observer = list(
+		"TRAIT_NO_OBSERVE" = TRAIT_NO_OBSERVE,
+	),
 	/obj/item = list(
 		"TRAIT_APC_SHOCKING" = TRAIT_APC_SHOCKING,
 		"TRAIT_AQUARIUM_CONTENT" = TRAIT_AQUARIUM_CONTENT,
diff --git a/code/modules/antagonists/cult/runes.dm b/code/modules/antagonists/cult/runes.dm
index c35f2477f40..bda737f4912 100644
--- a/code/modules/antagonists/cult/runes.dm
+++ b/code/modules/antagonists/cult/runes.dm
@@ -989,10 +989,6 @@ GLOBAL_VAR_INIT(narsie_summon_count, 0)
 	var/ghost_limit = 3
 	var/ghosts = 0
 
-/obj/effect/rune/manifest/Initialize(mapload)
-	. = ..()
-
-
 /obj/effect/rune/manifest/can_invoke(mob/living/user)
 	if(!(user in get_turf(src)))
 		to_chat(user, span_cult_italic("You must be standing on [src]!"))
@@ -1084,6 +1080,7 @@ GLOBAL_VAR_INIT(narsie_summon_count, 0)
 		affecting.visible_message(span_warning("[affecting] freezes statue-still, glowing an unearthly red."), \
 						span_cult("You see what lies beyond. All is revealed. In this form you find that your voice booms louder and you can mark targets for the entire cult"))
 		var/mob/dead/observer/G = affecting.ghostize(TRUE)
+		ADD_TRAIT(G, TRAIT_NO_OBSERVE, CULT_TRAIT)
 		var/datum/action/innate/cult/comm/spirit/CM = new
 		var/datum/action/innate/cult/ghostmark/GM = new
 		G.name = "Dark Spirit of [G.name]"
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 4520d274b50..ae22ebbdc57 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -920,7 +920,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	set name = "Observe"
 	set category = "Ghost"
 
-	if(!isobserver(usr)) //Make sure they're an observer!
+	if(!isobserver(usr) || HAS_TRAIT(src, TRAIT_NO_OBSERVE)) //Make sure they're an observer!
 		return
 
 	reset_perspective(null)
@@ -959,6 +959,9 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 			this is a bug (and a past exploit) and should be investigated.")
 		return
 
+	if(HAS_TRAIT(src, TRAIT_NO_OBSERVE))
+		return
+
 	//Istype so we filter out points of interest that are not mobs
 	if(client && mob_eye && istype(mob_eye))
 		client.set_eye(mob_eye)
diff --git a/code/modules/mob/dead/observer/orbit.dm b/code/modules/mob/dead/observer/orbit.dm
index d564fd69eb8..4312386b27b 100644
--- a/code/modules/mob/dead/observer/orbit.dm
+++ b/code/modules/mob/dead/observer/orbit.dm
@@ -147,6 +147,7 @@ GLOBAL_DATUM_INIT(orbit_menu, /datum/orbit_menu, new)
 		"ghosts" = ghosts,
 		"misc" = misc,
 		"npcs" = npcs,
+		"can_observe" = !HAS_TRAIT(user, TRAIT_NO_OBSERVE),
 	)
 
 
diff --git a/tgui/packages/tgui/interfaces/Orbit/OrbitSearchBar.tsx b/tgui/packages/tgui/interfaces/Orbit/OrbitSearchBar.tsx
index d4663b63781..7f52bd58821 100644
--- a/tgui/packages/tgui/interfaces/Orbit/OrbitSearchBar.tsx
+++ b/tgui/packages/tgui/interfaces/Orbit/OrbitSearchBar.tsx
@@ -86,16 +86,18 @@ export function OrbitSearchBar(props) {
             tooltipPosition="bottom-start"
           />
         </Stack.Item>
-        <Stack.Item>
-          <Button
-            color={autoObserve ? 'good' : 'transparent'}
-            icon={autoObserve ? 'toggle-on' : 'toggle-off'}
-            onClick={() => setAutoObserve(!autoObserve)}
-            tooltip={`Toggle Auto-Observe. When active, you'll
+        {!!data.can_observe && (
+          <Stack.Item>
+            <Button
+              color={autoObserve ? 'good' : 'transparent'}
+              icon={autoObserve ? 'toggle-on' : 'toggle-off'}
+              onClick={() => setAutoObserve(!autoObserve)}
+              tooltip={`Toggle Auto-Observe. When active, you'll
             see the UI / full inventory of whoever you're orbiting. Neat!`}
-            tooltipPosition="bottom-start"
-          />
-        </Stack.Item>
+              tooltipPosition="bottom-start"
+            />
+          </Stack.Item>
+        )}
         <Stack.Item>
           <Button
             color="transparent"
diff --git a/tgui/packages/tgui/interfaces/Orbit/types.ts b/tgui/packages/tgui/interfaces/Orbit/types.ts
index d9069f204e4..3fad9e1bfc5 100644
--- a/tgui/packages/tgui/interfaces/Orbit/types.ts
+++ b/tgui/packages/tgui/interfaces/Orbit/types.ts
@@ -20,6 +20,7 @@ export type OrbitData = {
   misc: Observable[];
   npcs: Observable[];
   orbiting: Observable | null;
+  can_observe: BooleanLike;
 };
 
 export type Observable = {