Merge pull request Blackstone-SS13#62 from ChungusGamer666/gravefix

Grave markers will send you to the lobby even if you are in the underworld

code/modules/roguetown/roguejobs/gravedigger/gravemarker.dm

@@ -60,7 +60,16 @@
 		if(L.stat == DEAD)
 			if(L.mind && L.mind.has_antag_datum(/datum/antagonist/zombie))
 				L.mind.remove_antag_datum(/datum/antagonist/zombie)
-			var/mob/dead/observer/O = L.ghostize(force_respawn = TRUE)
+			var/mob/dead/observer/O
+			//We probably went to the underworld
+			if(!L.client)
+				var/client/friendo = GLOB.directory[lowertext(L.mind.key)]
+				if(friendo && istype(friendo.mob, /mob/living/carbon/spirit))
+					var/mob/living/carbon/spirit/lost_soul = friendo.mob
+					lost_soul = L.ghostize(force_respawn = TRUE)
+					qdel(lost_soul)
+			else
+				O = L.ghostize(force_respawn = TRUE)
 			if(O)
 				testing("bur1")
 				to_chat(O, "<span class='rose'>My soul finds peace buried in creation.</span>")
@@ -100,4 +109,4 @@
 						for(var/mob/dead/new_player/G in GLOB.player_list)
 							if(G.mind.key == B.mind.key)
 								testing("bur6")
-								G.reducespawntime(RESPAWNTIME*-1)
+								G.reducespawntime(RESPAWNTIME*-1)