cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-14 08:34:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Unusable martial arts now doesn't block normal behaviour (#14377)

Browse Source
This commit is contained in:
farie82
2020-09-19 00:52:06 +02:00
committed by GitHub
parent 3067ce16aa
commit bf5c3131d8
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/species/_species.dm
+4 -4
View File
@@ -371,7 +371,7 @@
return
/datum/species/proc/help(mob/living/carbon/human/user, mob/living/carbon/human/target, datum/martial_art/attacker_style)
if(attacker_style && attacker_style.help_act(user, target))//adminfu only...
if(attacker_style && attacker_style.help_act(user, target) == TRUE)//adminfu only...
return TRUE
if(target.health >= HEALTH_THRESHOLD_CRIT && !(target.status_flags & FAKEDEATH))
target.help_shake_act(user)
@@ -383,7 +383,7 @@
if(target.check_block())
target.visible_message("<span class='warning'>[target] blocks [user]'s grab attempt!</span>")
return FALSE
if(attacker_style && attacker_style.grab_act(user, target))
if(attacker_style && attacker_style.grab_act(user, target) == TRUE)
return TRUE
else
target.grabbedby(user)
@@ -412,7 +412,7 @@
if(target.check_block())
target.visible_message("<span class='warning'>[target] blocks [user]'s attack!</span>")
return FALSE
if(attacker_style && attacker_style.harm_act(user, target))
if(attacker_style && attacker_style.harm_act(user, target) == TRUE)
return TRUE
else
var/datum/unarmed_attack/attack = user.dna.species.unarmed
@@ -460,7 +460,7 @@
if(target.check_block())
target.visible_message("<span class='warning'>[target] blocks [user]'s disarm attempt!</span>")
return FALSE
if(attacker_style && attacker_style.disarm_act(user, target))
if(attacker_style && attacker_style.disarm_act(user, target) == TRUE)
return TRUE
else
add_attack_logs(user, target, "Disarmed", ATKLOG_ALL)