[MIRROR] Fixes Krav Maga allowing pacifism bypasses. (#965)

* Fixes Krav Maga allowing pacifism bypasses. (#81447) ## About The Pull Request Fixes Krav Maga allowing pacifism bypasses. ## Why It's Good For The Game Bugfixes are good for my GBP count. Also, pacifism bypasses bad. ## Changelog :cl: CandleJaxx and Iamgoofball fix: Fixes Krav Maga allowing pacifism bypasses. /:cl: * Fixes Krav Maga allowing pacifism bypasses. --------- Co-authored-by: Iamgoofball <[email protected]>
Fluffy-Frontier · Feb 15, 2024 · bf40cd1 · bf40cd1
1 parent fcba208
commit bf40cd1
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/code/datums/martial/krav_maga.dm b/code/datums/martial/krav_maga.dm
@@ -102,6 +102,8 @@
 /datum/martial_art/krav_maga/proc/leg_sweep(mob/living/attacker, mob/living/defender)
 	if(defender.stat != CONSCIOUS || defender.IsParalyzed())
 		return MARTIAL_ATTACK_INVALID
+	if(HAS_TRAIT(attacker, TRAIT_PACIFISM))
+		return MARTIAL_ATTACK_INVALID // Does 5 damage, so we can't let pacifists leg sweep.
 	defender.visible_message(
 		span_warning("[attacker] leg sweeps [defender]!"),
 		span_userdanger("Your legs are sweeped by [attacker]!"),
@@ -134,6 +136,8 @@
 	return MARTIAL_ATTACK_SUCCESS
 
 /datum/martial_art/krav_maga/proc/neck_chop(mob/living/attacker, mob/living/defender)
+	if(HAS_TRAIT(attacker, TRAIT_PACIFISM))
+		return MARTIAL_ATTACK_INVALID // Does 10 damage, so we can't let pacifists neck chop.
 	attacker.do_attack_animation(defender)
 	defender.visible_message(
 		span_warning("[attacker] karate chops [defender]'s neck!"),