From b2eea5e3f47a3f5a7d6c046a5fb21d3702f9e422 Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Sun, 26 May 2019 04:11:52 +0200 Subject: [PATCH 1/2] Sorry, web edit because I didn't commit the ?. --- code/game/objects/items/stunbaton.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/stunbaton.dm b/code/game/objects/items/stunbaton.dm index d6f6bc58fd..1a6f9ad3ab 100644 --- a/code/game/objects/items/stunbaton.dm +++ b/code/game/objects/items/stunbaton.dm @@ -210,5 +210,5 @@ sparkler.activate_cooldown = 5 /obj/item/melee/baton/cattleprod/baton_stun() - sparkler.activate() + sparkler?.activate() return ..() From 7e10b4bed9bf3d7b4d2238c51109b6a5983de34e Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Sun, 26 May 2019 22:03:38 +0200 Subject: [PATCH 2/2] Update code/game/objects/items/stunbaton.dm Co-Authored-By: deathride58 --- code/game/objects/items/stunbaton.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/stunbaton.dm b/code/game/objects/items/stunbaton.dm index 1a6f9ad3ab..e55368b91c 100644 --- a/code/game/objects/items/stunbaton.dm +++ b/code/game/objects/items/stunbaton.dm @@ -211,4 +211,4 @@ /obj/item/melee/baton/cattleprod/baton_stun() sparkler?.activate() - return ..() + . = ..()