Merge pull request #8791 from deathride58/fuckcopypasta

Fixes master not compiling
This commit is contained in:
kevinz000
2019-06-30 02:06:28 -07:00
committed by GitHub
@@ -55,11 +55,11 @@
visible_message("<span class='danger'>[src] deflects the projectile!</span>", "<span class='userdanger'>You deflect the projectile!</span>")
playsound(src, pick('sound/weapons/bulletflyby.ogg', 'sound/weapons/bulletflyby2.ogg', 'sound/weapons/bulletflyby3.ogg'), 75, 1)
if(!mind.martial_art.reroute_deflection)
return BULLET_ACT_BLOCK
return FALSE
else
P.firer = src
P.setAngle(rand(0, 360))//SHING
return BULLET_ACT_FORCE_PIERCE
return FALSE
if(!(P.original == src && P.firer == src)) //can't block or reflect when shooting yourself
if(P.is_reflectable)