Merge pull request #3292 from Citadel-Station-13/upstream-merge-31494

[MIRROR] In which the stoner one gets stoned and tries to address tick contention... again
This commit is contained in:
LetterJay
2017-10-10 22:32:52 -04:00
committed by GitHub
21 changed files with 72 additions and 54 deletions
@@ -123,10 +123,9 @@
if(glow_type)
glow = new glow_type(get_turf(src))
animate(glow, alpha = 255, time = convert_time)
var/I = 0
while(I < convert_time && get_turf(L) == get_turf(src))
I++
sleep(1)
var/end_time = world.time+convert_time
while(world.time < end_time && get_turf(L) == get_turf(src))
stoplag(1)
if(get_turf(L) != get_turf(src))
if(glow)
qdel(glow)
@@ -319,7 +319,7 @@ Applications: 8 servants, 3 caches, and 100 CV
qdel(progbar)
else
progbar.update(end_time - world.time)
sleep(1)
stoplag(1)
if(slab)
if(slab.slab_ability)
successful = slab.slab_ability.successful