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

fixes shuttle parallax again (#32350)

Browse Source
This commit is contained in:
Emmett Gaines
2017-11-03 16:22:48 -04:00
committed by CitadelStationBot
parent 910e6b6396
commit b97e1741df
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -622,6 +622,18 @@
/******************************************All afterShuttleMove procs****************************************/
underlying_old_area.afterShuttleMove()
// Parallax handling
// This needs to be done before the atom after move
var/new_parallax_dir = FALSE
if(istype(new_dock, /obj/docking_port/stationary/transit))
new_parallax_dir = preferred_direction
for(var/i in 1 to areas_to_move.len)
CHECK_TICK
var/area/internal_area = areas_to_move[i]
internal_area.afterShuttleMove(new_parallax_dir) //areas
for(var/i in 1 to old_turfs.len)
CHECK_TICK
if(!(old_turfs[old_turfs[i]] & MOVE_TURF))
@@ -647,17 +659,6 @@
newT.blocks_air = initial(newT.blocks_air)
newT.air_update_turf(TRUE)
underlying_old_area.afterShuttleMove()
// Parallax handling
var/new_parallax_dir = FALSE
if(istype(new_dock, /obj/docking_port/stationary/transit))
new_parallax_dir = preferred_direction
for(var/i in 1 to areas_to_move.len)
CHECK_TICK
var/area/internal_area = areas_to_move[i]
internal_area.afterShuttleMove(new_parallax_dir) //areas
check_poddoors()
new_dock.last_dock_time = world.time
setDir(new_dock.dir)