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
2017-10-10 22:32:52 -04:00
parent ca521a4ea2 70c36c638f
commit 822f15f4ae
21 changed files with 72 additions and 54 deletions
@@ -161,7 +161,7 @@ Difficulty: Medium

 /mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/proc/quick_attack_loop()
 	if(next_move <= world.time)
-		sleep(1)
+		stoplag(1)
 		.() //retry
 		return
 	sleep((next_move - world.time) * 1.5)