cyberpresidentvanellope/fulpstation
1
0
Fork 0
mirror of https://github.com/fulpstation/fulpstation.git synced 2025-12-10 10:01:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Crawling people who aren't full-stunned (able to use items or move) now get hit by projectiles (#40931)

Browse Source 
Oof, how did I think this was a good idea..
This commit is contained in:
kevinz000
2018-10-24 04:38:10 -07:00
committed by oranges
parent 4273a450ab
commit 0f86befdd1
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/modules/projectiles/projectile.dm
View File

@@ -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)