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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Re-adds back CQC to the traitor uplink #14474

Merged
merged 3 commits into from Oct 17, 2020
Merged

Re-adds back CQC to the traitor uplink #14474

merged 3 commits into from Oct 17, 2020

Conversation

Cocacolagua
Copy link
Contributor

@Cocacolagua Cocacolagua commented Sep 27, 2020

What Does This PR Do

Re-adds the 13TC CQC manual back to the traitor uplink, and allows it to roll for surplus.
Removes the Chef_CQC manual (FROM THE UPLINK, NOT THE CHEF HIMSELF) since the regular manual will replace it.

Why It's Good For The Game

There is really no real reason to keep this outside of traitor hands (although they can already get it through bond bundle), since the martial arts rework passed, they can no longer prepare the sleep combo to apply it on one hit.
I also removed the chef_CQC from the uplink since it's the same as the CQC we're adding back, only real difference is from 12TC to 13TC.

Changelog

馃啈
add: Adds the CQC manual back to the traitor uplink.
tweak: Allows the CQC manual to roll for surplus crates.
del: Removes the CCQC from the chef section from the traitor uplink.
/:cl:

@AffectedArc07 AffectedArc07 added Balance This PR will modify how effective something is or isnt Tweak This PR tweaks something ingame labels Sep 28, 2020
cost = 13
surplus = 0

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Recommend adding a cant_discount = TRUE and refundable = TRUE here, since martial arts are !!STRONK!! and accidental purchasing it would be a bit of a pain.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fair enough

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd argue against that.... since we allow MUCH stronger things on discount than cqc.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not about strength, but it's the same reason as carp, if you get it, you can't unget it, sniper rifle can oneshot a guy, but you can still disarm em and pick it up. Sure, chainsaw is nodrop, but you can just kill them and clone them.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does CQC persist through being killed and cloned?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It does persist through cloning now. As does any martial art

@trololiver112
Copy link
Contributor

Muh CCQC馃様

@Cocacolagua
Copy link
Contributor Author

the future is now, old man

@variableundefined variableundefined merged commit 0867cce into ParadiseSS13:master Oct 17, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Balance This PR will modify how effective something is or isnt Tweak This PR tweaks something ingame
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants