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

Implements M1911 pistol into Loadout Options and changes its sprite. #126

Merged
merged 4 commits into from
Feb 28, 2024
Merged

Conversation

grifp71
Copy link
Contributor

@grifp71 grifp71 commented Feb 27, 2024

This was initially a PR made by Merrgear, #121, though he has become busy and has given me permission to continue in its stead with this PR.

This PR:

  • Implements a slightly edited sprite for the regular M1911 in its holstered, regular, and empty state. It changes the colors, utilizing the grip panel palette from the normal M4A3 in place of the (arguably) ugly grips on the original M1911, as the original seem to jarringly stand out.

  • Implements the M1911, god's own anti son of a bitch stick, to the loadout buy screen for 4 points (same price as other pistols), allowing a Marine to spawn with it. It comes in a carrying case like the Type 73 with a total of three mags (one loaded). This will allow Marines to vanquish their enemies. The M4A3 kills the body, the M1911 kills the soul.

  • In line with requests made by maintainers on Merrgear's last PR. Ammunition count has been reduced from the original mag count, usage of the SOCOM has been canned.

Everything is locally tested and SHOULD work. This just adds a little bit of flavor and a cool gun that fits the faction.

Thank you for your consideration.

@FslashN FslashN merged commit 3cac2d9 into cmss13-devs:master Feb 28, 2024
32 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants