Merge pull request #10811 from mwerezak/qdel

Fixes

code/game/objects/items/stacks/stack.dm

@@ -184,11 +184,9 @@
 	if(!uses_charge)
 		amount -= used
 		if (amount <= 0)
-			spawn(0) //delete the empty stack once the current context yields
-				if (amount <= 0) //check again in case someone transferred stuff to us
-					if(usr)
-						usr.remove_from_mob(src)
-					qdel(src)
+			if(usr)
+				usr.remove_from_mob(src)
+			qdel(src) //should be safe to qdel immediately since if someone is still using this stack it will persist for a little while longer
 		return 1
 	else
 		if(get_amount() < used)

code/game/objects/structures/crates_lockers/closets.dm

@@ -222,6 +222,7 @@
 		if(istype(W, /obj/item/weapon/grab))
 			var/obj/item/weapon/grab/G = W
 			src.MouseDrop_T(G.affecting, user)      //act like they were dragged onto the closet
+			return 0
 		if(istype(W,/obj/item/tk_grab))
 			return 0
 		if(istype(W, /obj/item/weapon/weldingtool))
@@ -269,11 +270,9 @@
 		return
 	if(user.restrained() || user.stat || user.weakened || user.stunned || user.paralysis)
 		return
-	if((!( istype(O, /atom/movable) ) || O.anchored || get_dist(user, src) > 1 || get_dist(user, O) > 1 || user.contents.Find(src)))
+	if((!( istype(O, /atom/movable) ) || O.anchored || !Adjacent(user) || !Adjacent(O) || !user.Adjacent(O) || user.contents.Find(src)))
 		return
-	if(user.loc==null) // just in case someone manages to get a closet into the blue light dimension, as unlikely as that seems
-		return
-	if(!istype(user.loc, /turf)) // are you in a container/closet/pod/etc?
+	if(!isturf(user.loc)) // are you in a container/closet/pod/etc?
 		return
 	if(!src.opened)
 		return