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

Merge pull request #4336 from Citadel-Station-13/upstream-merge-33457

Browse Source 
[MIRROR] Check ticks some more in dock()
This commit is contained in:
deathride58
2017-12-13 01:22:52 +00:00
committed by GitHub
parent a6283110fa c568b313f6
commit 6fc0cdc67e
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/shuttle/shuttle.dm
+5 -1
View File
@@ -562,6 +562,7 @@
var/list/old_contents = oldT.contents var/list/old_contents = oldT.contents
for(var/k in 1 to old_contents.len) for(var/k in 1 to old_contents.len)
CHECK_TICK
var/atom/movable/moving_atom = old_contents[k] var/atom/movable/moving_atom = old_contents[k]
if(moving_atom.loc != oldT) //fix for multi-tile objects if(moving_atom.loc != oldT) //fix for multi-tile objects
continue continue
@@ -575,12 +576,13 @@
old_turfs[oldT] = move_mode old_turfs[oldT] = move_mode
/*******************************************Hiding turfs if necessary******************************************/ /*******************************************Hiding turfs if necessary*******************************************/
var/list/new_hidden_turfs var/list/new_hidden_turfs
if(hidden) if(hidden)
new_hidden_turfs = list() new_hidden_turfs = list()
for(var/i in 1 to old_turfs.len) for(var/i in 1 to old_turfs.len)
CHECK_TICK
var/turf/oldT = old_turfs[i] var/turf/oldT = old_turfs[i]
if(old_turfs[oldT] & MOVE_TURF) if(old_turfs[oldT] & MOVE_TURF)
new_hidden_turfs += new_turfs[i] new_hidden_turfs += new_turfs[i]
@@ -588,6 +590,8 @@
/*******************************************All onShuttleMove procs******************************************/ /*******************************************All onShuttleMove procs******************************************/
CHECK_TICK
for(var/i in 1 to old_turfs.len) for(var/i in 1 to old_turfs.len)
var/turf/oldT = old_turfs[i] var/turf/oldT = old_turfs[i]
var/turf/newT = new_turfs[i] var/turf/newT = new_turfs[i]