Merge pull request #9104 from Sishen1542/tbaton

classic & telebaton no longer have attack delay

code/game/objects/items/melee/misc.dm

@@ -229,7 +229,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

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)