Merge pull request #6185 from Citadel-Station-13/upstream-merge-36816

[MIRROR] Fixes mutant bodypart assignments

code/modules/surgery/organs/ears.dm

@@ -96,5 +96,6 @@
 	..()
 	if(istype(H))
 		color = H.hair_color
+		H.dna.features["ears"] = "None"
 		H.dna.species.mutant_bodyparts -= "ears"
 		H.update_body()

code/modules/surgery/organs/tails.dm

@@ -30,12 +30,11 @@
 /obj/item/organ/tail/cat/Remove(mob/living/carbon/human/H,  special = 0)
 	..()
 	if(istype(H))
+		H.dna.features["tail_human"] = "None"
 		H.dna.species.mutant_bodyparts -= "tail_human"
-		tail_type = H.dna.features["tail_human"]
 		color = H.hair_color
 		H.update_body()
 
-
 /obj/item/organ/tail/lizard
 	name = "lizard tail"
 	desc = "A severed lizard tail. Somewhere, no doubt, a lizard hater is very pleased with themselves."