Stops you from grabbing someone if you are horizontal (#22563)

* Gotcha! Oh wait-

* Update code/modules/mob/living/living_defense.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Works for now, oculd use a cleanup later

* Nice it works

* Contra review

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
This commit is contained in:
DGamerL
2023-10-01 16:20:18 +01:00
committed by GitHub
co-authored by Contrabang
parent 2d76b2117f
commit ac385bdf5d
5 changed files with 14 additions and 0 deletions
+1
View File
@@ -45,6 +45,7 @@
/datum/martial_art/drunk_brawling
name = "Drunken Brawling"
weight = 2
can_horizontally_grab = FALSE
/datum/martial_art/drunk_brawling/grab_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
if(prob(70))
+6
View File
@@ -5,6 +5,7 @@
combos = list(/datum/martial_combo/judo/discombobulate, /datum/martial_combo/judo/eyepoke, /datum/martial_combo/judo/judothrow, /datum/martial_combo/judo/armbar, /datum/martial_combo/judo/wheelthrow)
weight = 5 //takes priority over boxing and drunkneness, less priority than krav or CQC/carp
no_baton_reason = "<span class='warning'>The baton feels off balance in your hand due to your judo training!</span>"
can_horizontally_grab = FALSE
//Corporate Judo Belt
@@ -58,6 +59,11 @@
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>")
+1
View File
@@ -5,6 +5,7 @@
var/datum/action/leg_sweep/legsweep = new/datum/action/leg_sweep()
var/datum/action/lung_punch/lungpunch = new/datum/action/lung_punch()
var/datum/action/neutral_stance/neutral = new/datum/action/neutral_stance()
can_horizontally_grab = FALSE
/datum/action/neutral_stance
name = "Neutral Stance - You relax, cancelling your last Krav Maga stance attack."
+2
View File
@@ -39,6 +39,8 @@
var/weight = 0
/// Message displayed when someone uses a baton when its forbidden by a martial art
var/no_baton_reason = "Your martial arts training prevents you from wielding batons."
/// Whether or not you can grab someone while horizontal with this Martial Art
var/can_horizontally_grab = TRUE
/datum/martial_art/New()
. = ..()