Merge branch 'master' into codejanitoring

code/modules/mining/fulton.dm

@@ -67,8 +67,7 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons)
 					B.handle_item_insertion(src)
 			uses_left--
 			if(uses_left <= 0)
-				user.drop_item(src)
-				loc = A
+				user.transferItemToLoc(src, A, TRUE)
 			var/mutable_appearance/balloon
 			var/mutable_appearance/balloon2
 			var/mutable_appearance/balloon3

code/modules/mining/laborcamp/laborstacker.dm

@@ -24,9 +24,8 @@
 /obj/machinery/mineral/labor_claim_console/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/card/id/prisoner))
 		if(!inserted_id)
-			if(!user.drop_item())
+			if(!user.transferItemToLoc(I, src))
 				return
-			I.forceMove(src)
 			inserted_id = I
 			to_chat(user, "<span class='notice'>You insert [I].</span>")
 			return
@@ -83,9 +82,8 @@
 			else
 				var/obj/item/I = usr.get_active_held_item()
 				if(istype(I, /obj/item/card/id/prisoner))
-					if(!usr.drop_item())
+					if(!usr.transferItemToLoc(I, src))
 						return
-					I.forceMove(src)
 					inserted_id = I
 		if("claim_points")
 			inserted_id.points += stacking_machine.points

code/modules/mining/lavaland/necropolis_chests.dm

@@ -1005,7 +1005,7 @@
 			if(H == L)
 				continue
 			to_chat(H, "<span class='userdanger'>You have an overwhelming desire to kill [L]. [L.p_they(TRUE)] [L.p_have()] been marked red! Go kill [L.p_them()]!</span>")
-			H.put_in_hands_or_del(new /obj/item/kitchen/knife/butcher(H))
+			H.put_in_hands(new /obj/item/kitchen/knife/butcher(H), TRUE)
 
 	qdel(src)
 

code/modules/mining/machine_redemption.dm

@@ -166,9 +166,8 @@
 	if(istype(W, /obj/item/card/id))
 		var/obj/item/card/id/I = user.get_active_held_item()
 		if(istype(I) && !istype(inserted_id))
-			if(!user.drop_item())
+			if(!user.transferItemToLoc(I, src))
 				return
-			I.forceMove(src)
 			inserted_id = I
 			interact(user)
 		return

code/modules/mining/machine_vending.dm

@@ -116,9 +116,8 @@
 		else if(href_list["choice"] == "insert")
 			var/obj/item/card/id/I = usr.get_active_held_item()
 			if(istype(I))
-				if(!usr.drop_item())
+				if(!usr.transferItemToLoc(I, src))
 					return
-				I.loc = src
 				inserted_id = I
 				to_chat(usr, "<span class='notice'>You insert the ID into [src]'s card slot.</span>")
 			else 
@@ -155,9 +154,8 @@
 	if(istype(I, /obj/item/card/id))
 		var/obj/item/card/id/C = usr.get_active_held_item()
 		if(istype(C) && !istype(inserted_id))
-			if(!usr.drop_item())
+			if(!usr.transferItemToLoc(C, src))
 				return
-			C.loc = src
 			inserted_id = C
 			to_chat(usr, "<span class='notice'>You insert the ID into [src]'s card slot.</span>")
 			interact(user)

code/modules/mining/satchel_ore_boxdm.dm

@@ -11,9 +11,7 @@
 
 /obj/structure/ore_box/attackby(obj/item/W, mob/user, params)
 	if (istype(W, /obj/item/ore))
-		if(!user.drop_item())
-			return
-		W.forceMove(src)
+		user.transferItemToLoc(W, src)
 	else if (istype(W, /obj/item/storage))
 		var/obj/item/storage/S = W
 		for(var/obj/item/ore/O in S.contents)