From 2afb3c036872b447591dce8f782d6a5899f7607b Mon Sep 17 00:00:00 2001 From: Cruix Date: Wed, 13 Dec 2017 21:08:30 -0600 Subject: [PATCH 1/2] Fixed several bad type checks in shuttle procs (#33497) --- code/modules/shuttle/shuttle.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index 7fabbc2e09..a4303078a5 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -433,7 +433,7 @@ for(var/i in 1 to old_turfs.len) var/turf/oldT = old_turfs[i] - if(!oldT || !istype(oldT, area_type)) + if(!oldT || !istype(oldT.loc, area_type)) continue var/area/old_area = oldT.loc underlying_area.contents += oldT @@ -460,7 +460,7 @@ for(var/i in 1 to L0.len) var/turf/T0 = L0[i] - if(!T0 || !istype(T0, area_type)) + if(!T0 || !istype(T0.loc, area_type)) continue var/turf/T1 = L1[i] if(!T1) @@ -745,7 +745,7 @@ var/list/L0 = return_ordered_turfs(x, y, z, dir) for (var/thing in L0) var/turf/T = thing - if(!T || !istype(T, area_type)) + if(!T || !istype(T.loc, area_type)) continue for (var/thing2 in T) var/atom/movable/AM = thing2