Merge pull request #8560 from Ghommie/Ghommie-cit37
Ports in the fix against hitting oneself with one's own thrown items.
This commit is contained in:
@@ -990,6 +990,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
|
||||
..()
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
if(ismob(mover))
|
||||
if (mover in buckled_mobs)
|
||||
return TRUE
|
||||
return (!mover.density || !density || lying)
|
||||
return (!mover.density || !density || lying || (mover.throwing && mover.throwing.thrower == src && !ismob(mover)))
|
||||
|
||||
//DO NOT USE THIS UNLESS YOU ABSOLUTELY HAVE TO. THIS IS BEING PHASED OUT FOR THE MOVESPEED MODIFICATION SYSTEM.
|
||||
//See mob_movespeed.dm
|
||||
|
||||
Reference in New Issue
Block a user