|
21 | 21 | /// Stamina damage dealt |
22 | 22 | var/stamina_force = 25 |
23 | 23 |
|
24 | | -/obj/item/melee/tonfa/attack(mob/living/target, mob/living/user) |
| 24 | +/obj/item/melee/tonfa/attack(mob/living/target, mob/living/user, mob/living/martial_artist) |
25 | 25 | var/target_zone = user.zone_selected == target |
26 | 26 | var/armour_level = target.getarmor(target_zone) |
27 | 27 | var/shove_dir = get_dir(user.loc, target.loc) |
|
78 | 78 | target.emote("cry") |
79 | 79 | if(ishuman(target)) |
80 | 80 | var/mob/living/carbon/human/H = target |
| 81 | + var/list/adjectives = list("expretly", "professionally", "skillfully", "masterfully") |
| 82 | + var/list/nouns = list("attack", "hit", "bash", "swing") |
81 | 83 | if (H.check_block(src, 0, "[user]'s [name]", MELEE_ATTACK)) |
82 | 84 | return |
83 | | - if(target.check_block()) |
84 | | - target.visible_message(span_danger("[target.name] blocks [src] and twists [user]'s arm behind [user.p_their()] back!"), |
85 | | - span_userdanger("You block the attack!")) |
| 85 | + if(target.check_block(martial_artist)) |
| 86 | + target.visible_message(span_danger("[target.name] blocks [src] and [pick(adjectives)] twists [user]'s arm behind [user.p_their()] back!"), |
| 87 | + span_userdanger("You block the [user]'s [src] [pick(nouns)] by [pick(adjectives)] twisting [user.p_their()] hand behind [user.p_their()] back!")) |
86 | 88 | user.Stun(7) |
87 | 89 | log_combat(user, target, "attempted to attack", src, "(blocked by martial arts)") |
88 | 90 | return |
89 | | - |
90 | 91 | log_combat(user, target, "attacked", src) |
91 | 92 |
|
92 | 93 | // If the target has a lot of stamina loss, knock them down |
|
0 commit comments