From a746786ee0554ac4464025e258b65536fb5de650 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Mon, 11 Jan 2016 20:56:00 -0500 Subject: [PATCH] Clone Damage Fix --- code/modules/mob/living/carbon/human/human_damage.dm | 2 +- code/modules/reagents/oldchem/reagents/reagents_med.dm | 1 + html/changelogs/clone-damage-mccloud.yml | 8 ++++++++ 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/clone-damage-mccloud.yml diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index 242c8793491..e088434d7e3 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -142,7 +142,7 @@ /mob/living/carbon/human/adjustCloneLoss(var/amount) ..() - if(species.flags & (NO_SCAN)) + if(species.flags & (NO_DNA_RAD)) cloneloss = 0 return diff --git a/code/modules/reagents/oldchem/reagents/reagents_med.dm b/code/modules/reagents/oldchem/reagents/reagents_med.dm index 1a43b01f0e7..630f9c90c94 100644 --- a/code/modules/reagents/oldchem/reagents/reagents_med.dm +++ b/code/modules/reagents/oldchem/reagents/reagents_med.dm @@ -113,6 +113,7 @@ /datum/reagent/rezadone/on_mob_life(mob/living/M) M.setCloneLoss(0) //Rezadone is almost never used in favor of cryoxadone. Hopefully this will change that. + M.adjustCloneLoss(-1) //What? We just set cloneloss to 0. Why? Simple; this is so external organs properly unmutate. M.heal_organ_damage(1,1) M.status_flags &= ~DISFIGURED ..() diff --git a/html/changelogs/clone-damage-mccloud.yml b/html/changelogs/clone-damage-mccloud.yml new file mode 100644 index 00000000000..f0c9bcfc040 --- /dev/null +++ b/html/changelogs/clone-damage-mccloud.yml @@ -0,0 +1,8 @@ + +author: Fox McCloud + +delete-after: True + +changes: + - bugfix: "Fixes Rezadone not clearing mutated organs." + - tweak: "Clone damage immunity removed from Slime People, Shadowlings, Golems, and Vox" \ No newline at end of file