Skip to content

Commit

Permalink
fixes pellet clouds dealing insane wounds (probably?) (tgstation#72359)
Browse files Browse the repository at this point in the history
## About The Pull Request
pellet clouds multiplied the wound roll they do by your amount of armor
instead of decreasing it
this meant that while they did normal stuff to someone naked

![image](https://user-images.githubusercontent.com/23585223/209995707-0371be35-9f24-410b-a441-e06ab9b054ba.png)
they did this to nukies

![image](https://user-images.githubusercontent.com/23585223/209995733-026c1c52-ae65-4860-b68d-890391451b9d.png)
and they did this to something like the admin modsuit

![image](https://user-images.githubusercontent.com/23585223/209995678-08715ac0-5be7-4e05-b750-e1f94d33f394.png)


## Why It's Good For The Game
nukies no longer get hit by 1 stray pellet and lose all their blood

## Changelog
:cl:
fix: fixed pellet clouds (buckshot, improv shells) dealing insane wounds
to armored people
/:cl:
  • Loading branch information
Fikou authored Dec 31, 2022
1 parent 4f407be commit df6f5e4
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion code/datums/components/pellet_cloud.dm
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@
if(armor_factor > 0)
if(initial(P.weak_against_armour) && armor_factor >= 0)
armor_factor *= ARMOR_WEAKENED_MULTIPLIER
damage_dealt *= armor_factor
damage_dealt *= max(0, 1 - armor_factor*0.01)

hit_part.painless_wound_roll(wound_type, damage_dealt, w_bonus, bw_bonus, initial(P.sharpness))

Expand Down

0 comments on commit df6f5e4

Please sign in to comment.