Merge pull request #16147 from S34NW/rad_damage_normalise

Increases most radiation dose amounts
This commit is contained in:
variableundefined
2021-07-25 09:15:40 -04:00
committed by GitHub
5 changed files with 8 additions and 4 deletions
+1 -1
View File
@@ -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)
+2
View File
@@ -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)