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

Brings automatic weaponry to the marine and surv arsenal #4003

Merged
merged 37 commits into from
Aug 23, 2023

Conversation

Zonespace27
Copy link
Contributor

@Zonespace27 Zonespace27 commented Jul 26, 2023

About the pull request

Gives full auto to the following guns:

m41a (and mk1)
m39
HPR (when bipodded)
m46c in IFF off
type71
mar40
nsg
every civvie SMG except the nailgun
laser uzi

All newly automatic guns fire 20% slower in automatic mode, to balance for the fact that it is much easier to re-aim than burst.

This creates a dynamic between the three firemodes:

Semi:

  • Best accuracy
  • Lowest DPS

Burst:

  • Okay accuracy
  • Highest DPS

Auto:

  • Okay (it depends) accuracy, but you are able to adjust for a moving target unlike burst.
  • Slightly lower DPS

Explain why it's good for the game

Guns not having autofire feels... pretty rough. This PR will bring CM to a more modern time, while reducing the number of players diagnosed with carpal tunnel yearly.

Testing Photographs and Procedure

I went through and tested pretty much every base gun, but I cannot guarantee that they all handle well. Lemme know if something's off.

Changelog

🆑
balance: The M41A, M41Amk1, m39, m46c (iff off), mar-30/40/60, type 71, laser uzi, and every SMG now has automatic fire. To compensate for the ability to re-aim (unlike burst), the guns fire 20% slower while automatic. This does not apply to already-existing automatic weaponry.
balance: The HPR can now fire in full auto when bipodded.
fix: Adding/removing attachments now keeps the current firemode, if possible.
fix: The dualtube and spec sniper now can switch tubes/toggle laser again
fix: Fixed a long-standing exploit with bipods and scopes.
fix: Fixed guns jamming when shooting UI elements.
fix: Fixed a bunch of guns unintentionally having burst.
balance: You can transfer ammo between HPR ammo boxes by hitting one with another.
/:cl:

@Zonespace27 Zonespace27 added Balance You need to be a professional veteran game maintainer to comprehend what is being done here. Testmerge Candidate we'll test this while you're asleep and the server has 10 players labels Jul 26, 2023
@stagda stagda mentioned this pull request Jul 28, 2023
3 tasks
@morrowwolf morrowwolf added Testmerge Candidate we'll test this while you're asleep and the server has 10 players and removed Testmerge Candidate we'll test this while you're asleep and the server has 10 players labels Aug 22, 2023
Copy link
Member

@morrowwolf morrowwolf left a comment

Choose a reason for hiding this comment

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

balance good

@harryob harryob added this pull request to the merge queue Aug 23, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Aug 23, 2023
@harryob harryob added this pull request to the merge queue Aug 23, 2023
Merged via the queue into cmss13-devs:master with commit 295ef51 Aug 23, 2023
25 checks passed
cm13-github added a commit that referenced this pull request Aug 23, 2023
github-merge-queue bot pushed a commit that referenced this pull request Sep 12, 2023
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->

# 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
<!-- Include any screenshots/videos/debugging steps of the modified code
functioning successfully, ideally including edge cases. -->
<details>
<summary>Screenshots & Videos</summary>

Works

</details>


# Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
label your changes in the changelog. Please note that maintainers freely
reserve the right to remove and add tags should they deem it
appropriate. You can attempt to finagle the system all you want, but
it's best to shoot for clear communication right off the bat. -->
<!-- If you add a name after the ':cl', that name will be used in the
changelog. You must add your CKEY after the CL if your GitHub name
doesn't match. Maintainers freely reserve the right to remove and add
tags should they deem it appropriate. -->

:cl:
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:

<!-- Both :cl:'s are required for the changelog to work! -->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Balance Approved This PR has had its balance and gameplay-affecting aspects approved. Cry to the Head-maint about it. Balance You need to be a professional veteran game maintainer to comprehend what is being done here. Testmerge Candidate we'll test this while you're asleep and the server has 10 players
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants