diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 6fd8a08e1e1..06b6440f756 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -174,6 +174,15 @@
 		return 0
 	if(!..())
 		return 0
+	var/obj/item/hand_item = get_active_hand()
+	if(istype(hand_item, /obj/item/weapon/gun) && A != hand_item)
+		if(a_intent == I_HELP || !ismob(A))
+			visible_message("<b>[src]</b> points to [A] with [hand_item]")
+			return 1
+		A.visible_message("<span class='danger'>[src] points [hand_item] at [A]!</span>",
+											"<span class='userdanger'>[src] points [hand_item] at you!</span>")
+		A << 'sound/weapons/TargetOn.ogg'
+		return 1
 	visible_message("<b>[src]</b> points to [A]")
 	return 1