From 8ead04b960a38682d4d6547a0e31359364d84865 Mon Sep 17 00:00:00 2001 From: monster860 Date: Mon, 7 Mar 2016 16:23:40 -0500 Subject: [PATCH 1/2] Fix space pod transitions (#2230) --- code/game/turfs/space/space.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm index ca73867902f..479aa36d3f5 100644 --- a/code/game/turfs/space/space.dm +++ b/code/game/turfs/space/space.dm @@ -69,7 +69,7 @@ /turf/space/Entered(atom/movable/A as mob|obj) ..() - if ((!(A) || src != A.loc)) + if ((!(A) || !(src in A.locs))) return if(destination_z) From 2f3a3633bdfe0b312e2d664370c01f8e273f12e4 Mon Sep 17 00:00:00 2001 From: monster860 Date: Tue, 8 Mar 2016 10:55:14 -0500 Subject: [PATCH 2/2] Made it faster --- code/game/turfs/space/space.dm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm index 479aa36d3f5..eb4b7671d71 100644 --- a/code/game/turfs/space/space.dm +++ b/code/game/turfs/space/space.dm @@ -69,10 +69,8 @@ /turf/space/Entered(atom/movable/A as mob|obj) ..() - if ((!(A) || !(src in A.locs))) - return - - if(destination_z) + + if(destination_z && A && (src in A.locs)) A.x = destination_x A.y = destination_y A.z = destination_z @@ -200,4 +198,4 @@ return /turf/space/can_have_cabling() - return 0 \ No newline at end of file + return 0