From 2dfbdaff30226dd6840afc7724890543582a5bbf Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 21 Oct 2017 06:15:37 -0500 Subject: [PATCH] [MIRROR] fixes being unable to hit people next to you if you're dragging them and moving (#3517) * Update projectile.dm (#31893) * fixes being unable to hit people next to you if you're dragging them and moving --- code/modules/projectiles/projectile.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index a24499ab05..4ecfc3bde8 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -265,10 +265,10 @@ if(!log_override && firer && original) add_logs(firer, original, "fired at", src, " [get_area(src)]") if(direct_target) - prehit(direct_target) - direct_target.bullet_act(src, def_zone) - qdel(src) - return + if(prehit(direct_target)) + direct_target.bullet_act(src, def_zone) + qdel(src) + return if(isnum(angle)) setAngle(angle) if(spread) @@ -394,7 +394,7 @@ /obj/item/projectile/Crossed(atom/movable/AM) //A mob moving on a tile with a projectile is hit by it. ..() - if(isliving(AM) && AM.density && !checkpass(PASSMOB)) + if(isliving(AM) && (AM.density || AM == original) && !checkpass(PASSMOB)) Collide(AM) /obj/item/projectile/Destroy()