[WIP] Ports Yogstation's version of CQC, adds it back to traitor uplink.

[BiancaWilkson]

What Does This PR Do

Ports Yogstation's version of CQC, much more focused on dealing stamina damage and non-lethal takedowns. Adds it back into traitor uplink.

Why It's Good For The Game

For starters, this is Yog's CQC

All of your unarmed attacks deal stamina damage instead of your normal physical damage type

Disarm Intent Has a chance to disarm the opponent's main hand, and immediately pick up the item if successful Grab Intent Will stun opponents for a short second, allowing you to quickly increase the strength of your grabs Harm Intent Will deal a competitive amount of stamina damage, and hitting a standing opponent while you are prone will both >knock them down and stand you up

Slam: Grab Harm. Slam opponent into the ground, knocking them down and dealing decent stamina damage. CQC Kick: Disarm Harm. Knocks opponent away and slows them. Deals heavy stamina damage to prone opponents, as well as muting them for a short time. Restrain: Grab Grab. Locks opponents into a restraining position, making your grab harder to break out of, disarm to begin a chokehold which deal gradual oxygen damage until the opponent is unconscious, with the damage increasing based on their stamina damage. Failing to complete the chokehold will weaken and possibly break your grab. Pressure: Disarm Grab. Disables the targetted limb or a random limb if the head or chest are targetted, as well as forcing the target to drop Consecutive CQC: Harm Harm Harm Harm Harm. Offensive move, deals bonus stamina damage and knocking down on the last hit. In addition, by having your throw mode on when being attacked, you enter an active defense mode where you have a chance to counter attacks done to you.

CQC was a very fun martial art that myself and others loved to use. However in its current state, it was very fairly moved to be for nukies only, making it so sleeping carp was the only martial art with combos available to most traitors. This version of CQC rebalances it to make it much more fair to play against, most noteably by changing chokehold to take some time to knock the target out, while also giving it a strong niche of being a much more non-lethal option to traitoring. However even this will need re-balancing as well, which I am very open to feedback for.

Here are my current proposed changes

Disarm Intent: Instead just have shoving someone deal stamina damage, to avoid any RNG in combat

Grab Intent: Stuns are bad, so no stun.

Pressure: Have this be the combo for stealing someone's item.

Consecutive CQC: Keep our combo of disarm, disarm, harm, and have it deal brute damage, so there's still an option of dealing damage without a weapon.

Throw Mode Block Chance: Honestly, I have no idea what to do about this, and would love suggestions. RNG combat can feel really unfair, so changing this is a priority.

On Discord, Charlie mentioned that he'd rather tweak our existing martial arts instead of adding new ones, and he expressed interest in this version of CQC when I initially pitched it. However because its not a concrete answer, and Charlie isn't the only person on the development/design/balance team, I decided to keep this as WIP so I don't have to do the hard part until I get full approval.

Todo List:

• [x] Change most instances of brute damage to stamina damage.
• [x] Change combos to be Yog's combos
• [ ] Figure out what to do about RNG block/counter
• [ ] Change chokehold into Yog's chokehold
• [ ] Add it into traitor uplink
• [ ] Fix the admin attack log messages to be more accurate
• [ ] Generally go back and make sure everything does what it's supposed to

Testing

Spawned in and gave myself CQC, robusted some skrells. I'll update this as I test more and more.

Changelog

:cl: add: Yog's version of CQC del: Our old CQC tweak: CQC now available in traitor uplink /:cl:

[FloFluoro]

This PR would also progress #18179. In fact, it's one of the last things on the list that hasn't been done yet.

[BiancaWilkson]

This PR would also progress #18179. In fact, it's one of the last things on the list that hasn't been done yet.

Oh yeah, I noticed that today, but just completely forgot it about when I wrote this up.

[AquaVirus]

Will nukies get to keep the old version of CQC or are they gonna get the same non-lethal CQC that traitors get? They already suffer from a lack of (good) options for melee combat, so it would be sad to see one of the few decent options available to them become unviable.

Grab Intent: Stuns are bad, so no stun.

So the grab intent will be the same as if you didn't know any martial arts? Eh. Boring.

Overall a good change, just concerned about the lack of viability for nukies.

[BiancaWilkson]

Will nukies get to keep the old version of CQC or are they gonna get the same non-lethal CQC that traitors get? They already suffer from a lack of (good) options for melee combat, so it would be sad to see one of the few decent options available to them become unviable.

I disagree that nukies don't have good melee options. They have chainsaw and dsword, which are some of the strongest melee weapons in the game. And this part is mostly just going off vibes, I have no real evidence to back this claim up, but I feel like CQC was never a nukie's main weapon, it was mostly used as a backup weapon. This version is undeniably weaker than current CQC, but I think if the TC price was adjusted accordingly, it could still be viable as a sort of secondary weapon for nukies to take.

Grab Intent: Stuns are bad, so no stun.

So the grab intent will be the same as if you didn't know any martial arts? Eh. Boring.

This is entirely just cause I have no ideas on what to do with it. I'd love to hear some because CQC should absolutely have some kind of special grab, other than just the restrain.

[AzuleUtama]

I'm a bit mixed on re-adding CQC to traitors once again - it's been in and out of the uplink multiple times now and I think it would make more sense to keep it exclusive to nukies (and the 'Bond' syndicate bundle) while fixing the instant stun mechanics it still has. Traitors have Carp Fu exclusively and both antags have access to the Desword, Chainsaw and Krav Maga gloves - so Nuke Ops having an exclusive and powerful martial art of their own would make CQC feel more rewarding when you're lucky enough to use it.

[BiancaWilkson]

And of course, feel free to leave feedback on any of this balance-wise as well, a lot of the numbers I just went off of vibes for what I thought would be good.

[BiancaWilkson]

I'm going to go ahead and take this out of draft, with the caveat that the blocking issue still isn't solved, but I know #19334 is working on it. Everything else is pretty ready for review though.

[Edan52]

Hi, what did you do with the RNG?

[BiancaWilkson]

What did you do with the RNG?

I got rid of it, no more block chance at all, and instead of disarming having a chance to steal the item, successfully doing the pressure combo guarantees an item steal.