From a8e446647658cb13f8da6591a90161e2a154ef1c Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Sun, 21 Mar 2021 18:16:22 -0500 Subject: [PATCH 1/2] sigh --- code/modules/mob/living/carbon/human/human_helpers.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm index 5f30d902b1..7ff8ab51be 100644 --- a/code/modules/mob/living/carbon/human/human_helpers.dm +++ b/code/modules/mob/living/carbon/human/human_helpers.dm @@ -115,13 +115,13 @@ . = ..() if(!.) return + if(HAS_TRAIT(src, TRAIT_NOGUNS)) + to_chat(src, "Your fingers don't fit in the trigger guard!") + return FALSE 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!") return FALSE - if(HAS_TRAIT(src, TRAIT_NOGUNS)) - to_chat(src, "Your fingers don't fit in the trigger guard!") - return FALSE /mob/living/carbon/human/proc/get_bank_account() RETURN_TYPE(/datum/bank_account) From 722b50088ab2fb2d2c41c405d6e0b29d63c71f7b Mon Sep 17 00:00:00 2001 From: Hatterhat <31829017+Hatterhat@users.noreply.github.com> Date: Sun, 21 Mar 2021 19:26:34 -0500 Subject: [PATCH 2/2] message tweak Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com> --- code/modules/mob/living/carbon/human/human_helpers.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm index 7ff8ab51be..3e65bb6e66 100644 --- a/code/modules/mob/living/carbon/human/human_helpers.dm +++ b/code/modules/mob/living/carbon/human/human_helpers.dm @@ -116,7 +116,7 @@ if(!.) return if(HAS_TRAIT(src, TRAIT_NOGUNS)) - to_chat(src, "Your fingers don't fit in the trigger guard!") + to_chat(src, "You can't bring yourself to use a ranged weapon!") return FALSE if(G.trigger_guard == TRIGGER_GUARD_NORMAL) if(HAS_TRAIT(src, TRAIT_CHUNKYFINGERS))