cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-09 00:13:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #44208 from 4dplanner/throw

Browse Source 
Thrown objects phase through thrower
This commit is contained in:
oranges
2019-06-03 11:05:46 +12:00
committed by GitHub
parent d4166f8a58 44cd465de1
commit 7811f1ff7f
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/controllers/subsystem/throwing.dm
View File

@@ -155,7 +155,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 && !ismob(thrownthing)))
continue
if (AM.density && !(AM.pass_flags & LETPASSTHROW) && !(AM.flags_1 & ON_BORDER_1))
finalize(hit=TRUE, target=AM)

2
code/modules/antagonists/cult/cult_items.dm
View File

@@ -1002,6 +1002,6 @@
continue
throw_at(Next, 3, 1, D.thrower)
return
throw_at(D.thrower, 7, 1, D.thrower)
throw_at(D.thrower, 7, 1, null)
else
..()

2
code/modules/mob/living/living_movement.dm
View File

@@ -9,7 +9,7 @@
var/obj/item/projectile/P = mover
return !P.can_hit_target(src, P.permutated, src == P.original, TRUE)
if(mover.throwing)
return (!density || !(mobility_flags & MOBILITY_STAND))
return (!density || !(mobility_flags & MOBILITY_STAND) || (mover.throwing.thrower == src && !ismob(mover)))
if(buckled == mover)
return TRUE
if(ismob(mover))