Merge pull request #10580 from datlo/capufakedeath

Capulettium/Capu+ fakes death convincingly
This commit is contained in:
variableundefined
2019-01-06 16:12:56 +08:00
committed by GitHub
10 changed files with 67 additions and 15 deletions
@@ -315,7 +315,7 @@
/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...
return TRUE
if(target.health >= config.health_threshold_crit)
if(target.health >= config.health_threshold_crit && !(target.status_flags & FAKEDEATH))
target.help_shake_act(user)
return TRUE
else