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

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

Browse Source 
[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
parent ca521a4ea2 70c36c638f
commit 822f15f4ae
21 changed files with 72 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/storage/storage.dm
+2 -2
View File
@@ -88,7 +88,7 @@
var/list/things = src_object.contents.Copy()
var/datum/progressbar/progress = new(user, things.len, src)
while (do_after(user, 10, TRUE, src, FALSE, CALLBACK(src, .proc/handle_mass_item_insertion, things, src_object, user, progress)))
sleep(1)
stoplag(1)
qdel(progress)
orient2hud(user)
src_object.orient2hud(user)
@@ -489,7 +489,7 @@
var/list/things = contents.Copy()
var/datum/progressbar/progress = new(usr, things.len, T)
while (do_after(usr, 10, TRUE, T, FALSE, CALLBACK(src, .proc/mass_remove_from_storage, T, things, progress)))
sleep(1)
stoplag(1)
qdel(progress)
/obj/item/storage/proc/mass_remove_from_storage(atom/target, list/things, datum/progressbar/progress)