thrown objects now phase through the thrower instead of hitting them (#12323)

This commit is contained in:
Couls
2019-09-17 13:52:02 -07:00
committed by variableundefined
parent e44db05f24
commit fd3e6f5729
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -142,7 +142,7 @@ SUBSYSTEM_DEF(throwing)
/datum/thrownthing/proc/hitcheck()
for(var/thing in get_turf(thrownthing))
var/atom/movable/AM = thing
if(AM == thrownthing)
if(AM == thrownthing || AM == thrower)
continue
if(AM.density && !(AM.pass_flags & LETPASSTHROW) && !(AM.flags & ON_BORDER))
finalize(hit = TRUE, target = AM)
+1 -1
View File
@@ -2,7 +2,7 @@
if(height==0)
return 1
if(istype(mover, /obj/item/projectile) || mover.throwing)
return (!density || lying)
return (mover.throwing.thrower == src || !density || lying)
if(mover.checkpass(PASSMOB))
return 1
if(buckled == mover)