Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into cache-locality-experiments

2020-09-21 03:31:35 -07:00
parent f77f427f70 21903d3a24
commit e89e7adda4
292 changed files with 17020 additions and 10519 deletions
@@ -113,8 +113,7 @@
 	if (loc != user)
 		return ..()
 	if(SEND_SIGNAL(src, COMSIG_IS_STORAGE_LOCKED))
-		ui_interact(user)
-		return
+		INVOKE_ASYNC(src, /datum.proc/ui_interact, user)

 /obj/item/storage/portable_chem_mixer/attack_self(mob/user)
 	if(loc == user)