Merge branch 'master' into development

# Conflicts:
#	code/modules/client/preference_setup/loadout/loadout_xeno.dm
#	code/modules/customitems/item_defines.dm

code/modules/mining/mine_items.dm

@@ -1131,8 +1131,7 @@ var/list/total_extraction_beacons = list()
 		single_spark(O.loc)
 		do_teleport(O, user, 0)
 
-		if (TICK_CHECK)
-			return
+		CHECK_TICK
 
 /******************************Sculpting*******************************/
 /obj/item/weapon/autochisel

code/modules/mining/satchel_ore_boxdm.dm

@@ -16,12 +16,14 @@
 		src.contents += W
 	if (istype(W, /obj/item/weapon/storage))
 		var/obj/item/weapon/storage/S = W
-		S.hide_from(usr)
+		S.hide_from(user)
 		for(var/obj/item/weapon/ore/O in S.contents)
-			S.remove_from_storage(O, src) //This will move the item to this item's contents
+			S.remove_from_storage_deferred(O, src, user) //This will move the item to this item's contents
 
 			CHECK_TICK
 
+		S.post_remove_from_storage_deferred(loc, user)
+
 		user << span("notice", "You empty the satchel into the box.")
 
 	update_ore_count()