From 38a9e89687f9bca33a4b13093bf62623ffeeeb92 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Thu, 23 Jul 2020 09:49:56 -0700 Subject: [PATCH] ok bet --- code/game/machinery/doors/firedoor.dm | 1 - code/modules/projectiles/gun.dm | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 015bb0126a..2d41575e70 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -82,7 +82,6 @@ return TRUE return FALSE - /obj/machinery/door/firedoor/power_change() if(powered(power_channel)) stat &= ~NOPOWER diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 43eae2db1b..1c0721a98f 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -169,6 +169,7 @@ . = ..() if(!CheckAttackCooldown(user, target)) return + user.DelayNextAction() process_afterattack(target, user, flag, params) /obj/item/gun/proc/process_afterattack(atom/target, mob/living/user, flag, params)