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

[MIRROR] Shuttle multi-tile object fix (#2748)

Browse Source 
* multi-tile object fix (#30674)

* Shuttle multi-tile object fix
This commit is contained in:
CitadelStationBot
2017-09-14 07:37:54 -05:00
committed by Poojawa
parent 5ed14bfedd
commit fc62f8bf3e
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/shuttle/shuttle.dm
+4
View File
@@ -567,6 +567,8 @@
for(var/i in 1 to oldT.contents.len)
var/atom/movable/moving_atom = oldT.contents[i]
if(moving_atom.loc != oldT) //fix for multi-tile objects
continue
move_mode = moving_atom.beforeShuttleMove(newT, rotation, move_mode) //atoms
move_mode = oldT.fromShuttleMove(newT, underlying_turf_type, baseturf_cache, move_mode) //turfs
@@ -588,6 +590,8 @@
if(move_mode & MOVE_CONTENTS)
for(var/thing in oldT)
var/atom/movable/moving_atom = thing
if(moving_atom.loc != oldT) //fix for multi-tile objects
continue
moving_atom.onShuttleMove(newT, oldT, rotation, movement_force, movement_direction, old_dock)//atoms
moved_atoms += moving_atom
if(move_mode & MOVE_TURF)