Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12

code/modules/surgery/generic.dm

@@ -15,7 +15,7 @@
 		var/obj/item/organ/external/affected = target.get_organ(target_zone)
 		if (affected == null)
 			return 0
-		if (affected.status & ORGAN_DESTROYED)
+		if (affected.is_stump())
 			return 0
 		if (affected.status & ORGAN_ROBOT)
 			return 0
@@ -285,8 +285,6 @@
 		var/obj/item/organ/external/affected = target.get_organ(target_zone)
 		if (affected == null)
 			return 0
-		if (affected.status & ORGAN_DESTROYED)
-			return 0
 		return !affected.cannot_amputate
 
 	begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)

code/modules/surgery/organs_internal.dm

@@ -278,6 +278,10 @@
 			user << "<span class='danger'>You cannot install a naked organ into a robotic body.</span>"
 			return SURGERY_FAILURE
 
+		if(!target.species)
+			user << "<span class='danger'>You have no idea what species this person is. Report this on the bug tracker.</span>"
+			return SURGERY_FAILURE
+
 		var/o_is = (O.gender == PLURAL) ? "are" : "is"
 		var/o_a =  (O.gender == PLURAL) ? "" : "a "
 		var/o_do = (O.gender == PLURAL) ? "don't" : "doesn't"
@@ -294,6 +298,7 @@
 
 		if(O && affected.organ_tag == O.parent_organ)
 			organ_compatible = 1
+
 		else
 			user << "<span class='warning'>\The [O.organ_tag] [o_do] normally go in \the [affected.name].</span>"
 			return SURGERY_FAILURE

code/modules/surgery/robotics.dm

@@ -393,6 +393,7 @@
 			return SURGERY_FAILURE
 
 		if(!target.should_have_organ("brain"))
+
 			user << "<span class='danger'>You're pretty sure [target.species.name_plural] don't normally have a brain.</span>"
 			return SURGERY_FAILURE