From 4705a89676fb73a1e38c2cb922b550ad12e373f8 Mon Sep 17 00:00:00 2001 From: SteelSlayer Date: Mon, 18 Nov 2019 15:22:15 -0600 Subject: [PATCH] Makes cluwning ignore brain damage modifiers Update organ_internal.dm --- code/datums/spells/cluwne.dm | 2 +- code/modules/mob/living/carbon/human/human_damage.dm | 5 +++-- code/modules/surgery/organs/organ_internal.dm | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/code/datums/spells/cluwne.dm b/code/datums/spells/cluwne.dm index 6a87419886c..620b64812ee 100644 --- a/code/datums/spells/cluwne.dm +++ b/code/datums/spells/cluwne.dm @@ -17,7 +17,7 @@ var/obj/item/organ/internal/brain/cluwne/idiot_brain = new idiot_brain.insert(src, make_cluwne = 0) idiot_brain.dna = dna.Clone() - setBrainLoss(80) + setBrainLoss(80, ignore_brain_mod = TRUE) set_nutrition(9000) overeatduration = 9000 Confused(30) diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index 71a3ae3e87c..c844e7a593a 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -39,7 +39,7 @@ update_stat("adjustBrainLoss") return STATUS_UPDATE_STAT -/mob/living/carbon/human/setBrainLoss(amount, updating = TRUE) +/mob/living/carbon/human/setBrainLoss(amount, updating = TRUE, ignore_brain_mod = FALSE) if(status_flags & GODMODE) return STATUS_UPDATE_NONE //godmode @@ -47,7 +47,8 @@ var/obj/item/organ/internal/brain/sponge = get_int_organ(/obj/item/organ/internal/brain) if(sponge) if(dna.species && amount > 0) - amount = amount * dna.species.brain_mod + if(!ignore_brain_mod) + amount = amount * dna.species.brain_mod sponge.damage = Clamp(amount, 0, 120) if(sponge.damage >= 120) visible_message("[src] goes limp, [p_their()] facial expression utterly blank.") diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm index 98ed11672fb..333fa485e91 100644 --- a/code/modules/surgery/organs/organ_internal.dm +++ b/code/modules/surgery/organs/organ_internal.dm @@ -283,7 +283,7 @@ /obj/item/organ/internal/honktumor/cursed/on_life() //No matter what you do, no matter who you are, no matter where you go, you're always going to be a fat, stuttering dimwit. ..() - owner.setBrainLoss(80) + owner.setBrainLoss(80, ignore_brain_mod = TRUE) owner.set_nutrition(9000) owner.overeatduration = 9000