From 26df50fb87149109bd567aeeb7a5e426fcfd1cb0 Mon Sep 17 00:00:00 2001 From: Zonespace <41448081+Zonespace27@users.noreply.github.com> Date: Tue, 9 Aug 2022 20:08:48 -0700 Subject: [PATCH] Butcher's meathook is no longer restricted by TRAIT_NOGUNS (#68989) can_trigger_gun always returns TRUE on meathooks, because they aren't real guns so shouldn't be checking if guns can be used. --- code/modules/projectiles/guns/special/meat_hook.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/projectiles/guns/special/meat_hook.dm b/code/modules/projectiles/guns/special/meat_hook.dm index df5ebf0b1e2..4abd38c3a03 100644 --- a/code/modules/projectiles/guns/special/meat_hook.dm +++ b/code/modules/projectiles/guns/special/meat_hook.dm @@ -18,6 +18,9 @@ /obj/item/gun/magic/hook/shoot_with_empty_chamber(mob/living/user) to_chat(user, span_warning("[src] isn't ready to fire yet!")) +/obj/item/gun/magic/hook/can_trigger_gun(mob/living/user) // This isn't really a gun, so it shouldn't be checking for TRAIT_NOGUNS, a firing pin (pinless), or a trigger guard (guardless) + return TRUE + /obj/item/ammo_casing/magic/hook name = "hook" desc = "A hook."