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:
kevinz000
2019-06-08 01:27:43 -07:00
committed by GitHub
3 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -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
..()
+1 -1
View File
@@ -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