From 750dc608fcd4b684197ebf6bdea1b068935c9439 Mon Sep 17 00:00:00 2001 From: Chinsky Date: Fri, 16 Nov 2012 13:11:12 +0400 Subject: [PATCH] Should prevent cloned Skrells and cats losing ears/tentacles after cloning. --- code/datums/organs/organ_external.dm | 4 ++-- code/game/machinery/cloning.dm | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/datums/organs/organ_external.dm b/code/datums/organs/organ_external.dm index 1b738584afd..4e44edf173d 100644 --- a/code/datums/organs/organ_external.dm +++ b/code/datums/organs/organ_external.dm @@ -122,7 +122,7 @@ if(status & ORGAN_BROKEN) owner.emote("scream") - + if(used_weapon) add_autopsy_data(used_weapon, brute + burn) owner.updatehealth() @@ -464,7 +464,7 @@ W = new wound_type(damage) // Possibly trigger an internal wound, too. - if(damage > 10 && prob(damage) && type != "BURN") + if(damage > 10 && prob(damage)) var/datum/wound/internal_bleeding/I = new (15) wounds += I diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 678783887d7..cba4e84c484 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -190,7 +190,8 @@ randmutb(H) //Sometimes the clones come out wrong. H.f_style = "Shaved" - H.h_style = pick("Bedhead", "Bedhead 2", "Bedhead 3") + if(mrace == "none") //no more xenos losing ears/tentacles + H.h_style = pick("Bedhead", "Bedhead 2", "Bedhead 3") if(H.dna) H.dna.mutantrace = mrace