Merge pull request #8770 from Arturlang/Carp_Deflecting

Carp now deflects the bullets instead of making them dissapear.
This commit is contained in:
kevinz000
2019-06-29 20:08:47 -07:00
committed by GitHub
3 changed files with 8 additions and 1 deletions

View File

@@ -54,7 +54,12 @@
else
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)
return 0
if(!mind.martial_art.reroute_deflection)
return BULLET_ACT_BLOCK
else
P.firer = src
P.setAngle(rand(0, 360))//SHING
return BULLET_ACT_FORCE_PIERCE
if(!(P.original == src && P.firer == src)) //can't block or reflect when shooting yourself
if(P.is_reflectable)