Merge pull request #8432 from Ghommie/Ghommie-cit15

Buffs stunprods to not have a cooldown
2019-06-08 01:03:01 -07:00
parent 89d1d74d9d 6be3496d36
commit 68ef76e09a
2 changed files with 7 additions and 5 deletions
@@ -222,14 +222,15 @@
 	hitcost = 2000
 	throw_hit_chance = 10
 	slot_flags = ITEM_SLOT_BACK
-	var/obj/item/assembly/igniter/sparkler = 0
+	var/obj/item/assembly/igniter/sparkler

 /obj/item/melee/baton/cattleprod/Initialize()
 	. = ..()
 	sparkler = new (src)
+	sparkler.activate_cooldown = 5

 /obj/item/melee/baton/cattleprod/baton_stun()
-	if(sparkler.activate())
-		..()
+	sparkler?.activate()
+	. = ..()

-#undef STUNBATON_CHARGE_LENIENCY
+#undef STUNBATON_CHARGE_LENIENCY