further conversion

code/modules/surgery/limb_reattach.dm

@@ -32,7 +32,7 @@
 	if(ishuman(target))
 		var/mob/living/carbon/human/H = target
 		var/obj/item/organ/external/affected = H.get_organ(user.zone_sel.selecting)
-		if(target.get_species() == "Machine")
+		if(ismachine(target))
 			// RIP bi-centennial man
 			return 0
 		if(!affected)

code/modules/surgery/organs/organ_external.dm

@@ -279,7 +279,8 @@ This function completely restores a damaged organ to perfect condition.
 	for(var/obj/item/organ/external/EO in contents)
 		EO.rejuvenate()
 
-	owner.updatehealth()
+	if(owner)
+		owner.updatehealth()
 	update_icon()
 	if(!owner)
 		processing_objects |= src

code/modules/surgery/other.dm

@@ -303,7 +303,7 @@
 	..()
 
 /datum/surgery_step/internal/dethrall/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
-	if(target.get_species() == "Lesser Shadowling") //Empowered thralls cannot be deconverted
+	if(isshadowlinglesser(target)) //Empowered thralls cannot be deconverted
 		to_chat(target, "<span class='shadowling'><b><i>NOT LIKE THIS!</i></b></span>")
 		user.visible_message("<span class='warning'>[target] suddenly slams upward and knocks down [user]!</span>", \
 							 "<span class='userdanger'>[target] suddenly bolts up and slams you with tremendous force!</span>")

code/modules/surgery/plastic_surgery.dm

@@ -24,7 +24,7 @@
 
 /datum/surgery_step/reshape_face/end_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
 	var/obj/item/organ/external/head/head = target.get_organ(target_zone)
-	var/species_names = target.get_species()
+	var/species_names = target.dna.species.name
 	if(head.disfigured)
 		head.disfigured = FALSE
 		user.visible_message("[user] successfully restores [target]'s appearance!", "<span class='notice'>You successfully restore [target]'s appearance.</span>")

code/modules/surgery/surgery.dm

@@ -67,10 +67,6 @@
 	//How much blood this step can get on surgeon. 1 - hands, 2 - full body.
 	var/blood_level = 0
 
-	var/list/allowed_mob = list()
-	var/list/disallowed_mob = list()
-
-
 /datum/surgery_step/proc/try_op(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
 	var/success = 0
 	if(accept_hand)
@@ -146,19 +142,8 @@
 // Checks if this step applies to the user mob at all
 /datum/surgery_step/proc/is_valid_target(mob/living/carbon/human/target)
 	if(!hasorgans(target))
-		return 0
-
-	if(allowed_mob)//can i just remove this and/or change it?
-		for(var/species in allowed_mob)
-			if(target.get_species() == species)
-				return 1
-
-	if(disallowed_mob)
-		for(var/species in disallowed_mob)
-			if(target.get_species() == species)
-				return 0
-
-	return 1
+		return FALSE
+	return TRUE
 
 // checks whether this step can be applied with the given user and target
 /datum/surgery_step/proc/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)