From 0f86befdd1c532166299fa950e927c0053d2fa65 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Wed, 24 Oct 2018 04:38:10 -0700 Subject: [PATCH] Crawling people who aren't full-stunned (able to use items or move) now get hit by projectiles (#40931) Oof, how did I think this was a good idea.. --- code/modules/projectiles/projectile.dm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 0e13991b987..72c0d905ff3 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -568,9 +568,15 @@ return list(angle, p_x, p_y) /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 || AM == original) && !(src.pass_flags & PASSMOB)) - Bump(AM) + . = ..() + if(isliving(AM) && !(pass_flags & PASSMOB)) + var/mob/living/L = AM + if(AM == original) //specific aiming for + Bump(AM) + if(AM.density) //blocks projectiles + Bump(AM) + if((L.mobility_flags & MOBILITY_USE|MOBILITY_STAND|MOBILITY_MOVE) & (MOBILITY_USE|MOBILITY_MOVE)) //If they're either able to move or use items, while crawling, they're not stunned enough to avoid projectiles. + Bump(AM) /obj/item/projectile/Destroy() if(hitscan)