Skip to content

Commit

Permalink
fixing judo (ParadiseSS13#26755)
Browse files Browse the repository at this point in the history
  • Loading branch information
kyunkyunkyun authored Oct 2, 2024
1 parent 07bd88a commit 95f2c7e
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
2 changes: 1 addition & 1 deletion code/modules/martial_arts/combos/judo/judothrow.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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("<span class='warning'>[user] judo throws [target] to ground!</span>", \
"<span class='userdanger'>[user] judo throws you to the ground!</span>")
Expand Down
5 changes: 0 additions & 5 deletions code/modules/martial_arts/judo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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, "<b><i>You recall the teachings of Corporate Judo.</i></b>")

Expand Down

0 comments on commit 95f2c7e

Please sign in to comment.