From 896021c967ec5d10d4bef534fd5c43d6b2e646d9 Mon Sep 17 00:00:00 2001 From: VampyrBytes Date: Sun, 10 Aug 2014 11:11:21 +0100 Subject: [PATCH] couple of fixes fixes MP's ending up with 2 heads on death fixes cloning machine cloning species that are meant to be uncloneable --- code/game/machinery/computer/cloning.dm | 2 +- code/modules/organs/organ_external.dm | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 660c4d0ec74..32bc1d50cc7 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/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) diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index a87734c2150..c744c431d10 100644 --- a/code/modules/organs/organ_external.dm +++ b/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