From 49f9b48d156ca990fd68267d785631690e24e889 Mon Sep 17 00:00:00 2001 From: Tayyyyyyy Date: Thu, 25 May 2017 15:17:38 -0700 Subject: [PATCH] Visibly message when someone points a gun at something --- code/modules/mob/living/living.dm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 525559e8e6c..7f0098bafac 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -59,6 +59,15 @@ return 0 if(!..()) return 0 + if(ishuman(src)) + var/obj/item/hand_item = src.get_active_hand() + if(hand_item && istype(hand_item, /obj/item/weapon/gun) && A != hand_item) + if(src.a_intent == I_HELP || !ismob(A)) + visible_message("[src] points to [A] with [hand_item]") + return 1 + A.visible_message("[src] points [hand_item] at [A]!", + "[src] points [hand_item] at you!") + return 1 visible_message("[src] points to [A]") return 1