shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[MIRROR] fixes being unable to hit people next to you if you're dragging them and moving (#3517)

Browse Source 
* Update projectile.dm (#31893)

* fixes being unable to hit people next to you if you're dragging them and moving
This commit is contained in:
CitadelStationBot
2017-10-21 06:15:37 -05:00
committed by Poojawa
parent bddb4c1708
commit 2dfbdaff30
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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