diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 7f0098bafac..1b49f5cd28b 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -59,15 +59,14 @@
 		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("<b>[src]</b> points to [A] with [hand_item]")
-				return 1
-			A.visible_message("<span class='warning'><b>[src] points [hand_item] at [A]!</span>",
-												"<span class='danger'><font size=4><b>[src] points [hand_item] at you!</span>")
+	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>")
+		return 1
 	visible_message("<b>[src]</b> points to [A]")
 	return 1