From cca0d9f8d3fa062879bbe6463583838ae21e8cd3 Mon Sep 17 00:00:00 2001 From: "vageyenaman@gmail.com" Date: Tue, 19 Jul 2011 18:22:08 +0000 Subject: [PATCH] Fixed a bug: ghosts can now not be shot by projectiles ever. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1892 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/objects/items/weapons/guns_new.dm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/code/game/objects/items/weapons/guns_new.dm b/code/game/objects/items/weapons/guns_new.dm index a09574ad0a3..333e5541ab7 100644 --- a/code/game/objects/items/weapons/guns_new.dm +++ b/code/game/objects/items/weapons/guns_new.dm @@ -157,12 +157,8 @@ if(firer && istype(A, /mob)) var/mob/M = A if(!istype(A, /mob/living)) - if(prob(98)) - loc = A.loc - return // nope.avi - else - visible_message("\red [src] vanishes into thin air!") - del(src) // ssssshhhhh + loc = A.loc + return // nope.avi if(!silenced) /* @@ -217,7 +213,7 @@ if(!bumped) if(loc == original) - for(var/mob/M in original) + for(var/mob/living/M in original) Bump(M) sleep( 1 )