From 6cfbab9e2e43800792676766efe4cb5fb43dbbdd Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Sun, 28 May 2017 23:15:47 -0700 Subject: [PATCH] Update gun.dm (#27776) --- code/modules/projectiles/gun.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 89baa173c1a..d9a0ee78a2a 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -297,7 +297,9 @@ if(bayonet) M.attackby(bayonet, user) return - return ..() + else + return ..() + return /obj/item/weapon/gun/attack_obj(obj/O, mob/user) if(user.a_intent == INTENT_HARM)