Merge pull request #13015 from silicons/combat_rework_experimental

Combat v4: Redesigning Stamina, Sprint, Combat mode
This commit is contained in:
BlackMajor
2020-10-11 18:38:53 +13:00
committed by GitHub
48 changed files with 431 additions and 257 deletions
@@ -44,10 +44,9 @@
if(HAS_TRAIT(user, TRAIT_FAST_PUMP))
recentpump = world.time + 2
else
if(!user.UseStaminaBuffer(2, warn = TRUE))
return
recentpump = world.time + 10
if(istype(user))//CIT CHANGE - makes pumping shotguns cost a lil bit of stamina.
user.adjustStaminaLossBuffered(2) //CIT CHANGE - DITTO. make this scale inversely to the strength stat when stats/skills are added
return
/obj/item/gun/ballistic/shotgun/blow_up(mob/user)
. = 0