diff --git a/code/__DEFINES/radiation.dm b/code/__DEFINES/radiation.dm index 25ae77cf83d3..9f7ea16f7b28 100644 --- a/code/__DEFINES/radiation.dm +++ b/code/__DEFINES/radiation.dm @@ -53,5 +53,3 @@ Ask ninjanomnom if they're around #define RAD_GEIGER_MEASURE_SMOOTHING 5 #define RAD_GEIGER_GRACE_PERIOD 2 - -#define RAD_DOSAGE_MULTIPLIER 10 // This is used to increase radiation dosage taken during rad_act() calls diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm index c746ed396721..9bdd3d569aba 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 * RAD_DOSAGE_MULTIPLIER) * blocked, 0) + radiation += max(effect * blocked, 0) if(SLUR) Slur(effect * blocked) if(STUTTER) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 5f795f0adf9e..0e56570abee4 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -989,8 +989,6 @@ amount -= RAD_BACKGROUND_RADIATION // This will always be at least 1 because of how skin protection is calculated - amount *= RAD_DOSAGE_MULTIPLIER - var/blocked = getarmor(null, "rad") if(amount > RAD_BURN_THRESHOLD) diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index 8054ccfc45ed..11dc0f656ad9 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -329,7 +329,7 @@ //Hilariously enough, running into a closet should make you get hit the hardest. var/mob/living/carbon/human/H = mob H.hallucination += max(50, min(300, DETONATION_HALLUCINATION * sqrt(1 / (get_dist(mob, src) + 1)))) - var/rads = (DETONATION_RADS * (sqrt(1 / (get_dist(L, src) + 1)) * sqrt(power / 5))) / (RAD_DOSAGE_MULTIPLIER * 0.25) + var/rads = DETONATION_RADS * sqrt(1 / (get_dist(L, src) + 1)) L.rad_act(rads) var/turf/T = get_turf(src) @@ -542,7 +542,7 @@ l.hallucination += power * hallucination_power * D l.hallucination = clamp(l.hallucination, 0, 200) for(var/mob/living/l in range(src, round((power / 100) ** 0.25))) - var/rads = ((power / 10) * sqrt( 1 / max(get_dist(l, src), 1) )) / RAD_DOSAGE_MULTIPLIER //RAD_DOSAGE_MULTIPLIER is used so that the SM doesn't absolutely murder you with rads + var/rads = (power / 10) * sqrt( 1 / max(get_dist(l, src), 1) ) l.rad_act(rads) //Transitions between one function and another, one we use for the fast inital startup, the other is used to prevent errors with fusion temperatures. diff --git a/code/modules/reagents/chemistry/reagents/toxins.dm b/code/modules/reagents/chemistry/reagents/toxins.dm index a831dc057bce..4256b27e7620 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 < 800) + if(M.radiation < 80) M.apply_effect(4, IRRADIATE) return ..()