Fixes SNPCs thinking a bullet attack was a melee attack (which obviou…

…sly causes issues with this system)
SedentaryQuill · Jul 1, 2015 · 4eba0b0 · 4eba0b0
1 parent 9f8a4be
commit 4eba0b0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/code/modules/mob/interactive.dm b/code/modules/mob/interactive.dm
@@ -114,7 +114,8 @@
 /mob/living/carbon/human/interactive/bullet_act(var/obj/item/projectile/P)
 	var/potentialAssault = locate(/mob/living) in view(2,P.starting)
 	if(potentialAssault)
-		attacked_by(P,potentialAssault)
+		retal = 1
+		retal_target = potentialAssault
 	..()
 
 /mob/living/carbon/human/interactive/New()

diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
@@ -792,7 +792,7 @@ Sorry Giacom. Please don't be mad :(
 			I = image(r_hand.icon,A,r_hand.icon_state,A.layer+1)
 	if(I)
 		var/list/viewing = list()
-		for(var/mob/M in view(A))
+		for(var/mob/M in viewers(A))
 			if(M.client)
 				viewing |= M.client
 		flick_overlay(I,viewing,5)