diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 85307e5b6e..b5e752cc6b 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -780,6 +780,8 @@ H.apply_damage(10, BRUTE, BODY_ZONE_HEAD) else visible_message("[user] headbutts the airlock. Good thing [user.p_theyre()] wearing a helmet.") + else + return ..() /obj/machinery/door/airlock/attempt_wire_interaction(mob/user) if(security_level) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index bdfc999f6f..43eae2db1b 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -167,6 +167,8 @@ /obj/item/gun/afterattack(atom/target, mob/living/user, flag, params) . = ..() + if(!CheckAttackCooldown(user, target)) + return process_afterattack(target, user, flag, params) /obj/item/gun/proc/process_afterattack(atom/target, mob/living/user, flag, params)