From c5c0b6cc7434e27382b83cdd94ecd9cd8cbe83a0 Mon Sep 17 00:00:00 2001
From: KorPhaeron <kortgstation@gmail.com>
Date: Fri, 18 Dec 2015 22:41:13 -0600
Subject: [PATCH] Extra checks for grey tide

---
 code/game/objects/items/weapons/twohanded.dm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm
index f0c2cde3211..a5d722fdbc1 100644
--- a/code/game/objects/items/weapons/twohanded.dm
+++ b/code/game/objects/items/weapons/twohanded.dm
@@ -426,9 +426,13 @@
 
 /obj/item/weapon/twohanded/spear/grey_tide/afterattack(atom/movable/AM, mob/living/user, proximity)
 	..()
+	if(!proximity)
+		return
 	user.faction |= "greytide(\ref[user])"
 	if(istype(AM, /mob/living))
 		var/mob/living/L = AM
+		if(istype (L, /mob/living/simple_animal/hostile/illusion))
+			return
 		if(!L.stat && prob(50))
 			var/mob/living/simple_animal/hostile/illusion/M = new(user.loc)
 			M.faction = user.faction.Copy()