diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index c1960bde597..f95c388c214 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -211,6 +211,9 @@ if(HAS_TRAIT(L, TRAIT_PACIFISM) && selected.harmful) to_chat(L, "You don't want to harm other living beings!") return + if(user.mind?.martial_art?.no_guns) + to_chat(L, "[L.mind.martial_art.no_guns_message]") + return selected.action(target, params) else if(selected && selected.is_melee()) if(isliving(target) && selected.harmful && HAS_TRAIT(L, TRAIT_PACIFISM))