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

Gives the M56D full auto #4336

Merged
merged 10 commits into from
Sep 12, 2023
Merged

Conversation

Zonespace27
Copy link
Contributor

@Zonespace27 Zonespace27 commented Sep 5, 2023

About the pull request

Gives the m56d full auto. Refactors a lot of m56d/m2c code to make this possible. Test merge first.
Also gives the m56d an ammo counter on-firing. Does not apply to the M2C.

Explain why it's good for the game

This was planned for #4003, but was too far out of scope to be done in that PR. Automatic mode is better from a user QOL standpoint, and shouldn't affect balance much.

Testing Photographs and Procedure

Screenshots & Videos

Works

Changelog

🆑
balance: M56D now has full auto mode.
qol: M56D now has an ammo counter when firing.
del: M2C can no longer rotate with MMB
/:cl:

@github-actions github-actions bot added the Balance You need to be a professional veteran game maintainer to comprehend what is being done here. label Sep 5, 2023
@Zonespace27 Zonespace27 added the Refactor Make the code harder to read label Sep 5, 2023
Copy link
Member

@harryob harryob left a comment

Choose a reason for hiding this comment

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

there are about 1 billion nitpicks in the moved m2c code but i think we'll live

@harryob harryob added this pull request to the merge queue Sep 11, 2023
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Sep 11, 2023
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to a conflict with the base branch Sep 11, 2023
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Sep 12, 2023
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@Zonespace27 Zonespace27 added this pull request to the merge queue Sep 12, 2023
Merged via the queue into cmss13-devs:master with commit 1940d9e Sep 12, 2023
25 checks passed
@Zonespace27 Zonespace27 deleted the auto-m56d branch September 12, 2023 03:08
cm13-github added a commit that referenced this pull request Sep 12, 2023
github-merge-queue bot pushed a commit that referenced this pull request Sep 26, 2023
# About the pull request
Fixes a bug with m56d on burst-fire and single-fire mode which allows it
to fire with no delay due to #4336
<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

# Explain why it's good for the game
Game-breaking and actively abused
# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl:
fix: Fixes no fire delay on m56d in semi-auto and burst fire
/:cl:
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Balance You need to be a professional veteran game maintainer to comprehend what is being done here. Refactor Make the code harder to read
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants