Remove drop_item, drop_item_v, put_in_hands_or_del

code/modules/surgery/cavity_implant.dm

@@ -29,9 +29,8 @@
 			return 0
 		else
 			user.visible_message("[user] stuffs [tool] into [target]'s [target_zone]!", "<span class='notice'>You stuff [tool] into [target]'s [target_zone].</span>")
-			user.drop_item()
+			user.transferItemToLoc(tool, target, TRUE)
 			CH.cavity_item = tool
-			tool.loc = target
 			return 1
 	else
 		if(IC)

code/modules/surgery/dental_implant.dm

@@ -15,8 +15,7 @@
 	if(!istype(tool))
 		return 0
 
-	user.drop_item()
-	tool.loc = target
+	user.transferItemToLoc(tool, target, TRUE)
 
 	var/datum/action/item_action/hands_free/activate_pill/P = new(tool)
 	P.button.name = "Activate [tool.name]"

code/modules/surgery/limb_augmentation.dm

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 
 /////AUGMENTATION SURGERIES//////
 
@@ -57,6 +58,66 @@
 		qdel(tool)
 		target.update_body_parts()
 		target.updatehealth()
+=======
+
+/////AUGMENTATION SURGERIES//////
+
+
+//SURGERY STEPS
+
+/datum/surgery_step/replace
+	name = "sever muscles"
+	implements = list(/obj/item/scalpel = 100, /obj/item/wirecutters = 55)
+	time = 32
+
+
+/datum/surgery_step/replace/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+	user.visible_message("[user] begins to sever the muscles on [target]'s [parse_zone(user.zone_selected)].", "<span class ='notice'>You begin to sever the muscles on [target]'s [parse_zone(user.zone_selected)]...</span>")
+
+
+/datum/surgery_step/add_limb
+	name = "replace limb"
+	implements = list(/obj/item/bodypart = 100)
+	time = 32
+	var/obj/item/bodypart/L = null // L because "limb"
+
+
+/datum/surgery_step/add_limb/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+	var/obj/item/bodypart/aug = tool
+	if(aug.status != BODYPART_ROBOTIC)
+		to_chat(user, "<span class='warning'>that's not an augment silly!</span>")
+		return -1
+	if(aug.body_zone != target_zone)
+		to_chat(user, "<span class='warning'>[tool] isn't the right type for [parse_zone(target_zone)].</span>")
+		return -1
+	L = surgery.operated_bodypart
+	if(L)
+		user.visible_message("[user] begins to augment [target]'s [parse_zone(user.zone_selected)].", "<span class ='notice'>You begin to augment [target]'s [parse_zone(user.zone_selected)]...</span>")
+	else
+		user.visible_message("[user] looks for [target]'s [parse_zone(user.zone_selected)].", "<span class ='notice'>You look for [target]'s [parse_zone(user.zone_selected)]...</span>")
+
+
+//ACTUAL SURGERIES
+
+/datum/surgery/augmentation
+	name = "augmentation"
+	steps = list(/datum/surgery_step/incise, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/retract_skin, /datum/surgery_step/replace, /datum/surgery_step/saw, /datum/surgery_step/add_limb)
+	species = list(/mob/living/carbon/human)
+	possible_locs = list("r_arm","l_arm","r_leg","l_leg","chest","head")
+	requires_real_bodypart = TRUE
+
+//SURGERY STEP SUCCESSES
+
+/datum/surgery_step/add_limb/success(mob/user, mob/living/carbon/target, target_zone, obj/item/bodypart/tool, datum/surgery/surgery)
+	if(L)
+		user.visible_message("[user] successfully augments [target]'s [parse_zone(target_zone)]!", "<span class='notice'>You successfully augment [target]'s [parse_zone(target_zone)].</span>")
+		L.change_bodypart_status(BODYPART_ROBOTIC, TRUE)
+		L.icon = tool.icon
+		L.max_damage = tool.max_damage
+		qdel(tool)
+		target.update_body_parts()
+		target.updatehealth()
+>>>>>>> b6d349e... Remove drop_item, drop_item_v, put_in_hands_or_del (#31386)
 		target.update_hair()
 		add_logs(user, target, "augmented", addition="by giving him new [parse_zone(target_zone)] INTENT: [uppertext(user.a_intent)]")
 	else

code/modules/surgery/organ_manipulation.dm

@@ -127,7 +127,7 @@
 			tool = I
 		else
 			I = tool
-		user.drop_item()
+		user.temporarilyRemoveItemFromInventory(I, TRUE)
 		I.Insert(target)
 		user.visible_message("[user] inserts [tool] into [target]'s [parse_zone(target_zone)]!",
 			"<span class='notice'>You insert [tool] into [target]'s [parse_zone(target_zone)].</span>")

code/modules/surgery/organs/autosurgeon.dm

@@ -49,9 +49,8 @@
 		else if(!uses)
 			to_chat(user, "<span class='notice'>[src] has already been used up.</span>")
 			return
-		if(!user.drop_item())
+		if(!user.transferItemToLoc(I, src))
 			return
-		I.forceMove(src)
 		storedorgan = I
 		to_chat(user, "<span class='notice'>You insert the [I] into [src].</span>")
 	else if(istype(I, /obj/item/screwdriver))

code/modules/surgery/organs/heart.dm

@@ -89,7 +89,7 @@
 /obj/item/organ/heart/cursed/attack(mob/living/carbon/human/H, mob/living/carbon/human/user, obj/target)
 	if(H == user && istype(H))
 		playsound(user,'sound/effects/singlebeat.ogg',40,1)
-		user.drop_item()
+		user.temporarilyRemoveItemFromInventory(src, TRUE)
 		Insert(user)
 	else
 		return ..()

code/modules/surgery/organs/organ_internal.dm

@@ -92,10 +92,9 @@
 		if(status == ORGAN_ORGANIC)
 			var/obj/item/reagent_containers/food/snacks/S = prepare_eat()
 			if(S)
-				H.drop_item()
-				H.put_in_active_hand(S)
-				S.attack(H, H)
 				qdel(src)
+				if(H.put_in_active_hand(S))
+					S.attack(H, H)
 	else
 		..()
 

code/modules/surgery/prosthetic_replacement.dm

@@ -63,9 +63,8 @@
 		tool.desc = "A container for holding body parts."
 		tool.cut_overlays()
 		tool = tool.contents[1]
-	if(istype(tool, /obj/item/bodypart))
+	if(istype(tool, /obj/item/bodypart) && user.temporarilyRemoveItemFromInventory(tool))
 		var/obj/item/bodypart/L = tool
-		user.drop_item()
 		L.attach_limb(target)
 		if(organ_rejection_dam)
 			target.adjustToxLoss(organ_rejection_dam)