From 4bb28836384b5654db5f67d308f2e2c9b4ce2a98 Mon Sep 17 00:00:00 2001
From: CitadelStationBot <citadelstationcommunity@gmail.com>
Date: Mon, 29 May 2017 01:27:52 -0500
Subject: [PATCH] Fixes gun rapid-melee attack exploit (#1276)

---
 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 89baa173c1..d9a0ee78a2 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)