From 35fe448b38dfb1e96d1b1eef9f09490a23716930 Mon Sep 17 00:00:00 2001 From: Regen Date: Sat, 30 Apr 2022 16:54:32 +0200 Subject: [PATCH] You can no longer use mech ranged weapons if you have a melee-only martial arts (#17659) * You can no longer use mech ranged weapons if you have a melee-only martial arts * Update code/game/mecha/mecha.dm Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com> * Update code/game/mecha/mecha.dm Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com> Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com> --- code/game/mecha/mecha.dm | 3 +++ 1 file changed, 3 insertions(+) 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))