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

USCM Aux Roles, Alt Camo Overhaul and Soul Enforcement #559

Merged
merged 140 commits into from
Dec 28, 2024

Conversation

AmoryBlaine
Copy link
Contributor

@AmoryBlaine AmoryBlaine commented Nov 17, 2024

Changes to most existing remaining marine prop roles, and simplification of camo variety for the sake of a solid aesthetic for the marines.

  • Berets are now limited to a civilian style beret in red or black. For now. :')
  • Patrol Caps are now separated into jungle, desert and snow which you can get at any time.
  • Expedition Caps and Boonies also are separated into their own versions you can get regardless of the round.
  • USCM Red PT shorts in loadout
  • Snow armor is green.
  • Desert BDU matches desert armor
  • Updated Apone's hat
  • Goggle replacements
  • MREs no longer have water bottles (Soul)
  • Scout Sniper Preset
  • Specialized Weapons Preset
  • SADAR guy Preset
  • UACG Militiamen get M3 variant akin to The Classic camo colour.
  • FORECON, Scout Snipers use a variant of M3 based off the demolition specialist's armor
  • re-adds a barebones MARSOC loadout for GM use

🆑 AmoryBlaine
add: overhaul of USCM gear presets, clothing, ect
del: PvP centric presets for marines
/:cl:

@github-actions github-actions bot added Feature Removal and removed Missing Changelog Maintainers always document their changes. labels Dec 17, 2024
@cm13-github
Copy link
Contributor

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

@cm13-github
Copy link
Contributor

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

@cm13-github
Copy link
Contributor

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

@cm13-github
Copy link
Contributor

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

@DexterDude DexterDude merged commit 7840aeb into cmss13-devs:master Dec 28, 2024
38 checks passed
cm13-github added a commit that referenced this pull request Dec 28, 2024
@AmoryBlaine AmoryBlaine deleted the USCM-remaining-overhaul branch January 16, 2025 08:12
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