From 1c1e60c60ab948138f186fca71abeac4b42d2fc0 Mon Sep 17 00:00:00 2001 From: Killian <49700375+KillianKirilenko@users.noreply.github.com> Date: Fri, 14 Apr 2023 09:22:58 +0100 Subject: [PATCH] Update shock_maul.dm --- code/game/objects/items/weapons/melee/shock_maul.dm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/melee/shock_maul.dm b/code/game/objects/items/weapons/melee/shock_maul.dm index bcbe102c5e6..69896c885dc 100644 --- a/code/game/objects/items/weapons/melee/shock_maul.dm +++ b/code/game/objects/items/weapons/melee/shock_maul.dm @@ -163,6 +163,8 @@ . += "The concussion maul does not have a power source installed." /obj/item/weapon/melee/shock_maul/attackby(obj/item/weapon/W, mob/user) + if(!user.IsAdvancedToolUser()) + return if(istype(W, /obj/item/weapon/cell)) if(istype(W, /obj/item/weapon/cell/device)) if(!bcell) @@ -178,7 +180,9 @@ /obj/item/weapon/melee/shock_maul/attack_hand(mob/user as mob) if(user.get_inactive_hand() == src) - if(bcell) + if(!user.IsAdvancedToolUser()) + return + else if(bcell) bcell.update_icon() user.put_in_hands(bcell) bcell = null @@ -191,6 +195,8 @@ return ..() /obj/item/weapon/melee/shock_maul/attack_self(mob/user) + if(!user.IsAdvancedToolUser()) + return if(!status && bcell && bcell.charge >= hitcost) if(do_after(user, 2 SECONDS)) status = 1