From 367872f9627f922f10d6b4125367e0934aa4e12f Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Tue, 12 Dec 2017 13:58:03 -0500 Subject: [PATCH] Merge pull request #33457 from ninjanomnom/check-your-tick Check ticks some more in dock() --- code/modules/shuttle/shuttle.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index 945870b7fa..7fabbc2e09 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -562,6 +562,7 @@ var/list/old_contents = oldT.contents for(var/k in 1 to old_contents.len) + CHECK_TICK var/atom/movable/moving_atom = old_contents[k] if(moving_atom.loc != oldT) //fix for multi-tile objects continue @@ -575,12 +576,13 @@ old_turfs[oldT] = move_mode - /*******************************************Hiding turfs if necessary******************************************/ + /*******************************************Hiding turfs if necessary*******************************************/ var/list/new_hidden_turfs if(hidden) new_hidden_turfs = list() for(var/i in 1 to old_turfs.len) + CHECK_TICK var/turf/oldT = old_turfs[i] if(old_turfs[oldT] & MOVE_TURF) new_hidden_turfs += new_turfs[i] @@ -588,6 +590,8 @@ /*******************************************All onShuttleMove procs******************************************/ + CHECK_TICK + for(var/i in 1 to old_turfs.len) var/turf/oldT = old_turfs[i] var/turf/newT = new_turfs[i]