cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/throwing.dm
+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)