From b34fad8db8a9df1444130db2fab2d9f03bbeb42d Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Thu, 28 Jan 2021 03:04:22 +0100
Subject: [PATCH] [MIRROR] Fixes shitty martial arts code (#2911)

* Fixes shitty martial arts code (#56397)

Fixes martial arts being handled in 2 places with a bit of a hack, this needs more attention in future (Hello 2025) -Lemon

* Fixes shitty martial arts code

Co-authored-by: SmArtKar <44720187+SmArtKar@users.noreply.github.com>
---
 code/modules/mob/living/living.dm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 00c07317c89..76b136592f5 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -1929,6 +1929,8 @@
 /mob/living/proc/apply_martial_art(mob/living/target)
 	if(HAS_TRAIT(target, TRAIT_MARTIAL_ARTS_IMMUNE))
 		return FALSE
+	if(ishuman(target) && ishuman(src)) //Human vs human are handled in species code
+		return FALSE
 	var/datum/martial_art/style = mind?.martial_art
 	var/attack_result = FALSE
 	if (style)