fixes

2020-07-21 11:46:17 -07:00
parent 692656b02d
commit 4d48abf3a6
17 changed files with 31 additions and 46 deletions
@@ -357,11 +357,9 @@
 	if(user.a_intent == INTENT_HARM) //Flogging
 		if(bayonet)
 			M.attackby(bayonet, user)
-			attack_delay_done = TRUE
 			return
 		else
 			return ..()
-	attack_delay_done = TRUE //we are firing the gun, not bashing people with its butt.

 /obj/item/gun/attack_obj(obj/O, mob/user)
 	if(user.a_intent == INTENT_HARM)