mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-12 15:45:25 +01:00
Merge pull request #16147 from S34NW/rad_damage_normalise
Increases most radiation dose amounts
This commit is contained in:
@@ -53,3 +53,5 @@ 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
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -989,6 +989,8 @@
|
||||
|
||||
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)
|
||||
|
||||
@@ -312,7 +312,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))
|
||||
var/rads = (DETONATION_RADS * (sqrt(1 / (get_dist(L, src) + 1)) * sqrt(power / 5))) / (RAD_DOSAGE_MULTIPLIER * 0.25)
|
||||
L.rad_act(rads)
|
||||
|
||||
var/turf/T = get_turf(src)
|
||||
@@ -525,7 +525,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) )
|
||||
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
|
||||
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.
|
||||
|
||||
@@ -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 ..()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user