Remove drop_item, drop_item_v, put_in_hands_or_del

code/game/gamemodes/antag_spawner.dm

@@ -90,7 +90,7 @@
 		if("healing")
 			M.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/charge(null))
 			M.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/forcewall(null))
-			M.put_in_hands_or_del(new /obj/item/gun/magic/staff/healing(M))
+			M.put_in_hands(new /obj/item/gun/magic/staff/healing(M), TRUE)
 			to_chat(M, "<B>Your service has not gone unrewarded, however. Studying under [wizard_name], you have learned livesaving survival spells. You are able to cast charge and forcewall.")
 		if("robeless")
 			M.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/knock(null))

code/game/gamemodes/changeling/powers/mutations.dm

@@ -37,8 +37,9 @@
 		return 1
 
 /obj/effect/proc_holder/changeling/weapon/sting_action(mob/living/user)
-	if(!user.drop_item())
-		to_chat(user, "<span class='warning'>The [user.get_active_held_item()] is stuck to your hand, you cannot grow a [weapon_name_simple] over it!</span>")
+	var/obj/item/held = user.get_active_held_item()
+	if(held && !user.dropItemToGround(held))
+		to_chat(user, "<span class='warning'>[held] is stuck to your hand, you cannot grow a [weapon_name_simple] over it!</span>")
 		return
 	var/limb_regen = 0
 	if(user.active_hand_index % 2 == 0) //we regen the arm before changing it into the weapon
@@ -338,7 +339,7 @@
 					if(INTENT_DISARM)
 						var/obj/item/I = C.get_active_held_item()
 						if(I)
-							if(C.drop_item())
+							if(C.dropItemToGround(I))
 								C.visible_message("<span class='danger'>[I] is yanked off [C]'s hand by [src]!</span>","<span class='userdanger'>A tentacle pulls [I] away from you!</span>")
 								on_hit(I) //grab the item as if you had hit it directly with the tentacle
 								return 1

code/game/gamemodes/changeling/powers/tiny_prick.dm

@@ -127,8 +127,9 @@
 /obj/effect/proc_holder/changeling/sting/false_armblade/sting_action(mob/user, mob/target)
 	add_logs(user, target, "stung", object="falso armblade sting")
 
-	if(!target.drop_item())
-		to_chat(user, "<span class='warning'>The [target.get_active_held_item()] is stuck to their hand, you cannot grow a false armblade over it!</span>")
+	var/obj/item/held = target.get_active_held_item()
+	if(held && !target.dropItemToGround(held))
+		to_chat(user, "<span class='warning'>[held] is stuck to their hand, you cannot grow a false armblade over it!</span>")
 		return
 
 	if(ismonkey(target))

code/game/gamemodes/clock_cult/clock_effects/spatial_gateway.dm

@@ -88,7 +88,7 @@
 	if(istype(I, /obj/item/clockwork/slab))
 		to_chat(user, "<span class='heavy_brass'>\"I don't think you want to drop your slab into that.\"\n\"If you really want to, try throwing it.\"</span>")
 		return TRUE
-	if(user.drop_item() && uses)
+	if(uses && user.dropItemToGround(I))
 		user.visible_message("<span class='warning'>[user] drops [I] into [src]!</span>", "<span class='danger'>You drop [I] into [src]!</span>")
 		pass_through_gateway(I, TRUE)
 		return TRUE

code/game/gamemodes/clock_cult/clock_items/clock_components.dm

@@ -20,7 +20,6 @@
 		"<span class='alloy'>You crush [src], capturing its escaping energy for use as power.</span>")
 		playsound(user, 'sound/effects/pop_expl.ogg', 50, TRUE)
 		adjust_clockwork_power(POWER_WALL_TOTAL)
-		user.drop_item()
 		qdel(src)
 
 /obj/item/clockwork/component/pickup(mob/living/user)

code/game/gamemodes/clock_cult/clock_items/clock_weapons/_call_weapon.dm

@@ -28,7 +28,6 @@
 		if(weapon.loc == owner)
 			owner.visible_message("<span class='danger'>[owner]'s [weapon.name] flickers and disappears!</span>")
 			to_chat(owner, "<span class='brass'>You dismiss [weapon].</span>")
-			owner.drop_item()
 			QDEL_NULL(weapon)
 			weapon_reset(RATVARIAN_SPEAR_COOLDOWN * 0.5)
 			return

code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm

@@ -136,7 +136,7 @@
 		to_chat(user, "<span class='heavy_brass'>\"You reek of blood. You've got a lot of nerve to even look at that slab.\"</span>")
 		user.visible_message("<span class='warning'>A sizzling sound comes from [user]'s hands!</span>", "<span class='userdanger'>[src] suddenly grows extremely hot in your hands!</span>")
 		playsound(get_turf(user), 'sound/weapons/sear.ogg', 50, 1)
-		user.drop_item()
+		user.dropItemToGround(src)
 		user.emote("scream")
 		user.apply_damage(5, BURN, "l_arm")
 		user.apply_damage(5, BURN, "r_arm")

code/game/gamemodes/cult/talisman.dm

@@ -21,7 +21,6 @@
 	if(invoke(user))
 		uses--
 	if(uses <= 0)
-		user.drop_item()
 		qdel(src)
 
 /obj/item/paper/talisman/proc/invoke(mob/living/user, successfuluse = 1)
@@ -182,7 +181,6 @@
 				C.Jitter(15)
 			if(is_servant_of_ratvar(target))
 				target.adjustBruteLoss(15)
-		user.drop_item()
 		qdel(src)
 		return
 	..()
@@ -204,13 +202,13 @@
 	user.equip_to_slot_or_del(new /obj/item/clothing/suit/cultrobes/alt(user), slot_wear_suit)
 	user.equip_to_slot_or_del(new /obj/item/clothing/shoes/cult/alt(user), slot_shoes)
 	user.equip_to_slot_or_del(new /obj/item/storage/backpack/cultpack(user), slot_back)
-	user.drop_item()
+	user.dropItemToGround(src)
 	user.put_in_hands(new /obj/item/melee/cultblade(user))
 	user.put_in_hands(new /obj/item/restraints/legcuffs/bola/cult(user))
 
 /obj/item/paper/talisman/armor/attack(mob/living/target, mob/living/user)
 	if(iscultist(user) && iscultist(target))
-		user.drop_item()
+		user.temporarilyRemoveItemFromInventory(src)
 		invoke(target)
 		qdel(src)
 		return
@@ -335,7 +333,6 @@
 	else
 		to_chat(user, "<span class='warning'>[C] is already bound.</span>")
 	if(uses <= 0)
-		user.drop_item()
 		qdel(src)
 
 /obj/item/restraints/handcuffs/energy/cult //For the talisman of shackling

code/game/gamemodes/devil/true_devil/_true_devil.dm

@@ -184,7 +184,7 @@
 							"<span class='userdanger'>[M] has pushed down [src]!</span>")
 					else
 						if (prob(25))
-							drop_item()
+							dropItemToGround(get_active_held_item())
 							playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
 							visible_message("<span class='danger'>[M] has disarmed [src]!</span>", \
 							"<span class='userdanger'>[M] has disarmed [src]!</span>")

code/game/gamemodes/miniantags/abduction/abduction_surgery.dm

@@ -49,7 +49,7 @@
 
 /datum/surgery_step/gland_insert/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
 	user.visible_message("[user] inserts [tool] into [target].", "<span class ='notice'>You insert [tool] into [target].</span>")
-	user.drop_item()
+	user.temporarilyRemoveItemFromInventory(tool, TRUE)
 	var/obj/item/organ/heart/gland/gland = tool
 	gland.Insert(target, 2)
 	return 1

code/game/gamemodes/miniantags/revenant/revenant.dm

@@ -353,7 +353,7 @@
 		return ..()
 	user.visible_message("<span class='notice'>[user] scatters [src] in all directions.</span>", \
 						 "<span class='notice'>You scatter [src] across the area. The particles slowly fade away.</span>")
-	user.drop_item()
+	user.dropItemToGround(src)
 	scatter()
 
 /obj/item/ectoplasm/revenant/throw_impact(atom/hit_atom)

code/game/gamemodes/miniantags/slaughter/slaughter.dm

@@ -97,7 +97,7 @@
 			return
 	user.visible_message("<span class='warning'>[user]'s eyes flare a deep crimson!</span>", \
 						 "<span class='userdanger'>You feel a strange power seep into your body... you have absorbed the demon's blood-travelling powers!</span>")
-	user.drop_item()
+	user.temporarilyRemoveItemFromInventory(src, TRUE)
 	src.Insert(user) //Consuming the heart literally replaces your heart with a demon heart. H A R D C O R E
 
 /obj/item/organ/heart/demon/Insert(mob/living/carbon/M, special = 0)

code/game/gamemodes/nuclear/nuclear.dm

@@ -91,7 +91,7 @@
 	to_chat(synd_mind.current, "<B>In your hand you will find a special item capable of triggering a greater challenge for your team. Examine it carefully and consult with your fellow operatives before activating it.</B>")
 
 	var/obj/item/device/nuclear_challenge/challenge = new /obj/item/device/nuclear_challenge
-	synd_mind.current.put_in_hands_or_del(challenge)
+	synd_mind.current.put_in_hands(challenge, TRUE)
 
 	var/list/foundIDs = synd_mind.current.search_contents_for(/obj/item/card/id)
 	if(foundIDs.len)
@@ -110,8 +110,7 @@
 		P.info = "The nuclear authorization code is: <b>[nuke_code]</b>"
 		P.name = "nuclear bomb code"
 		var/mob/living/carbon/human/H = synd_mind.current
-		P.forceMove(H.drop_location())
-		H.put_in_hands_or_del(P)
+		H.put_in_hands(P, TRUE)
 		H.update_icons()
 	else
 		nuke_code = "code will be provided later"

code/game/gamemodes/nuclear/nuclearbomb.dm

@@ -105,9 +105,8 @@
 
 /obj/machinery/nuclearbomb/attackby(obj/item/I, mob/user, params)
 	if (istype(I, /obj/item/disk/nuclear))
-		if(!user.drop_item())
+		if(!user.transferItemToLoc(I, src))
 			return
-		I.forceMove(src)
 		auth = I
 		add_fingerprint(user)
 		return
@@ -309,10 +308,8 @@
 				. = TRUE
 		if("insert_disk")
 			if(!auth)
-				var/obj/item/I = usr.get_active_held_item()
-				if(istype(I, /obj/item/disk/nuclear))
-					usr.drop_item()
-					I.forceMove(src)
+				var/obj/item/I = usr.is_holding_item_of_type(/obj/item/disk/nuclear)
+				if(I && usr.transferItemToLoc(I, src))
 					auth = I
 					. = TRUE
 		if("keypad")

code/game/gamemodes/wizard/artefact.dm

@@ -193,8 +193,8 @@
 	H.equip_to_slot_or_del(new hat(H), slot_head)
 	H.equip_to_slot_or_del(new /obj/item/clothing/under/roman(H), slot_w_uniform)
 	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(H), slot_shoes)
-	H.put_in_hands_or_del(new /obj/item/shield/riot/roman(H))
-	H.put_in_hands_or_del(new /obj/item/claymore(H))
+	H.put_in_hands(new /obj/item/shield/riot/roman(H), TRUE)
+	H.put_in_hands(new /obj/item/claymore(H), TRUE)
 	H.equip_to_slot_or_del(new /obj/item/twohanded/spear(H), slot_back)
 
 

code/game/gamemodes/wizard/wizard.dm

@@ -159,7 +159,7 @@
 	wizard_mob.equip_to_slot_or_del(new /obj/item/teleportation_scroll(wizard_mob), slot_r_store)
 	var/obj/item/spellbook/spellbook = new /obj/item/spellbook(wizard_mob)
 	spellbook.owner = wizard_mob
-	wizard_mob.put_in_hands_or_del(spellbook)
+	wizard_mob.put_in_hands(spellbook, TRUE)
 
 	to_chat(wizard_mob, "You will find a list of available spells in your spell book. Choose your magic arsenal carefully.")
 	to_chat(wizard_mob, "The spellbook is bound to you, and others cannot use it.")

code/game/machinery/PDApainter.dm

@@ -46,6 +46,7 @@
 
 /obj/machinery/pdapainter/Destroy()
 	QDEL_NULL(storedpda)
+<<<<<<< HEAD
 	return ..()
 
 /obj/machinery/pdapainter/on_deconstruction()
@@ -103,6 +104,61 @@
 		return ..()
 
 /obj/machinery/pdapainter/deconstruct(disassembled = TRUE)
+=======
+	return ..()
+
+/obj/machinery/pdapainter/on_deconstruction()
+	if(storedpda)
+		storedpda.forceMove(loc)
+		storedpda = null
+
+/obj/machinery/pdapainter/contents_explosion(severity, target)
+	if(storedpda)
+		storedpda.ex_act(severity, target)
+
+/obj/machinery/pdapainter/handle_atom_del(atom/A)
+	if(A == storedpda)
+		storedpda = null
+		update_icon()
+
+/obj/machinery/pdapainter/attackby(obj/item/O, mob/user, params)
+	if(default_unfasten_wrench(user, O))
+		power_change()
+		return
+
+	else if(istype(O, /obj/item/device/pda))
+		if(storedpda)
+			to_chat(user, "<span class='warning'>There is already a PDA inside!</span>")
+			return
+		else if(!user.transferItemToLoc(O, src))
+			return
+		storedpda = O
+		O.add_fingerprint(user)
+		update_icon()
+
+	else if(istype(O, /obj/item/weldingtool) && user.a_intent != INTENT_HARM)
+		var/obj/item/weldingtool/WT = O
+		if(stat & BROKEN)
+			if(WT.remove_fuel(0,user))
+				user.visible_message("[user] is repairing [src].", \
+								"<span class='notice'>You begin repairing [src]...</span>", \
+								"<span class='italics'>You hear welding.</span>")
+				playsound(loc, WT.usesound, 40, 1)
+				if(do_after(user,40*WT.toolspeed, 1, target = src))
+					if(!WT.isOn() || !(stat & BROKEN))
+						return
+					to_chat(user, "<span class='notice'>You repair [src].</span>")
+					playsound(loc, 'sound/items/welder2.ogg', 50, 1)
+					stat &= ~BROKEN
+					obj_integrity = max_integrity
+					update_icon()
+		else
+			to_chat(user, "<span class='notice'>[src] does not need repairs.</span>")
+	else
+		return ..()
+
+/obj/machinery/pdapainter/deconstruct(disassembled = TRUE)
+>>>>>>> b6d349e... Remove drop_item, drop_item_v, put_in_hands_or_del (#31386)
 	if(!(flags_1 & NODECONSTRUCT_1))
 		if(!(stat & BROKEN))
 			stat |= BROKEN

code/game/machinery/camera/camera.dm

@@ -149,10 +149,10 @@
 
 		else if(istype(W, /obj/item/device/analyzer))
 			if(!isXRay())
-				if(!user.drop_item(W))
+				if(!user.temporarilyRemoveItemFromInventory(W))
 					return
-				upgradeXRay()
 				qdel(W)
+				upgradeXRay()
 				to_chat(user, "[msg]")
 			else
 				to_chat(user, "[msg2]")

code/game/machinery/camera/camera_assembly.dm

@@ -109,11 +109,10 @@
 
 	// Upgrades!
 	if(is_type_in_typecache(W, possible_upgrades) && !is_type_in_list(W, upgrades)) // Is a possible upgrade and isn't in the camera already.
-		if(!user.drop_item(W))
+		if(!user.transferItemToLoc(W, src))
 			return
 		to_chat(user, "<span class='notice'>You attach \the [W] into the assembly inner circuits.</span>")
 		upgrades += W
-		W.forceMove(src)
 		return
 
 	// Taking out upgrades

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()
 	..()

code/game/machinery/constructable_frame.dm

@@ -15,6 +15,7 @@
 
 /obj/structure/frame/deconstruct(disassembled = TRUE)
 	if(!(flags_1 & NODECONSTRUCT_1))
+<<<<<<< HEAD
 		new /obj/item/stack/sheet/metal(loc, 5)
 		if(circuit)
 			circuit.forceMove(loc)
@@ -253,6 +254,244 @@
 
 
 /obj/structure/frame/machine/deconstruct(disassembled = TRUE)
+=======
+		new /obj/item/stack/sheet/metal(loc, 5)
+		if(circuit)
+			circuit.forceMove(loc)
+			circuit = null
+	qdel(src)
+
+
+/obj/structure/frame/machine
+	name = "machine frame"
+	var/list/components = null
+	var/list/req_components = null
+	var/list/req_component_names = null // user-friendly names of components
+
+/obj/structure/frame/machine/examine(user)
+	..()
+	if(state == 3 && req_components && req_component_names)
+		var/hasContent = 0
+		var/requires = "It requires"
+
+		for(var/i = 1 to req_components.len)
+			var/tname = req_components[i]
+			var/amt = req_components[tname]
+			if(amt == 0)
+				continue
+			var/use_and = i == req_components.len
+			requires += "[(hasContent ? (use_and ? ", and" : ",") : "")] [amt] [amt == 1 ? req_component_names[tname] : "[req_component_names[tname]]\s"]"
+			hasContent = 1
+
+		if(hasContent)
+			to_chat(user, requires + ".")
+		else
+			to_chat(user, "It does not require any more components.")
+
+/obj/structure/frame/machine/proc/update_namelist()
+	if(!req_components)
+		return
+
+	req_component_names = new()
+	for(var/tname in req_components)
+		if(ispath(tname, /obj/item/stack))
+			var/obj/item/stack/S = tname
+			var/singular_name = initial(S.singular_name)
+			if(singular_name)
+				req_component_names[tname] = singular_name
+			else
+				req_component_names[tname] = initial(S.name)
+		else
+			var/obj/O = tname
+			req_component_names[tname] = initial(O.name)
+
+/obj/structure/frame/machine/proc/get_req_components_amt()
+	var/amt = 0
+	for(var/path in req_components)
+		amt += req_components[path]
+	return amt
+
+/obj/structure/frame/machine/attackby(obj/item/P, mob/user, params)
+	switch(state)
+		if(1)
+			if(istype(P, /obj/item/circuitboard/machine))
+				to_chat(user, "<span class='warning'>The frame needs wiring first!</span>")
+				return
+			else if(istype(P, /obj/item/circuitboard))
+				to_chat(user, "<span class='warning'>This frame does not accept circuit boards of this type!</span>")
+				return
+			if(istype(P, /obj/item/stack/cable_coil))
+				var/obj/item/stack/cable_coil/C = P
+				if(C.get_amount() >= 5)
+					playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1)
+					to_chat(user, "<span class='notice'>You start to add cables to the frame...</span>")
+					if(do_after(user, 20*P.toolspeed, target = src))
+						if(C.get_amount() >= 5 && state == 1)
+							C.use(5)
+							to_chat(user, "<span class='notice'>You add cables to the frame.</span>")
+							state = 2
+							icon_state = "box_1"
+				else
+					to_chat(user, "<span class='warning'>You need five length of cable to wire the frame!</span>")
+				return
+			if(istype(P, /obj/item/screwdriver) && !anchored)
+				playsound(src.loc, P.usesound, 50, 1)
+				user.visible_message("<span class='warning'>[user] disassembles the frame.</span>", \
+									"<span class='notice'>You start to disassemble the frame...</span>", "You hear banging and clanking.")
+				if(do_after(user, 40*P.toolspeed, target = src))
+					if(state == 1)
+						to_chat(user, "<span class='notice'>You disassemble the frame.</span>")
+						var/obj/item/stack/sheet/metal/M = new (loc, 5)
+						M.add_fingerprint(user)
+						qdel(src)
+				return
+			if(istype(P, /obj/item/wrench))
+				to_chat(user, "<span class='notice'>You start [anchored ? "un" : ""]securing [name]...</span>")
+				playsound(src.loc, P.usesound, 75, 1)
+				if(do_after(user, 40*P.toolspeed, target = src))
+					if(state == 1)
+						to_chat(user, "<span class='notice'>You [anchored ? "un" : ""]secure [name].</span>")
+						anchored = !anchored
+				return
+
+		if(2)
+			if(istype(P, /obj/item/wrench))
+				to_chat(user, "<span class='notice'>You start [anchored ? "un" : ""]securing [name]...</span>")
+				playsound(src.loc, P.usesound, 75, 1)
+				if(do_after(user, 40*P.toolspeed, target = src))
+					to_chat(user, "<span class='notice'>You [anchored ? "un" : ""]secure [name].</span>")
+					anchored = !anchored
+				return
+
+			if(istype(P, /obj/item/circuitboard/machine))
+				if(!anchored)
+					to_chat(user, "<span class='warning'>The frame needs to be secured first!</span>")
+					return
+				var/obj/item/circuitboard/machine/B = P
+				if(!user.transferItemToLoc(B, src))
+					return
+				playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1)
+				to_chat(user, "<span class='notice'>You add the circuit board to the frame.</span>")
+				circuit = B
+				icon_state = "box_2"
+				state = 3
+				components = list()
+				req_components = B.req_components.Copy()
+				update_namelist()
+				return
+
+			else if(istype(P, /obj/item/circuitboard))
+				to_chat(user, "<span class='warning'>This frame does not accept circuit boards of this type!</span>")
+				return
+
+			if(istype(P, /obj/item/wirecutters))
+				playsound(src.loc, P.usesound, 50, 1)
+				to_chat(user, "<span class='notice'>You remove the cables.</span>")
+				state = 1
+				icon_state = "box_0"
+				var/obj/item/stack/cable_coil/A = new /obj/item/stack/cable_coil( src.loc )
+				A.amount = 5
+				return
+
+		if(3)
+			if(istype(P, /obj/item/crowbar))
+				playsound(src.loc, P.usesound, 50, 1)
+				state = 2
+				circuit.loc = src.loc
+				components.Remove(circuit)
+				circuit = null
+				if(components.len == 0)
+					to_chat(user, "<span class='notice'>You remove the circuit board.</span>")
+				else
+					to_chat(user, "<span class='notice'>You remove the circuit board and other components.</span>")
+					for(var/atom/movable/A in components)
+						A.loc = src.loc
+				desc = initial(desc)
+				req_components = null
+				components = null
+				icon_state = "box_1"
+				return
+
+			if(istype(P, /obj/item/screwdriver))
+				var/component_check = 1
+				for(var/R in req_components)
+					if(req_components[R] > 0)
+						component_check = 0
+						break
+				if(component_check)
+					playsound(src.loc, P.usesound, 50, 1)
+					var/obj/machinery/new_machine = new src.circuit.build_path(src.loc, 1)
+					new_machine.on_construction()
+					for(var/obj/O in new_machine.component_parts)
+						qdel(O)
+					new_machine.component_parts = list()
+					for(var/obj/O in src)
+						O.loc = null
+						new_machine.component_parts += O
+					circuit.loc = null
+					new_machine.RefreshParts()
+					qdel(src)
+				return
+
+			if(istype(P, /obj/item/storage/part_replacer) && P.contents.len && get_req_components_amt())
+				var/obj/item/storage/part_replacer/replacer = P
+				var/list/added_components = list()
+				var/list/part_list = list()
+
+				//Assemble a list of current parts, then sort them by their rating!
+				for(var/obj/item/stock_parts/co in replacer)
+					part_list += co
+				//Sort the parts. This ensures that higher tier items are applied first.
+				part_list = sortTim(part_list, /proc/cmp_rped_sort)
+
+				for(var/path in req_components)
+					while(req_components[path] > 0 && (locate(path) in part_list))
+						var/obj/item/part = (locate(path) in part_list)
+						added_components[part] = path
+						replacer.remove_from_storage(part, src)
+						req_components[path]--
+						part_list -= part
+
+				for(var/obj/item/stock_parts/part in added_components)
+					components += part
+					to_chat(user, "<span class='notice'>[part.name] applied.</span>")
+				if(added_components.len)
+					replacer.play_rped_sound()
+				return
+
+			if(isitem(P) && get_req_components_amt())
+				for(var/I in req_components)
+					if(istype(P, I) && (req_components[I] > 0))
+						if(istype(P, /obj/item/stack))
+							var/obj/item/stack/S = P
+							var/used_amt = min(round(S.get_amount()), req_components[I])
+
+							if(used_amt && S.use(used_amt))
+								var/obj/item/stack/NS = locate(S.merge_type) in components
+
+								if(!NS)
+									NS = new S.merge_type(src, used_amt)
+									components += NS
+								else
+									NS.add(used_amt)
+
+								req_components[I] -= used_amt
+								to_chat(user, "<span class='notice'>You add [P] to [src].</span>")
+							return
+						if(!user.transferItemToLoc(P, src))
+							break
+						to_chat(user, "<span class='notice'>You add [P] to [src].</span>")
+						components += P
+						req_components[I]--
+						return 1
+				to_chat(user, "<span class='warning'>You cannot add that to the machine!</span>")
+				return 0
+	if(user.a_intent == INTENT_HARM)
+		return ..()
+
+
+/obj/structure/frame/machine/deconstruct(disassembled = TRUE)
+>>>>>>> b6d349e... Remove drop_item, drop_item_v, put_in_hands_or_del (#31386)
 	if(!(flags_1 & NODECONSTRUCT_1))
 		if(state >= 2)
 			new /obj/item/stack/cable_coil(loc , 5)

code/game/machinery/doors/airlock.dm

@@ -1170,10 +1170,9 @@
 			to_chat(user, "<span class='warning'>The maintenance panel is destroyed!</span>")
 			return
 		to_chat(user, "<span class='warning'>You apply [C]. Next time someone opens the door, it will explode.</span>")
-		user.drop_item()
 		panel_open = FALSE
 		update_icon()
-		C.forceMove(src)
+		user.transferItemToLoc(C, src, TRUE)
 		charge = C
 	else if(istype(C, /obj/item/paper) || istype(C, /obj/item/photo))
 		if(note)

code/game/machinery/doors/firedoor.dm

@@ -426,7 +426,6 @@
 					return
 				if(constructionStep != CONSTRUCTION_NOCIRCUIT)
 					return
-				user.drop_item()
 				qdel(C)
 				user.visible_message("<span class='notice'>[user] adds a circuit to [src].</span>", \
 									 "<span class='notice'>You insert and secure [C].</span>")

code/game/machinery/flasher.dm

@@ -63,10 +63,9 @@
 
 	else if (istype(W, /obj/item/device/assembly/flash/handheld))
 		if (!bulb)
-			if(!user.drop_item())
+			if(!user.transferItemToLoc(W, src))
 				return
 			user.visible_message("[user] installs [W] into [src].", "<span class='notice'>You install [W] into [src].</span>")
-			W.forceMove(src)
 			bulb = W
 			power_change()
 		else

code/game/machinery/gulag_item_reclaimer.dm

@@ -33,9 +33,8 @@
 /obj/machinery/gulag_item_reclaimer/attackby(obj/item/I, mob/user)
 	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
@@ -82,18 +81,13 @@
 	switch(action)
 		if("handle_id")
 			if(inserted_id)
-				if(!usr.get_active_held_item())
-					usr.put_in_hands(inserted_id)
-					inserted_id = null
-				else
-					inserted_id.forceMove(get_turf(src))
-					inserted_id = null
+				usr.put_in_hands(inserted_id)
+				inserted_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)
 					inserted_id = I
 		if("release_items")
 			var/mob/M = locate(params["mobref"])

code/game/machinery/iv_drip.dm

@@ -95,10 +95,8 @@
 		if(beaker)
 			to_chat(user, "<span class='warning'>There is already a reagent container loaded!</span>")
 			return
-		if(!user.drop_item())
+		if(!user.transferItemToLoc(W, src))
 			return
-
-		W.forceMove(src)
 		beaker = W
 		to_chat(user, "<span class='notice'>You attach [W] to [src].</span>")
 		update_icon()

code/game/machinery/newscaster.dm

@@ -786,11 +786,9 @@ GLOBAL_LIST_EMPTY(allCasters)
 		else
 			qdel(photo)
 		photo = null
-	if(istype(user.get_active_held_item(), /obj/item/photo))
-		photo = user.get_active_held_item()
-		if(!user.drop_item())
-			return
-		photo.loc = src
+	photo = user.is_holding_item_of_type(/obj/item/photo)
+	if(photo && !user.transferItemToLoc(photo, src))
+		photo = null
 	if(issilicon(user))
 		var/list/nametemp = list()
 		var/find

code/game/machinery/pipe/pipe_dispenser.dm

@@ -71,8 +71,6 @@
 	add_fingerprint(user)
 	if (istype(W, /obj/item/pipe) || istype(W, /obj/item/pipe_meter))
 		to_chat(usr, "<span class='notice'>You put [W] back into [src].</span>")
-		if(!user.drop_item())
-			return
 		qdel(W)
 		return
 	else if (istype(W, /obj/item/wrench))

code/game/machinery/porta_turret/portable_turret_construct.dm

@@ -84,9 +84,8 @@
 		if(PTURRET_INTERNAL_ARMOUR_ON)
 			if(istype(I, /obj/item/gun/energy)) //the gun installation part
 				var/obj/item/gun/energy/E = I
-				if(!user.drop_item())
+				if(!user.transferItemToLoc(E, src))
 					return
-				E.forceMove(src)
 				installed_gun = E
 				to_chat(user, "<span class='notice'>You add [I] to the turret.</span>")
 				build_step = PTURRET_GUN_EQUIPPED
@@ -101,7 +100,7 @@
 		if(PTURRET_GUN_EQUIPPED)
 			if(isprox(I))
 				build_step = PTURRET_SENSORS_ON
-				if(!user.drop_item())
+				if(!user.temporarilyRemoveItemFromInventory(I))
 					return
 				to_chat(user, "<span class='notice'>You add the proximity sensor to the turret.</span>")
 				qdel(I)

code/game/machinery/recharger.dm

@@ -50,9 +50,8 @@
 					to_chat(user, "<span class='notice'>Your gun has no external power connector.</span>")
 					return 1
 
-			if(!user.drop_item())
+			if(!user.transferItemToLoc(G, src))
 				return 1
-			G.loc = src
 			charging = G
 			use_power = ACTIVE_POWER_USE
 			update_icon(scan = TRUE)

code/game/machinery/slotmachine.dm

@@ -83,16 +83,15 @@
 	if(istype(I, /obj/item/coin))
 		var/obj/item/coin/C = I
 		if(prob(2))
-			if(!user.drop_item())
+			if(!user.transferItemToLoc(C, drop_location()))
 				return
-			C.loc = loc
 			C.throw_at(user, 3, 10)
 			if(prob(10))
 				balance = max(balance - SPIN_PRICE, 0)
 			to_chat(user, "<span class='warning'>[src] spits your coin back out!</span>")
 
 		else
-			if(!user.drop_item())
+			if(!user.temporarilyRemoveItemFromInventory(C))
 				return
 			to_chat(user, "<span class='notice'>You insert a [C.cmineral] coin into [src]'s slot!</span>")
 			balance += C.value

code/game/machinery/spaceheater.dm

@@ -140,18 +140,13 @@
 			if(cell)
 				to_chat(user, "<span class='warning'>There is already a power cell inside!</span>")
 				return
-			else
-				// insert cell
-				var/obj/item/stock_parts/cell/C = usr.get_active_held_item()
-				if(istype(C))
-					if(!user.drop_item())
-						return
-					cell = C
-					C.loc = src
-					C.add_fingerprint(usr)
+			else if(!user.transferItemToLoc(I, src))
+				return
+			cell = I
+			I.add_fingerprint(usr)
 
-					user.visible_message("\The [user] inserts a power cell into \the [src].", "<span class='notice'>You insert the power cell into \the [src].</span>")
-					SStgui.update_uis(src)
+			user.visible_message("\The [user] inserts a power cell into \the [src].", "<span class='notice'>You insert the power cell into \the [src].</span>")
+			SStgui.update_uis(src)
 		else
 			to_chat(user, "<span class='warning'>The hatch must be open to insert a power cell!</span>")
 			return

code/game/machinery/suit_storage_unit.dm

@@ -298,32 +298,31 @@
 			if(suit)
 				to_chat(user, "<span class='warning'>The unit already contains a suit!.</span>")
 				return
-			if(!user.drop_item())
+			if(!user.transferItemToLoc(I, src))
 				return
 			suit = I
 		else if(istype(I, /obj/item/clothing/head/helmet))
 			if(helmet)
 				to_chat(user, "<span class='warning'>The unit already contains a helmet!</span>")
 				return
-			if(!user.drop_item())
+			if(!user.transferItemToLoc(I, src))
 				return
 			helmet = I
 		else if(istype(I, /obj/item/clothing/mask))
 			if(mask)
 				to_chat(user, "<span class='warning'>The unit already contains a mask!</span>")
 				return
-			if(!user.drop_item())
+			if(!user.transferItemToLoc(I, src))
 				return
 			mask = I
 		else
 			if(storage)
 				to_chat(user, "<span class='warning'>The auxiliary storage compartment is full!</span>")
 				return
-			if(!user.drop_item())
+			if(!user.transferItemToLoc(I, src))
 				return
 			storage = I
 
-		I.loc = src
 		visible_message("<span class='notice'>[user] inserts [I] into [src]</span>", "<span class='notice'>You load [I] into [src].</span>")
 		update_icon()
 		return

code/game/machinery/syndicatebomb.dm

@@ -150,11 +150,10 @@
 			to_chat(user, "<span class='warning'>The cover is screwed on, it won't pry off!</span>")
 	else if(istype(I, /obj/item/bombcore))
 		if(!payload)
-			if(!user.drop_item())
+			if(!user.transferItemToLoc(I, src))
 				return
 			payload = I
 			to_chat(user, "<span class='notice'>You place [payload] into [src].</span>")
-			payload.loc = src
 		else
 			to_chat(user, "<span class='warning'>[payload] is already loaded into [src]! You'll have to remove it first.</span>")
 	else if(istype(I, /obj/item/weldingtool))
@@ -463,11 +462,10 @@
 		return
 	else if(istype(I, /obj/item/reagent_containers/glass/beaker) || istype(I, /obj/item/reagent_containers/glass/bottle))
 		if(beakers.len < max_beakers)
-			if(!user.drop_item())
+			if(!user.transferItemToLoc(I, src))
 				return
 			beakers += I
 			to_chat(user, "<span class='notice'>You load [src] with [I].</span>")
-			I.loc = src
 		else
 			to_chat(user, "<span class='warning'>The [I] wont fit! The [src] can only hold up to [max_beakers] containers.</span>")
 			return

code/game/machinery/vending.dm

@@ -189,9 +189,8 @@
 		var/obj/item/reagent_containers/food/snacks/S = W
 		if(!S.junkiness)
 			if(!iscompartmentfull(user))
-				if(!user.drop_item())
+				if(!user.transferItemToLoc(W, src))
 					return
-				W.loc = src
 				food_load(W)
 				to_chat(user, "<span class='notice'>You insert [W] into [src]'s chef compartment.</span>")
 		else
@@ -279,9 +278,8 @@
 		if(!premium.len)
 			to_chat(user, "<span class='warning'>[src] doesn't have a coin slot.</span>")
 			return
-		if(!user.drop_item())
+		if(!user.transferItemToLoc(W, src))
 			return
-		W.loc = src
 		coin = W
 		to_chat(user, "<span class='notice'>You insert [W] into [src].</span>")
 		return

code/game/mecha/mecha_defense.dm

@@ -161,7 +161,7 @@
 		var/obj/item/mecha_parts/mecha_equipment/E = W
 		spawn()
 			if(E.can_attach(src))
-				if(!user.drop_item())
+				if(!user.temporarilyRemoveItemFromInventory(W))
 					return
 				E.attach(src)
 				user.visible_message("[user] attaches [W] to [src].", "<span class='notice'>You attach [W] to [src].</span>")
@@ -226,11 +226,10 @@
 	else if(istype(W, /obj/item/stock_parts/cell))
 		if(state==4)
 			if(!cell)
-				if(!user.drop_item())
+				if(!user.transferItemToLoc(W, src))
 					return
 				var/obj/item/stock_parts/cell/C = W
 				to_chat(user, "<span class='notice'>You install the powercell.</span>")
-				C.forceMove(src)
 				cell = C
 				log_message("Powercell installed")
 			else

code/game/objects/effects/effect_system/effects_smoke.dm

@@ -128,7 +128,7 @@
 
 /obj/effect/particle_effect/smoke/bad/smoke_mob(mob/living/carbon/M)
 	if(..())
-		M.drop_item()
+		M.drop_all_held_items()
 		M.adjustOxyLoss(1)
 		M.emote("cough")
 		return 1
@@ -205,7 +205,6 @@
 
 /obj/effect/particle_effect/smoke/sleeping/smoke_mob(mob/living/carbon/M)
 	if(..())
-		M.drop_item()
 		M.Sleeping(200)
 		M.emote("cough")
 		return 1

code/game/objects/items.dm

@@ -531,7 +531,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 				to_chat(M, "<span class='danger'>You become nearsighted!</span>")
 		if(prob(50))
 			if(M.stat != DEAD)
-				if(M.drop_item())
+				if(M.drop_all_held_items())
 					to_chat(M, "<span class='danger'>You drop what you're holding and clutch at your eyes!</span>")
 			M.adjust_blurriness(10)
 			M.Unconscious(20)

code/game/objects/items/handcuffs.dm

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 /obj/item/restraints
 	breakouttime = 600
 
@@ -369,4 +370,378 @@
 		var/obj/item/restraints/legcuffs/beartrap/B = new /obj/item/restraints/legcuffs/beartrap/energy/cyborg(get_turf(hit_atom))
 		B.Crossed(hit_atom)
 		qdel(src)
-	..()
+	..()
+=======
+/obj/item/restraints
+	breakouttime = 600
+
+//Handcuffs
+
+/obj/item/restraints/handcuffs
+	name = "handcuffs"
+	desc = "Use this to keep prisoners in line."
+	gender = PLURAL
+	icon = 'icons/obj/items_and_weapons.dmi'
+	icon_state = "handcuff"
+	lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
+	flags_1 = CONDUCT_1
+	slot_flags = SLOT_BELT
+	throwforce = 0
+	w_class = WEIGHT_CLASS_SMALL
+	throw_speed = 3
+	throw_range = 5
+	materials = list(MAT_METAL=500)
+	origin_tech = "engineering=3;combat=3"
+	breakouttime = 600 //Deciseconds = 60s = 1 minute
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 50)
+	var/cuffsound = 'sound/weapons/handcuffs.ogg'
+	var/trashtype = null //for disposable cuffs
+
+/obj/item/restraints/handcuffs/attack(mob/living/carbon/C, mob/living/carbon/human/user)
+	if(!istype(C))
+		return
+	if(user.disabilities & CLUMSY && prob(50))
+		to_chat(user, "<span class='warning'>Uh... how do those things work?!</span>")
+		apply_cuffs(user,user)
+		return
+
+	// chance of monkey retaliation
+	if(ismonkey(C) && prob(MONKEY_CUFF_RETALIATION_PROB))
+		var/mob/living/carbon/monkey/M
+		M = C
+		M.retaliate(user)
+
+	if(!C.handcuffed)
+		if(C.get_num_arms() >= 2 || C.get_arm_ignore())
+			C.visible_message("<span class='danger'>[user] is trying to put [src.name] on [C]!</span>", \
+								"<span class='userdanger'>[user] is trying to put [src.name] on [C]!</span>")
+
+			playsound(loc, cuffsound, 30, 1, -2)
+			if(do_mob(user, C, 30) && (C.get_num_arms() >= 2 || C.get_arm_ignore()))
+				apply_cuffs(C,user)
+				to_chat(user, "<span class='notice'>You handcuff [C].</span>")
+				SSblackbox.add_details("handcuffs","[type]")
+
+				add_logs(user, C, "handcuffed")
+			else
+				to_chat(user, "<span class='warning'>You fail to handcuff [C]!</span>")
+		else
+			to_chat(user, "<span class='warning'>[C] doesn't have two hands...</span>")
+
+/obj/item/restraints/handcuffs/proc/apply_cuffs(mob/living/carbon/target, mob/user, var/dispense = 0)
+	if(target.handcuffed)
+		return
+
+	if(!user.temporarilyRemoveItemFromInventory(src) && !dispense)
+		return
+
+	var/obj/item/restraints/handcuffs/cuffs = src
+	if(trashtype)
+		cuffs = new trashtype()
+	else if(dispense)
+		cuffs = new type()
+
+	cuffs.forceMove(target)
+	target.handcuffed = cuffs
+
+	target.update_handcuffed()
+	if(trashtype && !dispense)
+		qdel(src)
+	return
+
+/obj/item/restraints/handcuffs/sinew
+	name = "sinew restraints"
+	desc = "A pair of restraints fashioned from long strands of flesh."
+	icon = 'icons/obj/mining.dmi'
+	icon_state = "sinewcuff"
+	item_state = "sinewcuff"
+	breakouttime = 300 //Deciseconds = 30s
+	cuffsound = 'sound/weapons/cablecuff.ogg'
+
+/obj/item/restraints/handcuffs/cable
+	name = "cable restraints"
+	desc = "Looks like some cables tied together. Could be used to tie something up."
+	icon_state = "cuff_red"
+	item_state = "coil_red"
+	lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
+	materials = list(MAT_METAL=150, MAT_GLASS=75)
+	origin_tech = "engineering=2"
+	breakouttime = 300 //Deciseconds = 30s
+	cuffsound = 'sound/weapons/cablecuff.ogg'
+	var/datum/robot_energy_storage/wirestorage = null
+
+/obj/item/restraints/handcuffs/cable/attack(mob/living/carbon/C, mob/living/carbon/human/user)
+	if(!istype(C))
+		return
+	if(wirestorage && wirestorage.energy < 15)
+		to_chat(user, "<span class='warning'>You need at least 15 wire to restrain [C]!</span>")
+		return
+	return ..()
+
+/obj/item/restraints/handcuffs/cable/apply_cuffs(mob/living/carbon/target, mob/user, var/dispense = 0)
+	if(wirestorage)
+		if(!wirestorage.use_charge(15))
+			to_chat(user, "<span class='warning'>You need at least 15 wire to restrain [target]!</span>")
+			return
+		return ..(target, user, 1)
+
+	return ..()
+
+/obj/item/restraints/handcuffs/cable/red
+	icon_state = "cuff_red"
+	item_state = "coil_red"
+
+/obj/item/restraints/handcuffs/cable/yellow
+	icon_state = "cuff_yellow"
+	item_state = "coil_yellow"
+
+/obj/item/restraints/handcuffs/cable/blue
+	icon_state = "cuff_blue"
+	item_state = "coil_blue"
+
+/obj/item/restraints/handcuffs/cable/green
+	icon_state = "cuff_green"
+	item_state = "coil_green"
+
+/obj/item/restraints/handcuffs/cable/pink
+	icon_state = "cuff_pink"
+	item_state = "coil_pink"
+
+/obj/item/restraints/handcuffs/cable/orange
+	icon_state = "cuff_orange"
+	item_state = "coil_orange"
+
+/obj/item/restraints/handcuffs/cable/cyan
+	icon_state = "cuff_cyan"
+	item_state = "coil_cyan"
+
+/obj/item/restraints/handcuffs/cable/white
+	icon_state = "cuff_white"
+	item_state = "coil_white"
+
+/obj/item/restraints/handcuffs/alien
+	icon_state = "handcuffAlien"
+
+/obj/item/restraints/handcuffs/fake
+	name = "fake handcuffs"
+	desc = "Fake handcuffs meant for gag purposes."
+	breakouttime = 10 //Deciseconds = 1s
+
+/obj/item/restraints/handcuffs/fake/kinky
+	name = "kinky handcuffs"
+	desc = "Fake handcuffs meant for erotic roleplay."
+	icon_state = "handcuffGag"
+
+/obj/item/restraints/handcuffs/cable/attackby(obj/item/I, mob/user, params)
+	..()
+	if(istype(I, /obj/item/stack/rods))
+		var/obj/item/stack/rods/R = I
+		if (R.use(1))
+			var/obj/item/wirerod/W = new /obj/item/wirerod
+			remove_item_from_storage(user)
+			user.put_in_hands(W)
+			to_chat(user, "<span class='notice'>You wrap the cable restraint around the top of the rod.</span>")
+			qdel(src)
+		else
+			to_chat(user, "<span class='warning'>You need one rod to make a wired rod!</span>")
+			return
+	else if(istype(I, /obj/item/stack/sheet/metal))
+		var/obj/item/stack/sheet/metal/M = I
+		if(M.get_amount() < 6)
+			to_chat(user, "<span class='warning'>You need at least six metal sheets to make good enough weights!</span>")
+			return
+		to_chat(user, "<span class='notice'>You begin to apply [I] to [src]...</span>")
+		if(do_after(user, 35, target = src))
+			if(M.get_amount() < 6 || !M)
+				return
+			var/obj/item/restraints/legcuffs/bola/S = new /obj/item/restraints/legcuffs/bola
+			M.use(6)
+			user.put_in_hands(S)
+			to_chat(user, "<span class='notice'>You make some weights out of [I] and tie them to [src].</span>")
+			remove_item_from_storage(user)
+			qdel(src)
+	else
+		return ..()
+
+/obj/item/restraints/handcuffs/cable/zipties/cyborg/attack(mob/living/carbon/C, mob/user)
+	if(iscyborg(user))
+		if(!C.handcuffed)
+			playsound(loc, 'sound/weapons/cablecuff.ogg', 30, 1, -2)
+			C.visible_message("<span class='danger'>[user] is trying to put zipties on [C]!</span>", \
+								"<span class='userdanger'>[user] is trying to put zipties on [C]!</span>")
+			if(do_mob(user, C, 30))
+				if(!C.handcuffed)
+					C.handcuffed = new /obj/item/restraints/handcuffs/cable/zipties/used(C)
+					C.update_handcuffed()
+					to_chat(user, "<span class='notice'>You handcuff [C].</span>")
+					add_logs(user, C, "handcuffed")
+			else
+				to_chat(user, "<span class='warning'>You fail to handcuff [C]!</span>")
+
+/obj/item/restraints/handcuffs/cable/zipties
+	name = "zipties"
+	desc = "Plastic, disposable zipties that can be used to restrain temporarily but are destroyed after use."
+	icon_state = "cuff_white"
+	lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
+	materials = list()
+	breakouttime = 450 //Deciseconds = 45s
+	trashtype = /obj/item/restraints/handcuffs/cable/zipties/used
+
+/obj/item/restraints/handcuffs/cable/zipties/used
+	desc = "A pair of broken zipties."
+	icon_state = "cuff_white_used"
+	item_state = "cuff_white"
+
+/obj/item/restraints/handcuffs/cable/zipties/used/attack()
+	return
+
+
+//Legcuffs
+
+/obj/item/restraints/legcuffs
+	name = "leg cuffs"
+	desc = "Use this to keep prisoners in line."
+	gender = PLURAL
+	icon = 'icons/obj/items_and_weapons.dmi'
+	icon_state = "handcuff"
+	lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
+	flags_1 = CONDUCT_1
+	throwforce = 0
+	w_class = WEIGHT_CLASS_NORMAL
+	origin_tech = "engineering=3;combat=3"
+	slowdown = 7
+	breakouttime = 300	//Deciseconds = 30s = 0.5 minute
+
+/obj/item/restraints/legcuffs/beartrap
+	name = "bear trap"
+	throw_speed = 1
+	throw_range = 1
+	icon_state = "beartrap"
+	desc = "A trap used to catch bears and other legged creatures."
+	origin_tech = "engineering=4"
+	var/armed = 0
+	var/trap_damage = 20
+
+/obj/item/restraints/legcuffs/beartrap/Initialize()
+	. = ..()
+	icon_state = "[initial(icon_state)][armed]"
+
+/obj/item/restraints/legcuffs/beartrap/suicide_act(mob/user)
+	user.visible_message("<span class='suicide'>[user] is sticking [user.p_their()] head in the [src.name]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
+	playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1)
+	return (BRUTELOSS)
+
+/obj/item/restraints/legcuffs/beartrap/attack_self(mob/user)
+	..()
+	if(ishuman(user) && !user.stat && !user.restrained())
+		armed = !armed
+		icon_state = "[initial(icon_state)][armed]"
+		to_chat(user, "<span class='notice'>[src] is now [armed ? "armed" : "disarmed"]</span>")
+
+/obj/item/restraints/legcuffs/beartrap/Crossed(AM as mob|obj)
+	if(armed && isturf(src.loc))
+		if(isliving(AM))
+			var/mob/living/L = AM
+			var/snap = 0
+			var/def_zone = "chest"
+			if(iscarbon(L))
+				var/mob/living/carbon/C = L
+				snap = 1
+				if(!C.lying)
+					def_zone = pick("l_leg", "r_leg")
+					if(!C.legcuffed && C.get_num_legs() >= 2) //beartrap can't cuff your leg if there's already a beartrap or legcuffs, or you don't have two legs.
+						C.legcuffed = src
+						src.loc = C
+						C.update_inv_legcuffed()
+						SSblackbox.add_details("handcuffs","[type]")
+			else if(isanimal(L))
+				var/mob/living/simple_animal/SA = L
+				if(SA.mob_size > MOB_SIZE_TINY)
+					snap = 1
+			if(L.movement_type & FLYING)
+				snap = 0
+			if(snap)
+				armed = 0
+				icon_state = "[initial(icon_state)][armed]"
+				playsound(src.loc, 'sound/effects/snap.ogg', 50, 1)
+				L.visible_message("<span class='danger'>[L] triggers \the [src].</span>", \
+						"<span class='userdanger'>You trigger \the [src]!</span>")
+				L.apply_damage(trap_damage,BRUTE, def_zone)
+	..()
+
+/obj/item/restraints/legcuffs/beartrap/energy
+	name = "energy snare"
+	armed = 1
+	icon_state = "e_snare"
+	trap_damage = 0
+	flags_1 = DROPDEL_1
+
+/obj/item/restraints/legcuffs/beartrap/energy/New()
+	..()
+	addtimer(CALLBACK(src, .proc/dissipate), 100)
+
+/obj/item/restraints/legcuffs/beartrap/energy/proc/dissipate()
+	if(!ismob(loc))
+		do_sparks(1, TRUE, src)
+		qdel(src)
+
+/obj/item/restraints/legcuffs/beartrap/energy/attack_hand(mob/user)
+	Crossed(user) //honk
+
+/obj/item/restraints/legcuffs/beartrap/energy/cyborg
+	breakouttime = 20 // Cyborgs shouldn't have a strong restraint
+
+/obj/item/restraints/legcuffs/bola
+	name = "bola"
+	desc = "A restraining device designed to be thrown at the target. Upon connecting with said target, it will wrap around their legs, making it difficult for them to move quickly."
+	icon_state = "bola"
+	breakouttime = 35//easy to apply, easy to break out of
+	gender = NEUTER
+	origin_tech = "engineering=3;combat=1"
+	var/knockdown = 0
+
+/obj/item/restraints/legcuffs/bola/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback)
+	if(!..())
+		return
+	playsound(src.loc,'sound/weapons/bolathrow.ogg', 75, 1)
+
+/obj/item/restraints/legcuffs/bola/throw_impact(atom/hit_atom)
+	if(..() || !iscarbon(hit_atom))//if it gets caught or the target can't be cuffed,
+		return//abort
+	var/mob/living/carbon/C = hit_atom
+	if(!C.legcuffed && C.get_num_legs() >= 2)
+		visible_message("<span class='danger'>\The [src] ensnares [C]!</span>")
+		C.legcuffed = src
+		src.loc = C
+		C.update_inv_legcuffed()
+		SSblackbox.add_details("handcuffs","[type]")
+		to_chat(C, "<span class='userdanger'>\The [src] ensnares you!</span>")
+		C.Knockdown(knockdown)
+
+/obj/item/restraints/legcuffs/bola/tactical//traitor variant
+	name = "reinforced bola"
+	desc = "A strong bola, made with a long steel chain. It looks heavy, enough so that it could trip somebody."
+	icon_state = "bola_r"
+	breakouttime = 70
+	origin_tech = "engineering=4;combat=3"
+	knockdown = 20
+
+/obj/item/restraints/legcuffs/bola/energy //For Security
+	name = "energy bola"
+	desc = "A specialized hard-light bola designed to ensnare fleeing criminals and aid in arrests."
+	icon_state = "ebola"
+	hitsound = 'sound/weapons/taserhit.ogg'
+	w_class = WEIGHT_CLASS_SMALL
+	breakouttime = 60
+
+/obj/item/restraints/legcuffs/bola/energy/throw_impact(atom/hit_atom)
+	if(iscarbon(hit_atom))
+		var/obj/item/restraints/legcuffs/beartrap/B = new /obj/item/restraints/legcuffs/beartrap/energy/cyborg(get_turf(hit_atom))
+		B.Crossed(hit_atom)
+		qdel(src)
+	..()
+>>>>>>> b6d349e... Remove drop_item, drop_item_v, put_in_hands_or_del (#31386)

code/game/objects/items/melee/misc.dm

@@ -233,7 +233,7 @@
 
 /obj/item/melee/supermatter_sword/afterattack(target, mob/user, proximity_flag)
 	if(user && target == user)
-		user.drop_item()
+		user.dropItemToGround(src)
 	if(proximity_flag)
 		consume_everything(target)
 	..()
@@ -243,7 +243,7 @@
 	if(ismob(target))
 		var/mob/M
 		if(src.loc == M)
-			M.drop_item()
+			M.dropItemToGround(src)
 	consume_everything(target)
 
 /obj/item/melee/supermatter_sword/pickup(user)
@@ -267,7 +267,7 @@
 
 /obj/item/melee/supermatter_sword/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] touches [src]'s blade. It looks like [user.p_theyre()] tired of waiting for the radiation to kill [user.p_them()]!</span>")
-	user.drop_item()
+	user.dropItemToGround(src, TRUE)
 	shard.CollidedWith(user)
 
 /obj/item/melee/supermatter_sword/proc/consume_everything(target)

code/game/objects/items/paiwire.dm

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 /obj/item/pai_cable
 	desc = "A flexible coated cable with a universal jack on one end."
 	name = "data cable"
@@ -11,4 +12,18 @@
 		return
 	user.visible_message("[user] inserts [src] into a data port on [M].", "<span class='notice'>You insert [src] into a data port on [M].</span>", "<span class='italics'>You hear the satisfying click of a wire jack fastening into place.</span>")
 	src.loc = M
+=======
+/obj/item/pai_cable
+	desc = "A flexible coated cable with a universal jack on one end."
+	name = "data cable"
+	icon = 'icons/obj/power.dmi'
+	icon_state = "wire1"
+	flags_1 = NOBLUDGEON_1
+	var/obj/machinery/machine
+
+/obj/item/pai_cable/proc/plugin(obj/machinery/M, mob/living/user)
+	if(!user.transferItemToLoc(src, M))
+		return
+	user.visible_message("[user] inserts [src] into a data port on [M].", "<span class='notice'>You insert [src] into a data port on [M].</span>", "<span class='italics'>You hear the satisfying click of a wire jack fastening into place.</span>")
+>>>>>>> b6d349e... Remove drop_item, drop_item_v, put_in_hands_or_del (#31386)
 	machine = M

code/game/objects/items/pneumaticCannon.dm

@@ -122,7 +122,7 @@
 		return
 	if(user.disabilities & CLUMSY && prob(75) && clumsyCheck)
 		user.visible_message("<span class='warning'>[user] loses their grip on [src], causing it to go off!</span>", "<span class='userdanger'>[src] slips out of your hands and goes off!</span>")
-		user.drop_item()
+		user.dropItemToGround(src, TRUE)
 		if(prob(10))
 			target = get_turf(user)
 		else

code/game/objects/items/robot/robot_parts.dm

@@ -254,7 +254,7 @@
 			if(!isturf(loc))
 				to_chat(user, "<span class='warning'>You cannot install[M], the frame has to be standing on the ground to be perfectly precise!</span>")
 				return
-			if(!user.drop_item())
+			if(!user.temporarilyRemoveItemFromInventory(M))
 				to_chat(user, "<span class='warning'>[M] is stuck to your hand!</span>")
 				return
 			qdel(M)

code/game/objects/items/storage/backpack.dm

@@ -48,7 +48,7 @@
 
 /obj/item/storage/backpack/holding/suicide_act(mob/living/user)
 	user.visible_message("<span class='suicide'>[user] is jumping into [src]! It looks like [user.p_theyre()] trying to commit suicide.</span>")
-	user.drop_item()
+	user.dropItemToGround(src, TRUE)
 	user.Stun(100, ignore_canstun = TRUE)
 	sleep(20)
 	playsound(src, "rustle", 50, 1, -5)

code/game/objects/items/storage/boxes.dm

@@ -57,11 +57,9 @@
 	close_all()
 
 	to_chat(user, "<span class='notice'>You fold [src] flat.</span>")
-	var/obj/item/I = new foldable(get_turf(src))
-	user.drop_item()
-	user.put_in_hands(I)
-	user.update_inv_hands()
+	var/obj/item/I = new foldable
 	qdel(src)
+	user.put_in_hands(I)
 
 /obj/item/storage/box/attackby(obj/item/W, mob/user, params)
 	if(istype(W, /obj/item/stack/packageWrap))

code/game/objects/items/toys.dm

@@ -1022,8 +1022,8 @@
 	throwforce = 12 //pelt your enemies to death with lumps of snow
 
 /obj/item/toy/snowball/afterattack(atom/target as mob|obj|turf|area, mob/user)
-	user.drop_item()
-	src.throw_at(target, throw_range, throw_speed)
+	if(user.dropItemToGround(src))
+		throw_at(target, throw_range, throw_speed)
 
 /obj/item/toy/snowball/throw_impact(atom/hit_atom)
 	if(!..())
@@ -1041,8 +1041,8 @@
 	w_class = WEIGHT_CLASS_BULKY //Stops people from hiding it in their bags/pockets
 
 /obj/item/toy/beach_ball/afterattack(atom/target as mob|obj|turf|area, mob/user)
-	user.drop_item()
-	src.throw_at(target, throw_range, throw_speed)
+	if(user.dropItemToGround(src))
+		throw_at(target, throw_range, throw_speed)
 
 /*
  * Xenomorph action figure

code/game/objects/structures.dm

@@ -20,6 +20,7 @@
 
 /obj/structure/Destroy()
 	GLOB.cameranet.updateVisibility(src)
+<<<<<<< HEAD
 	if(smooth)
 		queue_smooth_neighbors(src)
 	return ..()
@@ -61,6 +62,49 @@
 
 /obj/structure/proc/do_climb(atom/movable/A)
 	if(climbable)
+=======
+	if(smooth)
+		queue_smooth_neighbors(src)
+	return ..()
+
+/obj/structure/attack_hand(mob/user)
+	. = ..()
+	add_fingerprint(user)
+	if(structureclimber && structureclimber != user)
+		user.changeNext_move(CLICK_CD_MELEE)
+		user.do_attack_animation(src)
+		structureclimber.Knockdown(40)
+		structureclimber.visible_message("<span class='warning'>[structureclimber.name] has been knocked off the [src]", "You're knocked off the [src]!", "You see [structureclimber.name] get knocked off the [src]</span>")
+	interact(user)
+
+/obj/structure/interact(mob/user)
+	ui_interact(user)
+
+/obj/structure/ui_act(action, params)
+	..()
+	add_fingerprint(usr)
+
+/obj/structure/MouseDrop_T(atom/movable/O, mob/user)
+	. = ..()
+	if(!climbable)
+		return
+	if(user == O && iscarbon(O))
+		if(user.canmove)
+			climb_structure(user)
+			return
+	if ((!( istype(O, /obj/item) ) || user.get_active_held_item() != O))
+		return
+	if(iscyborg(user))
+		return
+	if(!user.drop_all_held_items())
+		return
+	if (O.loc != src.loc)
+		step(O, get_dir(O, src))
+	return
+
+/obj/structure/proc/do_climb(atom/movable/A)
+	if(climbable)
+>>>>>>> b6d349e... Remove drop_item, drop_item_v, put_in_hands_or_del (#31386)
 		density = FALSE
 		. = step(A,get_dir(A,src.loc))
 		density = TRUE

code/game/objects/structures/beds_chairs/chair.dm

@@ -58,14 +58,14 @@
 		playsound(src.loc, W.usesound, 50, 1)
 		deconstruct()
 	else if(istype(W, /obj/item/assembly/shock_kit))
-		if(!user.drop_item())
+		if(!user.temporarilyRemoveItemFromInventory(W))
 			return
 		var/obj/item/assembly/shock_kit/SK = W
 		var/obj/structure/chair/e_chair/E = new /obj/structure/chair/e_chair(src.loc)
 		playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1)
 		E.setDir(dir)
 		E.part = SK
-		SK.loc = E
+		SK.forceMove(E)
 		SK.master = E
 		qdel(src)
 	else

code/game/objects/structures/bedsheet_bin.dm

@@ -27,7 +27,8 @@ LINEN BINS
 		..()
 
 /obj/item/bedsheet/attack_self(mob/user)
-	user.drop_item()
+	if(!user.dropItemToGround(src))
+		return
 	if(layer == initial(layer))
 		layer = ABOVE_MOB_LAYER
 		to_chat(user, "<span class='notice'>You cover yourself with [src].</span>")
@@ -275,18 +276,16 @@ LINEN BINS
 
 /obj/structure/bedsheetbin/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/bedsheet))
-		if(!user.drop_item())
+		if(!user.transferItemToLoc(I, src))
 			return
-		I.loc = src
 		sheets.Add(I)
 		amount++
 		to_chat(user, "<span class='notice'>You put [I] in [src].</span>")
 		update_icon()
 	else if(amount && !hidden && I.w_class < WEIGHT_CLASS_BULKY)	//make sure there's sheets to hide it among, make sure nothing else is hidden in there.
-		if(!user.drop_item())
+		if(!user.transferItemToLoc(I, src))
 			to_chat(user, "<span class='warning'>\The [I] is stuck to your hand, you cannot hide it among the sheets!</span>")
 			return
-		I.loc = src
 		hidden = I
 		to_chat(user, "<span class='notice'>You hide [I] among the sheets.</span>")
 

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

@@ -229,8 +229,7 @@
 									"<span class='notice'>You cut \the [src] apart with \the [W].</span>")
 				deconstruct(TRUE)
 				return 0
-		if(user.drop_item()) // so we put in unlit welder too
-			W.forceMove(loc)
+		if(user.transferItemToLoc(W, drop_location())) // so we put in unlit welder too
 			return 1
 	else if(istype(W, /obj/item/weldingtool) && can_weld_shut)
 		var/obj/item/weldingtool/WT = W

code/game/objects/structures/door_assembly.dm

@@ -602,10 +602,9 @@
 		if(do_after(user, 40, target = src))
 			if( src.state != 1 )
 				return
-			if(!user.drop_item())
+			if(!user.transferItemToLoc(W, src))
 				return
 
-			W.loc = src
 			to_chat(user, "<span class='notice'>You install the airlock electronics.</span>")
 			src.state = 2
 			src.name = "near finished airlock assembly"

code/game/objects/structures/extinguisher.dm

@@ -54,9 +54,8 @@
 		return
 	if(istype(I, /obj/item/extinguisher))
 		if(!stored_extinguisher && opened)
-			if(!user.drop_item())
+			if(!user.transferItemToLoc(I, src))
 				return
-			contents += I
 			stored_extinguisher = I
 			to_chat(user, "<span class='notice'>You place [I] in [src].</span>")
 			update_icon()

code/game/objects/structures/fireaxe.dm

@@ -53,10 +53,9 @@
 			if(F.wielded)
 				to_chat(user, "<span class='warning'>Unwield the [F.name] first.</span>")
 				return
-			if(!user.drop_item())
+			if(!user.transferItemToLoc(F, src))
 				return
 			fireaxe = F
-			F.forceMove(src)
 			to_chat(user, "<span class='caution'>You place the [F.name] back in the [name].</span>")
 			update_icon()
 			return

code/game/objects/structures/girders.dm

@@ -259,9 +259,8 @@
 	else if(istype(W, /obj/item/pipe))
 		var/obj/item/pipe/P = W
 		if (P.pipe_type in list(0, 1, 5))	//simple pipes, simple bends, and simple manifolds.
-			if(!user.drop_item())
+			if(!user.transferItemToLoc(P, drop_location()))
 				return
-			P.loc = src.loc
 			to_chat(user, "<span class='notice'>You fit the pipe into \the [src].</span>")
 	else
 		return ..()

code/game/objects/structures/guncase.dm

@@ -39,9 +39,8 @@
 		return
 	if(istype(I, gun_category) && open)
 		if(LAZYLEN(contents) < capacity)
-			if(!user.drop_item())
+			if(!user.transferItemToLoc(I, src))
 				return
-			I.forceMove(src)
 			to_chat(user, "<span class='notice'>You place [I] in [src].</span>")
 			update_icon()
 		else

code/game/objects/structures/janicart.dm

@@ -32,9 +32,8 @@
 		return 1
 
 /obj/structure/janitorialcart/proc/put_in_cart(obj/item/I, mob/user)
-	if(!user.drop_item())
+	if(!user.transferItemToLoc(I, src))
 		return
-	I.loc = src
 	updateUsrDialog()
 	to_chat(user, "<span class='notice'>You put [I] into [src].</span>")
 	return

code/game/objects/structures/safe.dm

@@ -159,10 +159,9 @@ FLOOR SAFES
 		. = 1 //no afterattack
 		if(I.w_class + space <= maxspace)
 			space += I.w_class
-			if(!user.drop_item())
+			if(!user.transferItemToLoc(I, src))
 				to_chat(user, "<span class='warning'>\The [I] is stuck to your hand, you cannot put it in the safe!</span>")
 				return
-			I.forceMove(src)
 			to_chat(user, "<span class='notice'>You put [I] in [src].</span>")
 			updateUsrDialog()
 			return

code/game/objects/structures/signs.dm

@@ -104,7 +104,6 @@
 							 "<span class='notice'>You attach the sign to [T].</span>")
 		playsound(T, 'sound/items/deconstruct.ogg', 50, 1)
 		new sign_path(T)
-		user.drop_item()
 		qdel(src)
 	else
 		return ..()

code/game/objects/structures/tables_racks.dm

@@ -131,8 +131,7 @@
 		// If the tray IS empty, continue on (tray will be placed on the table like other items)
 
 	if(user.a_intent != INTENT_HARM && !(I.flags_1 & ABSTRACT_1))
-		if(user.drop_item())
-			I.Move(loc)
+		if(user.transferItemToLoc(I, drop_location()))
 			var/list/click_params = params2list(params)
 			//Center the icon where the user clicked.
 			if(!click_params || !click_params["icon-x"] || !click_params["icon-y"])
@@ -439,7 +438,7 @@
 /obj/structure/rack/MouseDrop_T(obj/O, mob/user)
 	if ((!( istype(O, /obj/item) ) || user.get_active_held_item() != O))
 		return
-	if(!user.drop_item())
+	if(!user.dropItemToGround(O))
 		return
 	if(O.loc != src.loc)
 		step(O, get_dir(O, src))
@@ -452,8 +451,7 @@
 		return
 	if(user.a_intent == INTENT_HARM)
 		return ..()
-	if(user.drop_item())
-		W.Move(loc)
+	if(user.transferItemToLoc(W, drop_location()))
 		return 1
 
 /obj/structure/rack/attack_paw(mob/living/user)
@@ -516,7 +514,7 @@
 	building = TRUE
 	to_chat(user, "<span class='notice'>You start constructing a rack...</span>")
 	if(do_after(user, 50, target = user, progress=TRUE))
-		if(!user.drop_item())
+		if(!user.temporarilyRemoveItemFromInventory(src))
 			return
 		var/obj/structure/rack/R = new /obj/structure/rack(user.loc)
 		user.visible_message("<span class='notice'>[user] assembles \a [R].\

code/game/objects/structures/tank_dispenser.dm

@@ -62,9 +62,8 @@
 		to_chat(user, "<span class='notice'>[src] can't hold any more of [I].</span>")
 		return
 
-	if(!user.drop_item())
+	if(!user.transferItemToLoc(I, src))
 		return
-	I.loc = src
 	to_chat(user, "<span class='notice'>You put [I] in [src].</span>")
 	update_icon()
 

code/game/objects/structures/target_stake.dm

@@ -5,6 +5,7 @@
 	icon_state = "target_stake"
 	density = TRUE
 	flags_1 = CONDUCT_1
+<<<<<<< HEAD
 	var/obj/item/target/pinned_target
 
 /obj/structure/target_stake/Destroy()
@@ -52,4 +53,52 @@
 	if(pinned_target)
 		pinned_target.bullet_act(P)
 	else
+=======
+	var/obj/item/target/pinned_target
+
+/obj/structure/target_stake/Destroy()
+	if(pinned_target)
+		pinned_target.nullPinnedLoc()
+	return ..()
+
+/obj/structure/target_stake/proc/nullPinnedTarget()
+	pinned_target = null
+
+/obj/structure/target_stake/Move()
+	..()
+	if(pinned_target)
+		pinned_target.loc = loc
+
+/obj/structure/target_stake/attackby(obj/item/target/T, mob/user)
+	if(pinned_target)
+		return
+	if(istype(T) && user.transferItemToLoc(T, drop_location()))
+		pinned_target = T
+		T.pinnedLoc = src
+		T.density = TRUE
+		T.layer = OBJ_LAYER + 0.01
+		to_chat(user, "<span class='notice'>You slide the target into the stake.</span>")
+
+/obj/structure/target_stake/attack_hand(mob/user)
+	if(pinned_target)
+		removeTarget(user)
+
+/obj/structure/target_stake/proc/removeTarget(mob/user)
+	pinned_target.layer = OBJ_LAYER
+	pinned_target.loc = user.loc
+	pinned_target.nullPinnedLoc()
+	nullPinnedTarget()
+	if(ishuman(user))
+		if(!user.get_active_held_item())
+			user.put_in_hands(pinned_target)
+			to_chat(user, "<span class='notice'>You take the target out of the stake.</span>")
+	else
+		pinned_target.loc = get_turf(user)
+		to_chat(user, "<span class='notice'>You take the target out of the stake.</span>")
+
+/obj/structure/target_stake/bullet_act(obj/item/projectile/P)
+	if(pinned_target)
+		pinned_target.bullet_act(P)
+	else
+>>>>>>> b6d349e... Remove drop_item, drop_item_v, put_in_hands_or_del (#31386)
 		..()

code/game/objects/structures/watercloset.dm

@@ -88,10 +88,9 @@
 			if(w_items + I.w_class > WEIGHT_CLASS_HUGE)
 				to_chat(user, "<span class='warning'>The cistern is full!</span>")
 				return
-			if(!user.drop_item())
+			if(!user.transferItemToLoc(I, src))
 				to_chat(user, "<span class='warning'>\The [I] is stuck to your hand, you cannot put it in the cistern!</span>")
 				return
-			I.loc = src
 			w_items += I.w_class
 			to_chat(user, "<span class='notice'>You carefully place [I] into the cistern.</span>")
 
@@ -173,10 +172,9 @@
 		if(I.w_class > 1)
 			to_chat(user, "<span class='warning'>[I] is too large for the drain enclosure.</span>")
 			return
-		if(!user.drop_item())
+		if(!user.transferItemToLoc(I, src))
 			to_chat(user, "<span class='warning'>\[I] is stuck to your hand, you cannot put it in the drain enclosure!</span>")
 			return
-		I.forceMove(src)
 		hiddenitem = I
 		to_chat(user, "<span class='notice'>You place [I] into the drain enclosure.</span>")
 

code/game/objects/structures/windoor_assembly.dm

@@ -208,11 +208,10 @@
 
 			//Adding airlock electronics for access. Step 6 complete.
 			else if(istype(W, /obj/item/electronics/airlock))
-				if(!user.drop_item())
+				if(!user.transferItemToLoc(W, src))
 					return
 				playsound(loc, W.usesound, 100, 1)
 				user.visible_message("[user] installs the electronics into the airlock assembly.", "<span class='notice'>You start to install electronics into the airlock assembly...</span>")
-				W.loc = src
 
 				if(do_after(user, 40, target = src))
 					if(!src || electronics)

code/game/turfs/simulated/floor/light_floor.dm

@@ -72,7 +72,7 @@
 	if(..())
 		return
 	if(istype(C, /obj/item/light/bulb)) //only for light tiles
-		if(state && user.drop_item())
+		if(state && user.temporarilyRemoveItemFromInventory(C))
 			qdel(C)
 			state = 0 //fixing it by bashing it with a light bulb, fun eh?
 			update_icon()