shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4361 from Citadel-Station-13/upstream-merge-33497

Browse Source 
[MIRROR] Fixed several bad type checks in shuttle procs
This commit is contained in:
deathride58
2017-12-14 03:53:32 +00:00
committed by GitHub
parent 064de39fe4 fb7a7388f0
commit 8f2d72ebc2
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/shuttle/shuttle.dm
View File

@@ -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