sleeping carp now deflects projectiles in random directions (#42647)

* bad ass shit

* durr

* nice

Co-Authored-By: tralezab <40974010+tralezab@users.noreply.github.com>
This commit is contained in:
tralezab
2019-02-08 08:56:25 -08:00
committed by moo
parent 5658705e29
commit 43ecae6fa2
3 changed files with 8 additions and 1 deletions

View File

@@ -6,6 +6,7 @@
var/current_target
var/datum/martial_art/base // The permanent style. This will be null unless the martial art is temporary
var/deflection_chance = 0 //Chance to deflect projectiles
var/reroute_deflection = FALSE //Delete the bullet, or actually deflect it in some direction?
var/block_chance = 0 //Chance to block melee attacks using items while on throw mode.
var/restraining = 0 //used in cqc's disarm_act to check if the disarmed is being restrained and so whether they should be put in a chokehold or not
var/help_verb

View File

@@ -8,6 +8,7 @@
name = "The Sleeping Carp"
id = MARTIALART_SLEEPINGCARP
deflection_chance = 100
reroute_deflection = TRUE
no_guns = TRUE
allow_temp_override = FALSE
help_verb = /mob/living/carbon/human/proc/sleeping_carp_help

View File

@@ -52,7 +52,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.reflectable & REFLECT_NORMAL)