cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 05:00:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

multi-tile object fix (#30674)

Browse Source
This commit is contained in:
Emmett Gaines
2017-09-14 09:19:20 +02:00
committed by AnturK
parent 0e40bc4f9b
commit 67e284cd4f
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)