Monkestation · realforest2001 · Jan 28, 2026 · Feb 1, 2026 · Feb 5, 2026 · Feb 5, 2026
diff --git a/_maps/map_files/austranderlin/austranderlin.dmm b/_maps/map_files/austranderlin/austranderlin.dmm
@@ -48816,7 +48816,7 @@
 /turf/open/floor/carpet/green,
 /area/indoors/town/merc_guild)
 "vNk" = (
-/obj/structure/nocdevice,
+/obj/structure/scrying/nocdevice,
 /obj/structure/carpet/blue,
 /turf/open/floor/cobblerock,
 /area/indoors/town/keep/magician)

diff --git a/_maps/map_files/rosewood/rosewood.dmm b/_maps/map_files/rosewood/rosewood.dmm
@@ -29720,7 +29720,7 @@
 /obj/structure/fluff/railing/border{
 	dir = 6
 	},
-/obj/structure/nocdevice{
+/obj/structure/scrying/nocdevice{
 	pixel_x = -5;
 	pixel_y = 6
 	},
@@ -45796,7 +45796,7 @@
 /turf/open/floor/snow/patchy,
 /area/outdoors/town)
 "wdz" = (
-/obj/structure/nocdevice{
+/obj/structure/scrying/nocdevice{
 	pixel_x = -3
 	},
 /turf/open/floor/wood,

diff --git a/_maps/map_files/rosewood/rosewood_marsh.dmm b/_maps/map_files/rosewood/rosewood_marsh.dmm
@@ -2965,7 +2965,7 @@
 /obj/structure/table/wood/reinf_long{
 	dir = 4
 	},
-/obj/item/scrying{
+/obj/item/scrying/orb{
 	pixel_x = 8;
 	pixel_y = 1
 	},

diff --git a/_maps/map_files/rosewood/rosewood_mountain.dmm b/_maps/map_files/rosewood/rosewood_mountain.dmm
@@ -5447,7 +5447,7 @@
 /area/under/mountains/anvil/upper)
 "Rn" = (
 /obj/structure/table/vtable/v2,
-/obj/item/scrying,
+/obj/item/scrying/orb,
 /turf/open/floor/carpet/royalblack,
 /area/under/mountains/anvil/dungeon)
 "Rp" = (

diff --git a/_maps/map_files/shared/CentCom.dmm b/_maps/map_files/shared/CentCom.dmm
@@ -278,7 +278,7 @@
 	name = "Staff of the Wizend Wizard"
 	},
 /obj/structure/table/wood/fancy/royalblue,
-/obj/item/scrying,
+/obj/item/scrying/orb,
 /turf/open/floor/carpet,
 /area/indoors)
 "aW" = (

diff --git a/_maps/map_files/vanderlin/vanderlin.dmm b/_maps/map_files/vanderlin/vanderlin.dmm
@@ -48155,7 +48155,7 @@
 /turf/open/floor/dirt,
 /area/outdoors/exposed/church/graveyard)
 "vNk" = (
-/obj/structure/nocdevice,
+/obj/structure/scrying/nocdevice,
 /obj/structure/carpet/blue,
 /turf/open/floor/cobblerock,
 /area/indoors/town/keep/magician)

diff --git a/_maps/map_files/vanderlin/vanderlin_bog.dmm b/_maps/map_files/vanderlin/vanderlin_bog.dmm
@@ -10977,7 +10977,7 @@
 /area/outdoors/bog/south/west)
 "jvo" = (
 /obj/structure/table/wood/fancy/black,
-/obj/item/scrying{
+/obj/item/scrying/orb{
 	pixel_x = -4;
 	pixel_y = 10
 	},

diff --git a/_maps/map_files/vanderlin/vanderlin_mountain.dmm b/_maps/map_files/vanderlin/vanderlin_mountain.dmm
@@ -13724,7 +13724,7 @@
 /turf/open/floor/cobblerock,
 /area/indoors/mountains/anvil/upperkeep)
 "rOq" = (
-/obj/structure/nocdevice{
+/obj/structure/scrying/nocdevice{
 	pixel_y = 11;
 	pixel_x = -7;
 	name = " defunct Magical Artillery device"

diff --git a/_maps/map_files/voyager/voyager.dmm b/_maps/map_files/voyager/voyager.dmm
@@ -2090,7 +2090,7 @@
 /area/ship/middeck)
 "nT" = (
 /obj/structure/closet/crate/drawer,
-/obj/item/scrying,
+/obj/item/scrying/orb,
 /obj/structure/fluff/wallclock,
 /turf/open/floor/ruinedwood/two,
 /area/ship/nobledeck)

diff --git a/_maps/map_files/whitepalacepass/WhitePalacePass.dmm b/_maps/map_files/whitepalacepass/WhitePalacePass.dmm
@@ -19102,7 +19102,7 @@
 /turf/open/floor/cobble,
 /area/under/town/basement)
 "lHr" = (
-/obj/structure/nocdevice{
+/obj/structure/scrying/nocdevice{
 	pixel_x = -3
 	},
 /turf/open/floor/wood,

diff --git a/_maps/matthios_tomb/room/SteamCastle.dmm b/_maps/matthios_tomb/room/SteamCastle.dmm
@@ -700,7 +700,7 @@
 /obj/structure/fluff/railing/border{
 	dir = 5
 	},
-/obj/structure/nocdevice{
+/obj/structure/scrying/nocdevice{
 	pixel_x = -7;
 	pixel_y = 0
 	},

diff --git a/_maps/templates/malums_anvil_dungeons/embercradle.dmm b/_maps/templates/malums_anvil_dungeons/embercradle.dmm
@@ -1267,7 +1267,7 @@
 /area/under/mountains/anvil/dungeon)
 "ro" = (
 /obj/machinery/artificer_table,
-/obj/item/scrying,
+/obj/item/scrying/orb,
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/carpet/stellar,
 /area/under/mountains/anvil/dungeon/lower)

diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm
@@ -114,6 +114,8 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list(
 
 #define isrogueobserver(A) (istype(A, /mob/dead/observer/rogue))
 
+#define isscryeye(A) (istype(A, /mob/scry_eye))
+
 #define isdead(A) (istype(A, /mob/dead))
 
 #define isnewplayer(A) (istype(A, /mob/dead/new_player))

diff --git a/code/__DEFINES/traits/definitions.dm b/code/__DEFINES/traits/definitions.dm
@@ -354,9 +354,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 
 /// Given to a mob that can throw to make them not able to throw
 #define TRAIT_NO_THROWING "no_throwing"
-
-/// Hides the SSD indicator. Used with scrying.
-#define TRAIT_NOSSDINDICATOR "nossdindicator"
 /// Instant grabs on someone else.
 #define TRAIT_NOSTRUGGLE "nostruggle"
 /// Black-bagged. More snowflaking.

diff --git a/code/_onclick/hud/ghost.dm b/code/_onclick/hud/ghost.dm
@@ -67,9 +67,6 @@
 	if(!istype(ghost))
 		return
 
-	if(istype(ghost, /mob/dead/observer/rogue/arcaneeye))
-		return
-
 	if(ghost.isinhell)
 		return
 

diff --git a/code/_onclick/observer.dm b/code/_onclick/observer.dm
@@ -18,9 +18,6 @@
 /mob/dead/observer/profane/DblClickOn(atom/clicked_atom, params) // Souls trapped by the dagger should not be jumping around.
 	return
 
-/mob/dead/observer/rogue/arcaneeye/DblClickOn(atom/clicked_atom, params)
-	return
-
 /mob/dead/observer/ClickOn(atom/clicked_atom, params)
 	var/list/modifiers = params2list(params)
 

diff --git a/code/datums/components/orbiter.dm b/code/datums/components/orbiter.dm
@@ -104,8 +104,7 @@
 		orbiter.glide_size = movable_parent.glide_size
 
 	orbiter.abstract_move(get_turf(parent))
-	if(!istype(orbiter, /mob/dead/observer/screye))
-		to_chat(orbiter, span_notice("Now orbiting [parent]."))
+	to_chat(orbiter, span_notice("Now orbiting [parent]."))
 
 /datum/component/orbiter/proc/end_orbit(atom/movable/orbiter, refreshing=FALSE)
 	if(!orbiter_list[orbiter])
-Original file line number
+Diff line change
@@ Expand Up / @@ -67,9 +67,6 @@ @@
     	if(!istype(ghost))
     		return
-    	if(istype(ghost, /mob/dead/observer/rogue/arcaneeye))
-    		return
     	if(ghost.isinhell)
     		return
@@ Expand Down @@