Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cruelty will now respect gun damage multipliers #630

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+1 −1
Open

Cruelty will now respect gun damage multipliers #630

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/modules/projectiles/projectile.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,7 @@
var/mob/living/carbon/human/frer = firer
if(frer.blood)
if(prob(frer.get_total_blood()*10))
damage = initial(damage)*2
damage *= 2
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
damage *= 2
damage == initial(damage) ? damage * 2 : clamp(damage, initial(damage), initial(damage) * 2)

Cruelty should give you double damage of a projectile, at max; not double the damage of any given projectile, including ones that are possibly already increased. Even still, we may nerf it later, because a % double damage chance per stat point is ludicrous, but we'll worry about that down the line.

if(temporary_unstoppable_movement)
temporary_unstoppable_movement = FALSE
movement_type &= ~PHASING
Expand Down