cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-12 23:53:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

removes check_block() and martial art block_chance (#28399)

Browse Source
This commit is contained in:
chuga-git
2025-02-20 09:08:21 -06:00
committed by GitHub
parent 55605ad8ae
commit a08280714c
4 changed files with 0 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items.dm
-4
View File
@@ -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("<span class='warning'>[H] blocks [src]!</span>")
return FALSE
if(M != user)
M.visible_message("<span class='danger'>[user] has stabbed [M] in the eye with [src]!</span>", \
"<span class='userdanger'>[user] stabs you in the eye with [src]!</span>")
code/modules/martial_arts/martial.dm
-2
View File
@@ -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
code/modules/mob/living/carbon/human/human_defense.dm
-9
View File
@@ -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("<span class='warning'>[src] blocks [I]!</span>")
return FALSE
send_item_attack_message(I, user, hit_area)
if(!I.force)
code/modules/mob/living/carbon/human/species/_species.dm
-9
View File
@@ -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("<span class='warning'>[target] blocks [user]'s grab attempt!</span>")
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("<span class='warning'>[target] blocks [user]'s attack!</span>")
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("<span class='warning'>[target] blocks [user]'s disarm attempt!</span>")
return FALSE
if(SEND_SIGNAL(target, COMSIG_HUMAN_ATTACKED, user) & COMPONENT_CANCEL_ATTACK_CHAIN)
return FALSE
if(target.absorb_stun(0))