- Fixed ore boxes not being properly loaded from mining satchels.

- Fixed it being possible to drag-drop any storage item to either hand from.. anywhere... You can now only do that if the backpack is somewhere on you.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4485 316c924e-a436-60f5-8080-3fe189b3f50e

code/game/objects/storage/backpack.dm

@@ -3,8 +3,10 @@
 		var/mob/M = usr
 		if (!( istype(over_object, /obj/screen) ))
 			return ..()
+		if (!(src.loc == usr) || (src.loc && src.loc.loc == usr))
+			return
 		playsound(src.loc, "rustle", 50, 1, -5)
-		if ((!( M.restrained() ) && !( M.stat ))
+		if (!( M.restrained() ) && !( M.stat ))
 			switch(over_object.name)
 				if("r_hand")
 					M.u_equip(src)

code/modules/mining/satchel_ore_boxdm.dm

@@ -13,8 +13,9 @@
 		src.contents += W;
 	if (istype(W, /obj/item/weapon/storage))
 		var/obj/item/weapon/storage/S = W
+		S.hide_from(usr)
 		for(var/obj/item/weapon/ore/O in S.contents)
-			S.remove_from_storage(W,src) //This will move the item to this item's contents
+			S.remove_from_storage(O, src) //This will move the item to this item's contents
 		user << "\blue You empty the satchel into the box."
 	return