From ffe9a1c05999634308e6103571fca6b3c08c33d7 Mon Sep 17 00:00:00 2001 From: James Date: Sat, 5 Feb 2022 08:59:21 +0000 Subject: [PATCH] Fixes atom_movements.dm runtime Players gets teleported before dorm room is loaded. Now we only teleport when the room is ready. --- code/modules/ruins/spaceruin_code/hilbertshotel.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/ruins/spaceruin_code/hilbertshotel.dm b/code/modules/ruins/spaceruin_code/hilbertshotel.dm index 7109c87999..cb8f495cbc 100644 --- a/code/modules/ruins/spaceruin_code/hilbertshotel.dm +++ b/code/modules/ruins/spaceruin_code/hilbertshotel.dm @@ -242,7 +242,8 @@ GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337) /turf/open/space/bluespace/Entered(atom/movable/A) . = ..() - A.forceMove(get_turf(parentSphere)) + if (parentSphere) + A.forceMove(get_turf(parentSphere)) /turf/closed/indestructible/hoteldoor name = "Hotel Door"