From aeb29a28d0de73de6cac66b3cde0e7a651e15ab0 Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Tue, 15 Dec 2015 14:33:30 -0600 Subject: [PATCH] Shuttle tweaks --- code/game/turfs/space/transit.dm | 1 + code/modules/shuttle/shuttle.dm | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/game/turfs/space/transit.dm b/code/game/turfs/space/transit.dm index db03173f624..60c82e3399f 100644 --- a/code/game/turfs/space/transit.dm +++ b/code/game/turfs/space/transit.dm @@ -1,6 +1,7 @@ /turf/space/transit icon_state = "black" dir = SOUTH + baseturf = /turf/space/transit /turf/space/transit/horizontal dir = WEST diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index 250e3e01423..233e15956fd 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -347,8 +347,8 @@ var/turf/T1 = L1[i] if(!T1) continue - - T0.copyTurf(T1) + if(T0.type != T0.baseturf) //So if there is a hole in the shuttle we don't drag along the space/asteroid/etc to wherever we are going next + T0.copyTurf(T1) areaInstance.contents += T1 //copy over air