From f6baaf8c5864e1c6d0600f7fdc06d5631241f163 Mon Sep 17 00:00:00 2001 From: Sishen Date: Wed, 14 Aug 2019 17:06:58 -0400 Subject: [PATCH] honk honk --- code/game/objects/items/melee/misc.dm | 4 ++-- modular_citadel/code/game/objects/items/melee/misc.dm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm index 643002551d..a44f49bafc 100644 --- a/code/game/objects/items/melee/misc.dm +++ b/code/game/objects/items/melee/misc.dm @@ -226,7 +226,7 @@ target.LAssailant = null else target.LAssailant = user - cooldown = world.time + 40 + cooldown = world.time user.adjustStaminaLossBuffered(getweight())//CIT CHANGE - makes swinging batons cost stamina /obj/item/melee/classic_baton/telescopic @@ -242,7 +242,7 @@ item_flags = NONE force = 0 on = FALSE - cooldown = 10 + cooldown = 0 /obj/item/melee/classic_baton/telescopic/suicide_act(mob/user) var/mob/living/carbon/human/H = user diff --git a/modular_citadel/code/game/objects/items/melee/misc.dm b/modular_citadel/code/game/objects/items/melee/misc.dm index 6a53adcc1f..48c221696e 100644 --- a/modular_citadel/code/game/objects/items/melee/misc.dm +++ b/modular_citadel/code/game/objects/items/melee/misc.dm @@ -4,7 +4,7 @@ var/hardstun_ds = 1 var/softstun_ds = 0 var/stam_dmg = 30 - cooldown = 20 + cooldown = 0 total_mass = 3.75 /obj/item/melee/classic_baton/attack(mob/living/target, mob/living/user)