diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 66caeb5ad6f..60e16df4bb5 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -628,10 +628,6 @@ GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons if(H.check_shields(src, force, "the [name]", MELEE_ATTACK, armour_penetration_flat, armour_penetration_percentage)) return FALSE - if(H.check_block()) - visible_message("[H] blocks [src]!") - return FALSE - if(M != user) M.visible_message("[user] has stabbed [M] in the eye with [src]!", \ "[user] stabs you in the eye with [src]!") diff --git a/code/modules/martial_arts/martial.dm b/code/modules/martial_arts/martial.dm index 209329cf7f7..5816ee052e3 100644 --- a/code/modules/martial_arts/martial.dm +++ b/code/modules/martial_arts/martial.dm @@ -12,8 +12,6 @@ var/deflection_chance = 0 /// Can it reflect projectiles in a random direction? var/reroute_deflection = FALSE - ///Chance to block melee attacks using items while on throw mode. - var/block_chance = 0 var/help_verb = null /// Set to TRUE to prevent users of this style from using guns (sleeping carp, highlander). They can still pick them up, but not fire them. var/no_guns = FALSE diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index fb1ddae797b..151abebf696 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -281,10 +281,6 @@ emp_act return right_hand_parry.parent return right_hand_parry?.parent || left_hand_parry?.parent // parry with whichever hand has an item that can parry -/mob/living/carbon/human/proc/check_block() - if(mind && mind.martial_art && prob(mind.martial_art.block_chance) && mind.martial_art.can_use(src) && in_throw_mode && !incapacitated(FALSE, TRUE)) - return TRUE - /mob/living/carbon/human/emp_act(severity) ..() if(HAS_TRAIT(src, TRAIT_EMP_IMMUNE)) @@ -498,11 +494,6 @@ emp_act if(check_shields(I, I.force, "the [I.name]", MELEE_ATTACK, I.armour_penetration_flat, I.armour_penetration_percentage)) return FALSE - if(check_block()) - visible_message("[src] blocks [I]!") - return FALSE - - send_item_attack_message(I, user, hit_area) if(!I.force) diff --git a/code/modules/mob/living/carbon/human/species/_species.dm b/code/modules/mob/living/carbon/human/species/_species.dm index 0e57dd7c1df..cb71257554d 100644 --- a/code/modules/mob/living/carbon/human/species/_species.dm +++ b/code/modules/mob/living/carbon/human/species/_species.dm @@ -527,9 +527,6 @@ user.do_cpr(target) /datum/species/proc/grab(mob/living/carbon/human/user, mob/living/carbon/human/target, datum/martial_art/attacker_style) - if(target.check_block()) - target.visible_message("[target] blocks [user]'s grab attempt!") - return FALSE if(!attacker_style && target.buckled) target.buckled.user_unbuckle_mob(target, user) return TRUE @@ -553,9 +550,6 @@ add_attack_logs(user, target, "flayerdrain") return //End Mind Flayer Code - if(target.check_block()) - target.visible_message("[target] blocks [user]'s attack!") - return FALSE if(SEND_SIGNAL(target, COMSIG_HUMAN_ATTACKED, user) & COMPONENT_CANCEL_ATTACK_CHAIN) return FALSE if(attacker_style && attacker_style.harm_act(user, target) == MARTIAL_ARTS_ACT_SUCCESS) @@ -603,9 +597,6 @@ /datum/species/proc/disarm(mob/living/carbon/human/user, mob/living/carbon/human/target, datum/martial_art/attacker_style) if(user == target) return FALSE - if(target.check_block()) - target.visible_message("[target] blocks [user]'s disarm attempt!") - return FALSE if(SEND_SIGNAL(target, COMSIG_HUMAN_ATTACKED, user) & COMPONENT_CANCEL_ATTACK_CHAIN) return FALSE if(target.absorb_stun(0))