Skip to content

Commit

Permalink
Allows pacifists to use the psychotic brawling martial art, but at a …
Browse files Browse the repository at this point in the history
…cost. (tgstation#83605)

## About The Pull Request
There's a bug wherein you can use psychotic brawling as a pacifist if
you disarm, but rather than fix it I think leaning into it would be
really interesting. You get a big -20 mood debuff for 10 minutes, but
you can still harm people.
  • Loading branch information
NewyearnewmeUwu authored Jun 11, 2024
1 parent 76fdcbc commit 6065705
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 0 deletions.
5 changes: 5 additions & 0 deletions code/datums/martial/psychotic_brawl.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/datum/martial_art/psychotic_brawling
name = "Psychotic Brawling"
id = MARTIALART_PSYCHOBRAWL
pacifist_style = TRUE

/datum/martial_art/psychotic_brawling/disarm_act(mob/living/attacker, mob/living/defender)
return psycho_attack(attacker, defender)
Expand Down Expand Up @@ -75,6 +76,8 @@
carbon_defender.adjustOrganLoss(ORGAN_SLOT_BRAIN, 5)
attacker.Stun(rand(1 SECONDS, 4.5 SECONDS))
defender.Stun(rand(0.5 SECONDS, 3 SECONDS))
if(HAS_TRAIT(attacker, TRAIT_PACIFISM))
attacker.add_mood_event("bypassed_pacifism", /datum/mood_event/pacifism_bypassed)
if(5,6)
atk_verb = pick("kick", "hit", "slam")
if(defender.check_block(attacker, 0, "[attacker]'s [atk_verb]", UNARMED_ATTACK))
Expand All @@ -94,6 +97,8 @@
var/throwtarget = get_edge_target_turf(attacker, get_dir(attacker, get_step_away(defender, attacker)))
defender.throw_at(throwtarget, 4, 2, attacker)//So stuff gets tossed around at the same time.
defender.Paralyze(6 SECONDS)
if(HAS_TRAIT(attacker, TRAIT_PACIFISM))
attacker.add_mood_event("bypassed_pacifism", /datum/mood_event/pacifism_bypassed)
if(7,8)
return MARTIAL_ATTACK_INVALID //Resume default behaviour

Expand Down
6 changes: 6 additions & 0 deletions code/datums/mood_events/generic_negative_events.dm
Original file line number Diff line number Diff line change
Expand Up @@ -499,3 +499,9 @@
description = "Nothing will ever rival with what I seen in the past..."
mood_change = -3
special_screen_obj = "mood_desentized"

//Used for the psychotic brawling martial art, if the person is a pacifist.
/datum/mood_event/pacifism_bypassed
description = "I DIDN'T MEAN TO HURT THEM!"
mood_change = -20
timeout = 10 MINUTES

0 comments on commit 6065705

Please sign in to comment.