Remove drop_item, drop_item_v, put_in_hands_or_del

code/game/machinery/computer/gulag_teleporter.dm

@@ -92,18 +92,13 @@
 			beacon = findbeacon()
 		if("handle_id")
 			if(id)
-				if(!usr.get_active_held_item())
-					usr.put_in_hands(id)
-					id = null
-				else
-					id.forceMove(get_turf(src))
-					id = null
+				usr.put_in_hands(id)
+				id = null
 			else
-				var/obj/item/I = usr.get_active_held_item()
-				if(istype(I, /obj/item/card/id/prisoner))
-					if(!usr.drop_item())
+				var/obj/item/I = usr.is_holding_item_of_type(/obj/item/card/id/prisoner)
+				if(I)
+					if(!usr.transferItemToLoc(I, src))
 						return
-					I.forceMove(src)
 					id = I
 		if("set_goal")
 			var/new_goal = input("Set the amount of points:", "Points", id.goal) as num|null

code/game/machinery/computer/medical.dm

@@ -27,9 +27,8 @@
 
 /obj/machinery/computer/med_data/attackby(obj/item/O, mob/user, params)
 	if(istype(O, /obj/item/card/id) && !scan)
-		if(!user.drop_item())
+		if(!user.transferItemToLoc(O, src))
 			return
-		O.loc = src
 		scan = O
 		to_chat(user, "<span class='notice'>You insert [O].</span>")
 	else
@@ -215,17 +214,13 @@
 			src.temp = null
 		if(href_list["scan"])
 			if(src.scan)
-				if(ishuman(usr) && !usr.get_active_held_item())
-					usr.put_in_hands(scan)
-				else
-					scan.loc = get_turf(src)
-				src.scan = null
+				usr.put_in_hands(scan)
+				scan = null
 			else
-				var/obj/item/I = usr.get_active_held_item()
-				if(istype(I, /obj/item/card/id))
-					if(!usr.drop_item())
+				var/obj/item/I = usr.is_holding_item_of_type(/obj/item/card/id)
+				if(I)
+					if(!usr.transferItemToLoc(I, src))
 						return
-					I.loc = src
 					src.scan = I
 		else if(href_list["logout"])
 			src.authenticated = null

code/game/machinery/computer/prisoner.dm

@@ -90,11 +90,10 @@
 
 		if(href_list["id"])
 			if(href_list["id"] =="insert" && !inserted_id)
-				var/obj/item/card/id/prisoner/I = usr.get_active_held_item()
-				if(istype(I))
-					if(!usr.drop_item())
+				var/obj/item/card/id/prisoner/I = usr.is_holding_item_of_type(/obj/item/card/id/prisoner)
+				if(I)
+					if(!usr.transferItemToLoc(I, src))
 						return
-					I.loc = src
 					inserted_id = I
 				else to_chat(usr, "<span class='danger'>No valid ID.</span>")
 			else if(inserted_id)

code/game/machinery/computer/security.dm

@@ -37,9 +37,8 @@
 /obj/machinery/computer/secure_data/attackby(obj/item/O, mob/user, params)
 	if(istype(O, /obj/item/card/id))
 		if(!scan)
-			if(!user.drop_item())
+			if(!user.transferItemToLoc(O, src))
 				return
-			O.loc = src
 			scan = O
 			to_chat(user, "<span class='notice'>You insert [O].</span>")
 		else
@@ -303,17 +302,13 @@ What a mess.*/
 
 			if("Confirm Identity")
 				if(scan)
-					if(ishuman(usr) && !usr.get_active_held_item())
-						usr.put_in_hands(scan)
-					else
-						scan.loc = get_turf(src)
+					usr.put_in_hands(scan)
 					scan = null
 				else
-					var/obj/item/I = usr.get_active_held_item()
-					if(istype(I, /obj/item/card/id))
-						if(!usr.drop_item())
+					var/obj/item/I = usr.is_holding_item_of_type(/obj/item/card/id)
+					if(I)
+						if(!usr.transferItemToLoc(I, src))
 							return
-						I.loc = src
 						scan = I
 
 			if("Log Out")

code/game/machinery/computer/telecrystalconsoles.dm

@@ -29,21 +29,19 @@ GLOBAL_LIST_INIT(possible_uplinker_IDs, list("Alfa","Bravo","Charlie","Delta","E
 		ID = rand(1,999)
 	name = "[name] [ID]"
 
-/obj/machinery/computer/telecrystals/uplinker/attackby(obj/item/O, mob/user, params)
+/obj/machinery/computer/telecrystals/uplinker/attackby(obj/item/I, mob/user, params)
 	if(uplinkholder)
 		to_chat(user, "<span class='notice'>The [src] already has an uplink in it.</span>")
 		return
-	if(O.hidden_uplink)
-		var/obj/item/I = user.get_active_held_item()
-		if(!user.drop_item())
+	if(I.hidden_uplink)
+		if(!user.transferItemToLoc(I, src))
 			return
 		uplinkholder = I
-		I.loc = src
 		I.add_fingerprint(user)
 		update_icon()
 		updateUsrDialog()
 	else
-		to_chat(user, "<span class='notice'>The [O] doesn't appear to be an uplink...</span>")
+		to_chat(user, "<span class='notice'>[I] doesn't appear to be an uplink...</span>")
 
 /obj/machinery/computer/telecrystals/uplinker/update_icon()
 	..()