From d85f2261e585a432633fc5ed66bc81324ec85f92 Mon Sep 17 00:00:00 2001 From: hal9000PR <69320440+hal9000PR@users.noreply.github.com> Date: Thu, 8 Jul 2021 22:35:23 +0100 Subject: [PATCH] Fixes firing flamethrowers when you cannot fire guns (#15935) * fixes * code review * code review * Henk review 2 Co-authored-by: Farie82 Co-authored-by: Farie82 --- code/game/objects/items/weapons/flamethrower.dm | 10 +++++++++- code/modules/mob/living/carbon/human/human.dm | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index 60239b0e6fd..64889624a55 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -68,7 +68,15 @@ . = ..() if(flag) return // too close - if(user && user.get_active_hand() == src) // Make sure our user is still holding us + if(!user) + return + if(user.mind?.martial_art?.no_guns) + to_chat(user, "[user.mind.martial_art.no_guns_message]") + return + if(HAS_TRAIT(user, TRAIT_CHUNKYFINGERS)) + to_chat(user, "Your meaty finger is far too large for the trigger guard!") + return + if(user.get_active_hand() == src) // Make sure our user is still holding us var/turf/target_turf = get_turf(target) if(target_turf) var/turflist = getline(user, target_turf) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index f2b55168e0b..ee5b3b561fd 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1744,7 +1744,7 @@ Eyes need to have significantly high darksight to shine unless the mob has the X if(G.trigger_guard == TRIGGER_GUARD_NORMAL) if(HAS_TRAIT(src, TRAIT_CHUNKYFINGERS)) - to_chat(src, "Your meaty finger is much too large for the trigger guard!") + to_chat(src, "Your meaty finger is far too large for the trigger guard!") return FALSE if(mind && mind.martial_art && mind.martial_art.no_guns) //great dishonor to famiry