From 95f2c7e57531a0ae0ecb1d0aa867d805b460a2b6 Mon Sep 17 00:00:00 2001
From: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com>
Date: Wed, 2 Oct 2024 20:21:21 +0500
Subject: [PATCH] fixing judo (#26755)
---
code/modules/martial_arts/combos/judo/judothrow.dm | 2 +-
code/modules/martial_arts/judo.dm | 5 -----
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/code/modules/martial_arts/combos/judo/judothrow.dm b/code/modules/martial_arts/combos/judo/judothrow.dm
index 4939dead2e61..4c1a5146361f 100644
--- a/code/modules/martial_arts/combos/judo/judothrow.dm
+++ b/code/modules/martial_arts/combos/judo/judothrow.dm
@@ -4,7 +4,7 @@
explaination_text = "Establish a gripset on your opponent and throw them to the floor, inflicting stamina damage"
combo_text_override = "Grab, Disarm"
/datum/martial_combo/judo/judothrow/perform_combo(mob/living/carbon/human/user, mob/living/target, datum/martial_art/MA)
- if(user.IsKnockedDown() || IS_HORIZONTAL(target))
+ if(IS_HORIZONTAL(user) || IS_HORIZONTAL(target))
return MARTIAL_COMBO_FAIL
target.visible_message("[user] judo throws [target] to ground!", \
"[user] judo throws you to the ground!")
diff --git a/code/modules/martial_arts/judo.dm b/code/modules/martial_arts/judo.dm
index 96af7e0996c1..1f745325db59 100644
--- a/code/modules/martial_arts/judo.dm
+++ b/code/modules/martial_arts/judo.dm
@@ -75,11 +75,6 @@
add_attack_logs(A, D, "Melee attacked with [src]")
return TRUE
-/datum/martial_art/judo/grab_act(mob/living/carbon/human/attacker, mob/living/carbon/human/defender)
- if(IS_HORIZONTAL(attacker))
- return FALSE
- return ..()
-
/datum/martial_art/judo/explaination_header(user)
to_chat(user, "You recall the teachings of Corporate Judo.")