From 2787fb14dfb64869dd0c656b73fdf04a12c7b84b Mon Sep 17 00:00:00 2001 From: S34NW <12197162+S34NW@users.noreply.github.com> Date: Thu, 10 Jun 2021 10:06:17 +0100 Subject: [PATCH] Also fixes radiation causing reagents --- code/modules/mob/living/damage_procs.dm | 2 +- code/modules/reagents/chemistry/reagents/toxins.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm index 9bdd3d569ab..c746ed39672 100644 --- a/code/modules/mob/living/damage_procs.dm +++ b/code/modules/mob/living/damage_procs.dm @@ -87,7 +87,7 @@ Paralyse(effect * blocked) if(IRRADIATE) if(!HAS_TRAIT(src, TRAIT_RADIMMUNE)) - radiation += max(effect * blocked, 0) + radiation += max((effect * RAD_DOSAGE_MULTIPLIER) * blocked, 0) if(SLUR) Slur(effect * blocked) if(STUTTER) diff --git a/code/modules/reagents/chemistry/reagents/toxins.dm b/code/modules/reagents/chemistry/reagents/toxins.dm index c286c6a8ae4..856ba4a7293 100644 --- a/code/modules/reagents/chemistry/reagents/toxins.dm +++ b/code/modules/reagents/chemistry/reagents/toxins.dm @@ -159,7 +159,7 @@ taste_description = "the colour blue and regret" /datum/reagent/radium/on_mob_life(mob/living/M) - if(M.radiation < 80) + if(M.radiation < 800) M.apply_effect(4, IRRADIATE) return ..()