Skip to content

Commit fce6bbe

Browse files
committed
malaya tokmachka
1 parent e0fa373 commit fce6bbe

1 file changed

Lines changed: 6 additions & 5 deletions

File tree

  • modular_meta/features/security_extended/code/weapon

modular_meta/features/security_extended/code/weapon/melee.dm

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
/// Stamina damage dealt
2222
var/stamina_force = 25
2323

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)
2525
var/target_zone = user.zone_selected == target
2626
var/armour_level = target.getarmor(target_zone)
2727
var/shove_dir = get_dir(user.loc, target.loc)
@@ -78,15 +78,16 @@
7878
target.emote("cry")
7979
if(ishuman(target))
8080
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")
8183
if (H.check_block(src, 0, "[user]'s [name]", MELEE_ATTACK))
8284
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!"))
8688
user.Stun(7)
8789
log_combat(user, target, "attempted to attack", src, "(blocked by martial arts)")
8890
return
89-
9091
log_combat(user, target, "attacked", src)
9192

9293
// If the target has a lot of stamina loss, knock them down

0 commit comments

Comments
 (0)