mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-19 02:54:41 +01:00
fixing judo (#26755)
This commit is contained in:
@@ -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>")
|
||||
|
||||
@@ -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>")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user