Merge branch 'Ghommie-cit15' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit15

2019-06-02 22:50:02 +02:00
parent a0898a779a 7e10b4bed9
commit 6be3496d36
1 changed files with 2 additions and 1 deletions
--- a/code/game/objects/items/stunbaton.dm
+++ b/code/game/objects/items/stunbaton.dm
@@ -231,6 +231,7 @@
 	sparkler.activate_cooldown = 5

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