Skip to content

Commit

Permalink
[MIRROR] Pillow now consumes stamina in both unwielded and wielded st…
Browse files Browse the repository at this point in the history
…ates (#2785)

* Pillow now consumes stamina in both unwielded and wielded states (#83444)

## About The Pull Request
There was some issue about players being kept in stamcrit via stamina
damage refreshing the timer. @Watermelon914 has confirmed that refresh
mechanic is ok but only with stamina weapon with limited charges, pillow
does not have charges in its unwielded state so I have added some. Now
there is a limited amount of hits you can make before being stam crit
yourself. Self damage for wielded state have also been increased to
create a trade off between dealing more damage and how much self damage
you take.
## Why It's Good For The Game
## Changelog
:cl:
balance: Attack with a pillow now consumes 5 stamina regardless of
wielded or not.
/:cl:

* Pillow now consumes stamina in both unwielded and wielded states

---------

Co-authored-by: FinancialGoose <[email protected]>
Co-authored-by: NovaBot13 <[email protected]>
  • Loading branch information
3 people authored and StealsThePRs committed Jun 1, 2024
1 parent e5c22db commit a32d6e7
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion code/game/objects/items/pillow.dm
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@
if(!iscarbon(target_mob))
return
if(bricked || HAS_TRAIT(src, TRAIT_WIELDED))
user.apply_damage(5, STAMINA) // when hitting with such force we should prolly be getting tired too
hit_sound = 'sound/items/pillow_hit2.ogg'
else
hit_sound = 'sound/items/pillow_hit.ogg'
user.apply_damage(5, STAMINA) //Had to be done so one person cannot keep multiple people stam critted
last_fighter = user
playsound(user, hit_sound, 80) //the basic 50 vol is barely audible

Expand Down

0 comments on commit a32d6e7

Please sign in to comment.