Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

code/datums/components/storage/concrete/_concrete.dm

@@ -136,9 +136,7 @@
 		var/mob/M = parent.loc
 		I.dropped(M)
 	if(new_location)
-		//Reset the items values
-		_removal_reset(AM)
-		AM.forceMove(new_location)
+		AM.forceMove(new_location)		// exited comsig will handle removal reset.
 		//We don't want to call this if the item is being destroyed
 		AM.on_exit_storage(src)
 	else

code/datums/components/storage/storage.dm

@@ -351,7 +351,6 @@
 	return master._removal_reset(thing)
 
 /datum/component/storage/proc/_remove_and_refresh(datum/source, atom/movable/thing)
-	_removal_reset(thing)
 	if(LAZYACCESS(ui_item_blocks, thing))
 		var/obj/screen/storage/volumetric_box/center/C = ui_item_blocks[thing]
 		for(var/i in can_see_contents())		//runtimes result if mobs can access post deletion.
@@ -359,6 +358,7 @@
 			M.client?.screen -= C.on_screen_objects()
 		ui_item_blocks -= thing
 		qdel(C)
+	_removal_reset(thing)		// THIS NEEDS TO HAPPEN AFTER SO LAYERING DOESN'T BREAK!
 	refresh_mob_views()
 
 //Call this proc to handle the removal of an item from the storage item. The item will be moved to the new_location target, if that is null it's being deleted