removes the removed so we can remove while we remove

code/modules/surgery/limb_reattach.dm

@@ -141,7 +141,7 @@
 	E.status &= ~ORGAN_DESTROYED
 	var/obj/item/organ/external/stump = target.organs_by_name["limb stump"]
 	if(stump)
-		stump.removed(target)
+		stump.remove(target)
 	if(E.children)
 		for(var/obj/item/organ/external/C in E.children)
 			C.status &= ~ORGAN_DESTROYED
@@ -189,7 +189,7 @@
 				continue
 			var/obj/item/organ/external/stump = target.organs_by_name["limb stump"]
 			if(stump)
-				stump.removed(target)
+				stump.remove(target)
 			var/new_limb_type = organ_data["path"]
 			var/obj/item/organ/external/new_limb = new new_limb_type(target)
 			new_limb.robotize(L.model_info)

code/modules/surgery/organs/organ.dm

@@ -256,7 +256,7 @@ var/list/organ_cache = list()
 		if(3.0)
 			take_damage(0,3)
 
-/obj/item/organ/proc/removed(var/mob/living/user)
+/obj/item/organ/proc/remove(var/mob/living/user)
 	if(!istype(owner))
 		return
 

code/modules/surgery/organs/organ_external.dm

@@ -661,7 +661,7 @@ Note that amputating the affected organ does in fact remove the infection from t
 				"<span class='danger'>You hear the [gore_sound].</span>")
 
 	var/mob/living/carbon/human/victim = owner //Keep a reference for post-removed().
-	removed(null, ignore_children)
+	remove(null, ignore_children)
 	victim.traumatic_shock += 30
 
 	wounds.Cut()
@@ -847,7 +847,7 @@ Note that amputating the affected organ does in fact remove the infection from t
 /obj/item/organ/external/proc/open_enough_for_surgery()
 	return (encased ? (open == 3) : (open == 2))
 
-/obj/item/organ/external/removed(var/mob/living/user, var/ignore_children)
+/obj/item/organ/external/remove(var/mob/living/user, var/ignore_children)
 
 	if(!owner)
 		return
@@ -865,13 +865,13 @@ Note that amputating the affected organ does in fact remove the infection from t
 	// Attached organs also fly off.
 	if(!ignore_children)
 		for(var/obj/item/organ/external/O in children)
-			O.removed()
+			O.remove()
 			if(O)
 				O.forceMove(src)
 
 	// Grab all the internal giblets too.
 	for(var/obj/item/organ/organ in internal_organs)
-		organ.removed()
+		organ.remove()
 		organ.forceMove(src)
 
 	release_restraints(victim)

code/modules/surgery/organs/organ_icon.dm

@@ -36,7 +36,7 @@ var/global/list/limb_icon_cache = list()
 	var/obj/item/organ/internal/eyes/eyes = owner.get_int_organ(/obj/item/organ/internal/eyes)//owner.internal_organs_by_name["eyes"]
 	if(eyes) eyes.update_colour()
 
-/obj/item/organ/external/head/removed()
+/obj/item/organ/external/head/remove()
 	get_icon()
 	..()
 

code/modules/surgery/organs/organ_internal.dm

@@ -59,9 +59,6 @@
 	if(organ_action_name)
 		action_button_name = null
 
-/obj/item/organ/internal/removed(mob/living/carbon/M)
-	remove(owner)
-	..()
 
 /obj/item/organ/internal/replaced(var/mob/living/carbon/human/target,var/obj/item/organ/external/affected)
     insert(target)

code/modules/surgery/organs/organ_stump.dm

@@ -18,7 +18,7 @@
 /obj/item/organ/external/stump/is_stump()
 	return 1
 
-/obj/item/organ/external/stump/removed()
+/obj/item/organ/external/stump/remove()
 	..()
 	qdel(src)
 

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

@@ -131,7 +131,7 @@
 	parent_organ = "chest"
 	var/can_intake_reagents = 1
 
-/obj/item/organ/external/diona/head/removed()
+/obj/item/organ/external/diona/head/remove()
 	if(owner)
 		owner.unEquip(owner.head)
 		owner.unEquip(owner.l_ear)

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

@@ -83,7 +83,7 @@
 	amputation_point = "left ankle"
 	can_stand = 1
 
-/obj/item/organ/external/foot/removed()
+/obj/item/organ/external/foot/remove()
 	if(owner.shoes) owner.unEquip(owner.shoes)
 	..()
 
@@ -108,7 +108,7 @@
 	amputation_point = "left wrist"
 	can_grasp = 1
 
-/obj/item/organ/external/hand/removed()
+/obj/item/organ/external/hand/remove()
 	if(owner.gloves)
 		owner.unEquip(owner.gloves)
 	..()
@@ -136,7 +136,7 @@
 	encased = "skull"
 	var/can_intake_reagents = 1
 
-/obj/item/organ/external/head/removed()
+/obj/item/organ/external/head/remove()
 	if(owner)
 		if(!istype(dna))
 			dna = owner.dna.Clone()

code/modules/surgery/surgery.dm

@@ -142,12 +142,12 @@
 
 	if(allowed_mob)//can i just remove this and/or change it?
 		for(var/species in allowed_mob)
-			if(target.species.name == species)
+			if(target.get_species() == species)
 				return 1
 
 	if(disallowed_mob)
 		for(var/species in disallowed_mob)
-			if(target.species.name == species)
+			if(target.get_species() == species)
 				return 0
 
 	return 1