From 4c857e446a9284ac7592f7786f8ffd64edcbb8b0 Mon Sep 17 00:00:00 2001 From: MoreRobustThanYou Date: Thu, 2 Nov 2017 05:25:40 -0400 Subject: [PATCH] You can now use banhammers as a weapon (#32270) * You can now use banhammers as a weapon * Update weaponry.dm --- code/game/objects/items/weaponry.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index 7c5022304b..7b7c9c8ee5 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -5,6 +5,7 @@ icon_state = "toyhammer" slot_flags = SLOT_BELT throwforce = 0 + force = 1 w_class = WEIGHT_CLASS_TINY throw_speed = 3 throw_range = 7 @@ -20,10 +21,11 @@ /obj/item/banhammer/attack(mob/M, mob/user) if(user.zone_selected == "head") M.visible_message("[user] are stroking the head of [M] with a bangammer", "[user] are stroking the head with a bangammer", "you hear a bangammer stroking a head"); - else M.visible_message("[M] has been banned FOR NO REISIN by [user]", "You have been banned FOR NO REISIN by [user]", "you hear a banhammer banning someone") playsound(loc, 'sound/effects/adminhelp.ogg', 15) //keep it at 15% volume so people don't jump out of their skin too much + if(user.a_intent != INTENT_HELP) + return ..(M, user) /obj/item/sord name = "\improper SORD"