Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Your unarmed attacks are once again blocked even when you're not in combat mode #333

Merged
merged 1 commit into from
Oct 29, 2023

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Skyrat: Skyrat-SS13/Skyrat-tg#24631
Original PR: tgstation/tgstation#79233

About The Pull Request

Currently, not being in combat mode when making an unarmed attack allows you to bypass ALL BLOCKING. All of it. Every single kind of shielding.

This is now fixed.

As a consequence, hugging is now blocked, but that's fine, hugging puts you into click cooldown and might actually be an attack now. Like the Hugs of the Gondola martial art

Fixes tgstation/tgstation#72812

Why It's Good For The Game

This was broken with COMBAT MODE AAAAAAAAAAAH

AAAAAAAAAAAH

Changelog

🆑 necromanceranne
fix: Every person on the station now no longer has the Tranquility Evades the Shield Pinky Finger Shovegrab unarmed combat technique, an ancient and forbidden strike that allows anyone (literally anyone) to bypass all forms of blocking defense by simply not being in combat mode when they shove or grab their target. As a direct result, the chakra energy of the Spinward Sector has become severely misaligned. Oh well.
/:cl:

… not in combat mode [MDB IGNORE] (#24631)

* Your unarmed attacks are once again blocked even when you're not in combat mode (#79233)

## About The Pull Request

Currently, not being in combat mode when making an unarmed attack allows
you to bypass ALL BLOCKING. All of it. Every single kind of shielding.

This is now fixed.

As a consequence, hugging is now blocked, but that's fine, hugging puts
you into click cooldown and _might actually be an attack now_. [Like the
Hugs of the Gondola martial
art](https://github.com/tgstation/tgstation/blob/ab058330b4449f133b7672565c91d28af8ed7e05/code/datums/martial/hugs_of_the_gondola.dm)

Fixes tgstation/tgstation#72812

## Why It's Good For The Game

This was broken with COMBAT MODE AAAAAAAAAAAH

### AAAAAAAAAAAH

## Changelog
:cl:
fix: Every person on the station now no longer has the Tranquility
Evades the Shield Pinky Finger Shovegrab unarmed combat technique, an
ancient and forbidden strike that allows anyone (literally anyone) to
bypass all forms of blocking defense by simply not being in combat mode
when they shove or grab their target. As a direct result, the chakra
energy of the Spinward Sector has become severely misaligned. Oh well.
/:cl:

* Your unarmed attacks are once again blocked even when you're not in combat mode

---------

Co-authored-by: necromanceranne <[email protected]>
@Iajret Iajret merged commit 92ff9b4 into master Oct 29, 2023
24 checks passed
@Iajret Iajret deleted the upstream-mirror-24631 branch October 29, 2023 08:42
AnywayFarus added a commit that referenced this pull request Oct 29, 2023
Iajret pushed a commit that referenced this pull request Jan 6, 2024
fix tgs version feedbackdb logging (#80774)

I found this while looking in this file for other reasons.

Shutdown is called after blackbox.Seal() in 99% of cases, keeping this
from getting logged.

Co-authored-by: Kyle Spier-Swenson <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

By not being in combat mode, unarmed strikes bypass blocking mechanics entirely.
3 participants