Fix and update observers spawn point (sojourn-13#1480)

CeladonSS13 · Apr 4, 2018 · a434d0e · a434d0e
1 parent 9f9a840
commit a434d0e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/code/game/objects/landmarks/join.dm b/code/game/objects/landmarks/join.dm
@@ -40,7 +40,7 @@
 /obj/landmark/join/observer
 	name = "observer-spawn"
 	icon_state = "player-grey-cluster"
-	join_tag = "observer"
+	join_tag = /mob/observer
 
 /obj/landmark/join/start
 	name = "start"

diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
@@ -112,10 +112,10 @@
 
 			observer.started_as_observer = 1
 			close_spawn_windows()
-			var/obj/O = getSpawnPoint("observer")
-			if(istype(O))
-				src << "<span class='notice'>You are observer now.</span>"
-				observer.forceMove(O.loc)
+			var/turf/T = pickSpawnLocation(/mob/observer)
+			if(istype(T))
+				src << SPAN_NOTICE("You are observer now.")
+				observer.forceMove(T)
 			else
 				src << "<span class='danger'>Could not locate an observer spawn point. Use the Teleport verb to jump to the station map.</span>"
 			observer.timeofdeath = world.time // Set the time of death so that the respawn timer works correctly.