cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-30 08:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

[NO GBP] Style meter fixes (#75090)

Browse Source 
## About The Pull Request
Fixes:

- Crusher mark score applying to attacked corpses
- Parrying not working, in 2 different forms
- The style bar not being accurate with >= 600 style points

## Why It's Good For The Game
Bugs bad

## Changelog
🆑
fix: Style meter parrying works again
fix: Style meter bar now works correctly with very high style point
count
/🆑
This commit is contained in:
Zonespace
2023-05-02 18:42:42 +02:00
committed by GitHub
parent 4ea4078d1d
commit c3ff5a5180
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/projectile.dm
+2 -1
View File
@@ -402,13 +402,14 @@
return FALSE
/// Called when a mob with PARRY_TRAIT clicks on this projectile or the tile its on, reflecting the projectile within 17 degrees and increasing the bullet's stats.
/// Called when a mob with PARRY_TRAIT clicks on this projectile or the tile its on, reflecting the projectile within 7 degrees and increasing the bullet's stats.
/obj/projectile/proc/on_parry(mob/user, list/modifiers)
if(SEND_SIGNAL(user, COMSIG_LIVING_PROJECTILE_PARRIED, src) & INTERCEPT_PARRY_EFFECTS)
return
parried = TRUE
set_angle(dir2angle(user.dir) + rand(-3, 3))
firer = user
speed *= 0.8 // Go 20% faster when parried
damage *= 1.15 // And do 15% more damage
add_atom_colour(COLOR_RED_LIGHT, TEMPORARY_COLOUR_PRIORITY)