Skip to content

Commit

Permalink
HOTFIX: Corrected Tackle Halloss (ColonialMarines-Mirror#634)
Browse files Browse the repository at this point in the history
It looks like a 2x multiplier was deleted at some point for the gaussian I used to calculate variance on halloss damage. Corrected this by just doubling the multipliers.
  • Loading branch information
Surrealaser authored and Rohesie committed Nov 7, 2018
1 parent d7adcac commit 115c312
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion code/modules/mob/living/carbon/xenomorph/attack_alien.dm
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,8 @@
"<span class='danger'>You slam [src] to the ground!</span>", null, 5)

playsound(loc, 'sound/weapons/alien_knockdown.ogg', 25, 1)
var/tackle_pain = (rand(M.tackle_damage * 0.10, M.tackle_damage * 0.40) + rand(M.tackle_damage * 0.10, M.tackle_damage * 0.40))

var/tackle_pain = (rand(M.tackle_damage * 0.20, M.tackle_damage * 0.80) + rand(M.tackle_damage * 0.20, M.tackle_damage * 0.80))
if(M.frenzy_aura)
tackle_pain = tackle_pain * (1 + (0.05 * M.frenzy_aura)) //Halloss damage increased by 5% per rank of frenzy aura
if(protection_aura)
Expand Down

0 comments on commit 115c312

Please sign in to comment.