mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-30 07:27:57 +01:00
9186b7d421
* Adds Judo, Judo belt, and increased harm damage * Judo users can no longer use batons (any type) * Adds Discombobulate combo * adds Eye-poke combo * copy-paste related error fixes * adds throw (knockdown) combo * adds Armbar and Fatailty Combos * assorted changes (spelling, args, unneeded checks) * minor changes to belt item * updated desc, fixes belt item pathing * adds 3 belts to secvend * Adds sprites courtsey AVeryReulctantSpider * Assorted code cleanup (thx Henri) * minor grammatical issues * Adds Judo, Judo belt, and increased harm damage * Judo users can no longer use batons (any type) * Adds Discombobulate combo * adds Eye-poke combo * copy-paste related error fixes * adds throw (knockdown) combo * adds Armbar and Fatailty Combos * assorted changes (spelling, args, unneeded checks) * minor changes to belt item * updated desc, fixes belt item pathing * adds 3 belts to secvend * Adds sprites courtsey AVeryReulctantSpider * Assorted code cleanup (thx Henri) * minor grammatical issues * junk commit to re-open PR * pronoun consistancy * Lewc review #1 * de-jankification, buffs eye poke * Reduces harm intent damage from 10 to 7 * descriptions * lewc name change * weight class is now bulky * wheel throw fix, discombob buff (slight) * Throw buff (Grab > disarm) * partial lewcc review * assorted reviews (HIIYAA edition) * Eyepoke, discombobulate can be done on the ground * hal second pass review --------- Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
15 lines
861 B
Plaintext
15 lines
861 B
Plaintext
/datum/martial_combo/judo/discombobulate
|
|
name = "Discombobulate"
|
|
steps = list(MARTIAL_COMBO_STEP_DISARM, MARTIAL_COMBO_STEP_GRAB)
|
|
explaination_text = "Deliver a palm strike to your opponents ear, briefly confusing them"
|
|
combo_text_override = "Disarm, Grab"
|
|
|
|
/datum/martial_combo/judo/discombobulate/perform_combo(mob/living/carbon/human/user, mob/living/target, datum/martial_art/MA)
|
|
target.visible_message("<span class='warning'>[user] strikes [target] in the head with [user.p_their()] palm!</span>", \
|
|
"<span class='userdanger'>[user] strikes you with [user.p_their()] palm!</span>")
|
|
playsound(get_turf(user), 'sound/weapons/slap.ogg', 40, TRUE, -1)
|
|
target.apply_damage(10, STAMINA)
|
|
target.AdjustConfused(5 SECONDS)
|
|
add_attack_logs(user, target, "Melee attacked with martial-art [src] : Discombobulate", ATKLOG_ALL)
|
|
return MARTIAL_COMBO_DONE
|