From f5d28ae88703a4ed6ec9648812e8cdbbcbc9bba7 Mon Sep 17 00:00:00 2001
From: SmArtKar <44720187+SmArtKar@users.noreply.github.com>
Date: Wed, 27 Jan 2021 12:29:42 +0300
Subject: [PATCH] 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
---
 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 fe6905d8aee..be467df643c 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -1903,6 +1903,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)