Merge pull request #31494 from MrStonedOne/tick_contention_tug_of_war

In which the stoner one gets stoned and tries to address tick contention... again
2017-10-10 13:28:38 -05:00
parent f8d0646b09
commit 7b30be0058
21 changed files with 72 additions and 54 deletions
@@ -330,7 +330,7 @@
 	var/list/things = src_object.contents.Copy()
 	var/datum/progressbar/progress = new(user, things.len, src)
 	while (do_after(usr, 10, TRUE, src, FALSE, CALLBACK(src_object, /obj/item/storage.proc/mass_remove_from_storage, src, things, progress)))
-		sleep(1)
+		stoplag(1)
 	qdel(progress)

 	return TRUE