Merge pull request #375 from VampyrBytes/master

couple of fixes

code/game/machinery/computer/cloning.dm

@@ -343,7 +343,7 @@
 	return
 
 /obj/machinery/computer/cloning/proc/scan_mob(mob/living/carbon/human/subject as mob)
-	if ((isnull(subject)) || (!(ishuman(subject))) || (!subject.dna) || (subject.flags & NO_SCAN))
+	if ((isnull(subject)) || (!(ishuman(subject))) || (!subject.dna) || (subject.species.flags & NO_SCAN))
 		scantemp = "Error: Unable to locate valid genetic data."
 		return
 	if (subject.brain_op_stage == 4.0)

code/modules/organs/organ_external.dm

@@ -604,8 +604,9 @@ Note that amputating the affected organ does in fact remove the infection from t
 		switch(body_part)
 			if(HEAD)
 				if(owner.species.flags & IS_SYNTHETIC)
-					organ= new /obj/item/weapon/organ/head/posi(owner.loc, owner)
-					owner.death()
+					if(owner.mind)
+						organ= new /obj/item/weapon/organ/head/posi(owner.loc, owner)
+						owner.death()
 				else if(SKELETON in owner.mutations)
 					organ= new /obj/item/weapon/skeleton/head(owner.loc)
 				else