Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-26813

code/modules/surgery/bodyparts/dismemberment.dm

@@ -218,6 +218,14 @@
 		for(var/X in list(owner.glasses, owner.ears, owner.wear_mask, owner.head))
 			var/obj/item/I = X
 			owner.dropItemToGround(I, TRUE)
+
+	//Handle dental implants
+	for(var/datum/action/item_action/hands_free/activate_pill/AP in owner.actions)
+		AP.Remove(owner)
+		var/obj/pill = AP.target
+		if(pill)
+			pill.forceMove(src)
+
 	name = "[owner.real_name]'s head"
 	..()
 
@@ -300,6 +308,14 @@
 		C.real_name = real_name
 	real_name = ""
 	name = initial(name)
+
+	//Handle dental implants
+	for(var/obj/item/weapon/reagent_containers/pill/P in src)
+		for(var/datum/action/item_action/hands_free/activate_pill/AP in P.actions)
+			P.forceMove(C)
+			AP.Grant(C)
+			break
+
 	..()
 
 

code/modules/surgery/bodyparts/head.dm

@@ -48,7 +48,10 @@
 			brain = null
 			update_icon_dropped()
 		else
-			I.loc = T
+			if(istype(I, /obj/item/weapon/reagent_containers/pill))
+				for(var/datum/action/item_action/hands_free/activate_pill/AP in I.actions)
+					qdel(AP)
+			I.forceMove(T)
 
 /obj/item/bodypart/head/update_limb(dropping_limb, mob/living/carbon/source)
 	var/mob/living/carbon/C

code/modules/surgery/dental_implant.dm

@@ -18,10 +18,10 @@
 	user.drop_item()
 	tool.loc = target
 
-	var/datum/action/item_action/hands_free/activate_pill/P = new
+	var/datum/action/item_action/hands_free/activate_pill/P = new(tool)
 	P.button.name = "Activate [tool.name]"
 	P.target = tool
-	P.Grant(target)
+	P.Grant(target)	//The pill never actually goes in an inventory slot, so the owner doesn't inherit actions from it
 
 	user.visible_message("[user] wedges \the [tool] into [target]'s [parse_zone(target_zone)]!", "<span class='notice'>You wedge [tool] into [target]'s [parse_zone(target_zone)].</span>")
 	return 1
@@ -37,6 +37,5 @@
 	if(target.reagents.total_volume)
 		target.reagents.reaction(owner, INGEST)
 		target.reagents.trans_to(owner, target.reagents.total_volume)
-	Remove(owner)
 	qdel(target)
 	return 1

code/modules/surgery/organs/ears.dm

@@ -4,6 +4,7 @@
 	desc = "There are three parts to the ear. Inner, middle and outer. Only one of these parts should be normally visible."
 	zone = "head"
 	slot = "ears"
+	gender = PLURAL
 
 	// `deaf` measures "ticks" of deafness. While > 0, the person is unable
 	// to hear anything.

code/modules/surgery/organs/eyes.dm

@@ -4,6 +4,7 @@
 	desc = "I see you!"
 	zone = "eyes"
 	slot = "eye_sight"
+	gender = PLURAL
 
 	var/sight_flags = 0
 	var/see_in_dark = 2

code/modules/surgery/organs/vocal_cords.dm

@@ -8,6 +8,7 @@
 	icon_state = "appendix"
 	zone = "mouth"
 	slot = "vocal_cords"
+	gender = PLURAL
 	var/list/spans = null
 
 /obj/item/organ/vocal_cords/proc/can_speak_with() //if there is any limitation to speaking with these cords