mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-28 22:47:59 +01:00
thrown objects now phase through the thrower instead of hitting them (#12323)
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user