MERGE CONFLICT TIME

FOOOOOOOOOOXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX

code/modules/surgery/organs/organ_external.dm

@@ -65,16 +65,16 @@
 	if(parent && parent.children)
 		parent.children -= src
 
-	if(children)
-		for(var/obj/item/organ/external/C in children)
-			qdel(C)
-
 	if(internal_organs)
 		for(var/obj/item/organ/internal/O in internal_organs)
 			internal_organs -= O
-			O.remove(owner)
+			O.remove(owner,special = 1)
 			//qdel(O)
 
+	if(children)
+		for(var/obj/item/organ/external/C in children)
+			qdel(C)
+
 	return ..()
 
 /obj/item/organ/external/attackby(obj/item/weapon/W as obj, mob/user as mob)

code/modules/surgery/organs/subtypes/standard.dm

@@ -150,6 +150,11 @@
 			owner.update_fhair()
 	..()
 
+/obj/item/organ/external/head/replaced()
+	name = limb_name
+
+	..()
+
 /obj/item/organ/external/head/take_damage(brute, burn, sharp, edge, used_weapon = null, list/forbidden_limbs = list())
 	..(brute, burn, sharp, edge, used_weapon, forbidden_limbs)
 	if (!disfigured)