From e48a8a17e67871524d6f1d56e8b4ed6764cd52b4 Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Tue, 6 Mar 2012 21:23:52 -0700 Subject: [PATCH] Can't target ghosts anymore. --- code/modules/projectiles/gun.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 0c96cd05942..1251fa25a85 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -237,11 +237,11 @@ // if(M.type == /mob) // return FindTarget(M,user,params) var/mob/M = GunTrace(usr.x,usr.y,A.x,A.y,usr.z,usr) - if(M && ismob(M) && !target) + if(M && ismob(M) && isliving(M) && !target) if(!(M.client && M.client.admin_invis)) Aim(M) return - if(ismob(A) && target != A) + if(ismob(A) && isliving(A) && target != A) Aim(A) else if(lock_time < world.time + 10) Fire(A,user,params)