Skip to content

Commit

Permalink
Merge pull request ParadiseSS13#16627 from Deelite34/simplify-reflect…
Browse files Browse the repository at this point in the history
…-msg

Tweaks carp martial arts projectile reflection message
  • Loading branch information
variableundefined authored Sep 10, 2021
2 parents dab26d9 + eefe566 commit dcad192
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/human/human_defense.dm
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ emp_act
if(mind?.martial_art?.deflection_chance) //Some martial arts users can deflect projectiles!
if(!lying && !HAS_TRAIT(src, TRAIT_HULK) && mind.martial_art.try_deflect(src)) //But only if they're not lying down, and hulks can't do it
add_attack_logs(P.firer, src, "hit by [P.type] but got deflected by martial arts '[mind.martial_art]'")
visible_message("<span class='danger'>[src] deflects the projectile; [p_they()] can't be hit with ranged weapons!</span>", "<span class='userdanger'>You deflect the projectile!</span>")
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, TRUE)
if(mind.martial_art.reroute_deflection)
P.firer = src
Expand Down

0 comments on commit dcad192

Please sign in to comment.