From ec08c58600eb808272e7619690cfb0f9c1aedbcc Mon Sep 17 00:00:00 2001
From: FinancialGoose <92416224+TheBoondock@users.noreply.github.com>
Date: Sat, 1 Jun 2024 12:55:33 -0400
Subject: [PATCH] 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:
---
 code/game/objects/items/pillow.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/game/objects/items/pillow.dm b/code/game/objects/items/pillow.dm
index 659cc38f58b..f1c96e2baa0 100644
--- a/code/game/objects/items/pillow.dm
+++ b/code/game/objects/items/pillow.dm
@@ -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