From c694248f5af901fdf4fccb06a70a4cdc0202ab9f Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Tue, 20 Aug 2019 21:58:48 -0700
Subject: [PATCH 1/3] Update necropolis_chests.dm

---
 .../mining/lavaland/necropolis_chests.dm      | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index 7add723a06..910ce9bff5 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -787,30 +787,30 @@
 /obj/item/melee/ghost_sword/process()
 	ghost_check()
 
-/obj/item/melee/ghost_sword/proc/ghost_check()
-	var/ghost_counter = 0
-	var/turf/T = get_turf(src)
-	var/list/contents = T.GetAllContents()
-	var/mob/dead/observer/current_spirits = list()
-	for(var/thing in contents)
-		var/atom/A = thing
-		A.transfer_observers_to(src)
-
-	for(var/i in orbiters?.orbiters)
+/obj/item/melee/ghost_sword/proc/recursive_orbit_collect(atom/A, list/L)
+	for(var/i in A.orbiters?.orbiters)
 		if(!isobserver(i))
 			continue
+		L += i
+		recursive_orbit_collect(i, L)
+
+/obj/item/melee/ghost_sword/proc/ghost_check()
+	var/list/mob/dead/observer/current_spirits = list()
+	
+	recursive_orbit_collect(src, current_spirits)
+	recursive_orbit_collect(loc, current_spirits)		//anything holding us
+	
+	for(var/i in spirits - current_spirits)
 		var/mob/dead/observer/G = i
-		ghost_counter++
-		G.invisibility = 0
-		current_spirits |= G
-
-	for(var/mob/dead/observer/G in spirits - current_spirits)
 		G.invisibility = GLOB.observer_default_invisibility
-
+ 	
+	for(var/i in current_spirits)
+		var/mob/dead/observer/G = i
+		G.invisibility = 0
+	
 	spirits = current_spirits
-
-	return ghost_counter
-
+	return length(spirits)
+ 
 /obj/item/melee/ghost_sword/attack(mob/living/target, mob/living/carbon/human/user)
 	force = 0
 	var/ghost_counter = ghost_check()
@@ -1335,4 +1335,4 @@
 		if(2)
 			new /obj/item/wisp_lantern(src)
 		if(3)
-			new /obj/item/prisoncube(src)
\ No newline at end of file
+			new /obj/item/prisoncube(src)

From 2f39bb3d566513f0815679cb7e83fecda25051d3 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Tue, 20 Aug 2019 21:59:50 -0700
Subject: [PATCH 2/3] Update necropolis_chests.dm

---
 code/modules/mining/lavaland/necropolis_chests.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index 910ce9bff5..4aa0323fd5 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -791,7 +791,7 @@
 	for(var/i in A.orbiters?.orbiters)
 		if(!isobserver(i))
 			continue
-		L += i
+		L |= i
 		recursive_orbit_collect(i, L)
 
 /obj/item/melee/ghost_sword/proc/ghost_check()

From 2f9ca28d389bf9fea7c90659e5fa24619b9cba0e Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Wed, 21 Aug 2019 08:17:34 -0700
Subject: [PATCH 3/3] this is bad performance and probably unnecessary but
 juuust in case..

---
 code/modules/mining/lavaland/necropolis_chests.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index 4aa0323fd5..5990c70813 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -789,7 +789,7 @@
 
 /obj/item/melee/ghost_sword/proc/recursive_orbit_collect(atom/A, list/L)
 	for(var/i in A.orbiters?.orbiters)
-		if(!isobserver(i))
+		if(!isobserver(i) || (i in L))
 			continue
 		L |= i
 		recursive_orbit_collect(i, L)