From 9d02b41ae7ef5dffbc58b206ff0baee51e7625ca Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Thu, 9 Jul 2015 11:01:42 +0930 Subject: [PATCH] Emergency workaround for the observer bug. --- code/modules/mob/new_player/new_player.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 4222fc9651..445caab39c 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -119,8 +119,11 @@ observer.started_as_observer = 1 close_spawn_windows() var/obj/O = locate("landmark*Observer-Start") - src << "\blue Now teleporting." - observer.loc = O.loc + if(istype(O)) + src << "Now teleporting." + observer.loc = O.loc + else + src << "Could not locate an observer spawn point. Use the Teleport verb to jump to the station map." observer.timeofdeath = world.time // Set the time of death so that the respawn timer works correctly. announce_ghost_joinleave(src)