Skip to content

makes the M41A UBGL work (mostly) like a shotgun #643

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

Merged
merged 18 commits into from
May 25, 2025

Conversation

Ediblebomb
Copy link
Contributor

@Ediblebomb Ediblebomb commented Jan 3, 2025

About the pull request

The M41A's UBGL now functions like a shotgun, chamber and all.
(This also means the magsize is 4+1 rather than 5)

Explain why it's good for the game

What looks and canonically operates like a shotgun, probably ought to work like one.
Also loading directly into the chamber is cool.

Changelog

🆑
add: The M41A's UBGL now has actual chambering mechanics.
qol: The M41A's UBGL now loads with the pump forward and chambers the last inserted round when you pump it, instead of the first.
spellcheck: Replaces all mentions of the word breech for the M41A's UBGL, as it isn't a breechloader.
/:cl:

@Ediblebomb
Copy link
Contributor Author

I said I'd add a chamber to it in a second PR, but I might as well do it now while I still feel like it

@BonniePandora
Copy link
Contributor

This seems to cause a bug with impact-fused rounds where they'll persist after hitting a mob/target.
Multiple instances of primed grenades left on the floor after they detonated on impact during a round just passed

@Ediblebomb
Copy link
Contributor Author

This seems to cause a bug with impact-fused rounds where they'll persist after hitting a mob/target. Multiple instances of primed grenades left on the floor after they detonated on impact during a round just passed

I went through 25 (bit more but I wasn't counting and know I went through a box) grenades without issue so I think I fixed it?

@perinabull
Copy link

Heya, launcher of some of those bugged nades here. I noticed it happening particularly when rapidly switching to/away from the launcher.
On a usability note, I'd suggest it would benefit from either having a way of checking what's in the chamber, or not spitting out chambered nades when re-pumped (as with the previous UGL).

Copy link

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 14 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale label Jan 27, 2025
@github-actions github-actions bot closed this Feb 10, 2025
@cm13-github
Copy link
Contributor

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

1 similar comment
@cm13-github
Copy link
Contributor

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

@Ediblebomb
Copy link
Contributor Author

urgh

@cm13-github
Copy link
Contributor

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

Co-authored-by: MistChristmas <[email protected]>
@cm13-github
Copy link
Contributor

cm13-github commented May 9, 2025

Test merge deployment history:

Test Merge Deployed @ 05/09/2025 14:15:05 +00:00:
Server Instance

PVECM: Blue

Merged By

Pandora029

Revision

Origin: 07f897a
Pull Request: d54d7ce
Server: dad30b8a64506f91403056beead586e6de611268

Test Merge Removed @ 05/09/2025 16:26:12 +00:00:
Server Instance

PVECM: Blue

Test Merge Deployed @ 05/18/2025 20:23:51 +00:00:
Server Instance

PVECM: Blue

Merged By

mesnomer

Revision

Origin: c33d5a0
Pull Request: eea145f
Server: 74abd46dd41aaf800a3c3f30d555f7956ca03b78

Test Merge Updated @ 05/19/2025 18:55:58 +00:00:
Server Instance

PVECM: Blue

Merged By

lordloko

Revision

Origin: c33d5a0
Pull Request: eea145f
Server: 9038d9f20bbb7ce102fd3cfac7291bcfd711f48a

Test Merge Updated @ 05/19/2025 19:17:46 +00:00:
Server Instance

PVECM: Blue

Merged By

lordloko

Revision

Origin: c33d5a0
Pull Request: eea145f
Server: a3fa07019a05ba0f2832a3676f9b81093c0703c4

Test Merge Updated @ 05/21/2025 07:55:22 +00:00:
Server Instance

PVECM: Blue

Merged By

AndroBetel

Revision

Origin: 7136ecf
Pull Request: eea145f
Server: 442c7b682f01b632a40d0658c81a7e88e3faa3ad

Test Merge Updated @ 05/22/2025 18:32:32 +00:00:
Server Instance

PVECM: Blue

Merged By

Wettowels

Revision

Origin: 7136ecf
Pull Request: eea145f
Server: 36c7a00624ef16f7d4888f5343fc5e1023b153a8

Test Merge Updated @ 05/22/2025 20:33:30 +00:00:
Server Instance

PVECM: Blue

Merged By

AndroBetel

Revision

Origin: 030879c
Pull Request: eea145f
Server: eb085c5071ac81fe9f8387948a64996244db83e1

Test Merge Updated @ 05/22/2025 20:51:11 +00:00:
Server Instance

PVECM: Blue

Merged By

StinkethStonketh

Revision

Origin: 030879c
Pull Request: eea145f
Server: eeb7a9674454718dac8d22fc1304fd36ea6cc2c0

Test Merge Updated @ 05/23/2025 00:53:51 +00:00:
Server Instance

PVECM: Blue

Merged By

StinkethStonketh

Revision

Origin: 1056165
Pull Request: eea145f
Server: 60eb7352c0a7a7df23824d5c17bf440628aeb3cf

Test Merge Updated @ 05/23/2025 11:11:21 +00:00:
Server Instance

PVECM: Blue

Merged By

AndroBetel

Revision

Origin: 1056165
Pull Request: eea145f
Server: 6f890b6a1ee23b3587925cbde8bca0cd9148b9da

Test Merge Updated @ 05/24/2025 12:35:00 +00:00:
Server Instance

PVECM: Blue

Merged By

Xan

Revision

Origin: 1c66ba4
Pull Request: eea145f
Server: 9a1842a208d4cefe815182dc20fa047d936bc01f

Test Merge Updated @ 05/24/2025 12:55:34 +00:00:
Server Instance

PVECM: Blue

Merged By

Xan

Revision

Origin: 1c66ba4
Pull Request: eea145f
Server: d3d6950aaa68ae570f6fdf420b0a6f8ca61d001c

Test Merge Removed @ 05/25/2025 00:25:15 +00:00:
Server Instance

PVECM: Blue

@BonniePandora BonniePandora enabled auto-merge (squash) May 25, 2025 22:55
@BonniePandora BonniePandora merged commit 2556c61 into cmss13-devs:master May 25, 2025
42 checks passed
cmss13-ci bot added a commit that referenced this pull request May 25, 2025
@Ediblebomb Ediblebomb deleted the it's-a-fucking-shotgun branch May 26, 2025 02:14
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.

5 participants