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

Adds USCM Patch to Uniforms #5868

Merged
merged 5 commits into from
Mar 25, 2024
Merged

Conversation

MobiusWon
Copy link
Contributor

@MobiusWon MobiusWon commented Mar 2, 2024

About the pull request

Adds the USCM and Falling Falcons patch automatically to vended uniforms.

EDIT: Per the Technical Manual as @morrowwolf shared, only the USCM patch is added now.

Explain why it's good for the game

Get on the ready line Marines!

This is a straightforward PR imo, it looks cool and is lore accurate.

Like rank pins, the unit patch and USCM patch are a standard part of the USCM uniform and all Marines aboard the Almayer would be wearing one. This can be found in the movies as well as technical manuals for the Marines. It also adds some “esprit de corp” for the Falling Falcons USCM, now every player down to the newest one can take pride fighting for liberty.

Testing Photographs and Procedure

Screenshots & Videos

image

Changelog

🆑
NervanCatos
add: Uniforms vend with USCM patch.
/:cl:

@github-actions github-actions bot added the Feature Feature coder badge label Mar 2, 2024
@irakligabunia
Copy link
Contributor

I don't see the "why its good for the game part" you can already vend it and choose it in loadout, why force it?

@MobiusWon
Copy link
Contributor Author

I don't see the "why its good for the game part" you can already vend it and choose it in loadout, why force it?

Like rank pins, the unit patch and USCM patch are a standard part of the USCM uniform and all Marines aboard the Almayer would be wearing one. This can be found in the movies as well as technical manuals for the Marines. It also adds some “esprit de corp” for the Falling Falcons, now every player down to the newest one knows what unit they fight for by examining their uniform.

@Birdtalon
Copy link
Contributor

I think this should stay as it is - a customisation option. I don't think your "Why it's good for the game" is strong enough to make this a mandatory thing.

@GrrrKitten
Copy link
Contributor

GrrrKitten commented Mar 5, 2024

I feel like this would be good for the PR feedback forum but there are two things I want to state: 1, if you use armor with shoulders, these dont show up. same if you roll up your sleeves, so most people wont be having it still.

  1. after rewatching the movie yesterday, I really feel like this is part of the outfit we are missing. our basic USCM uniform is really one of our worst aesthetic choices that I feel this PR helps significantly

most people already dont use this cause it just adds even more work to the round start, I think this is a really good addition

@Skatuk
Copy link

Skatuk commented Mar 7, 2024

You can remove patches anyway, don't see the problem.

@irakligabunia
Copy link
Contributor

You can remove patches anyway, don't see the problem.

"most people already dont use this cause it just adds even more work to the round start, I think this is a really good addition" wouldnt this apply then lo

@MobiusWon
Copy link
Contributor Author

You can remove patches anyway, don't see the problem.

"most people already dont use this cause it just adds even more work to the round start, I think this is a really good addition" wouldnt this apply then lo

The logical path is that the vast majority of players, like with rank pins, will not care about the patches being there or not. However, for the small percentage that do care, they still have an ability to remove it. If that small percentage somehow turnsout to be a large percentage then the PR can be reverted.

@morrowwolf
Copy link
Member

image

Tech Manual quote. I think a solid middle ground that remains consistent and allows for customization still would be just the USCM patch.

@MobiusWon MobiusWon changed the title Adds USCM and Falling Falcons Patch to Uniforms Adds USCM and ~~Falling Falcons Patch~~ to Uniforms Mar 14, 2024
@MobiusWon MobiusWon changed the title Adds USCM and ~~Falling Falcons Patch~~ to Uniforms Adds USCM and ~Falling Falcons Patch~ to Uniforms Mar 14, 2024
@MobiusWon MobiusWon changed the title Adds USCM and ~Falling Falcons Patch~ to Uniforms Adds USCM and Falling Falcons Patch to Uniforms Mar 14, 2024
@MobiusWon MobiusWon changed the title Adds USCM and Falling Falcons Patch to Uniforms Adds USCM to Uniforms Mar 14, 2024
@MobiusWon
Copy link
Contributor Author

image

Tech Manual quote. I think a solid middle ground that remains consistent and allows for customization still would be just the USCM patch.

Thanks morrow, I have change the PR to reflect this lore.

@MobiusWon MobiusWon changed the title Adds USCM to Uniforms Adds USCM Patch to Uniforms Mar 17, 2024
Copy link
Contributor

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 ~ 7 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 beg a maintainer to review your PR label Mar 25, 2024
code/game/machinery/vending/cm_vending.dm Outdated Show resolved Hide resolved
@Drulikar Drulikar enabled auto-merge March 25, 2024 23:04
@Drulikar Drulikar added this pull request to the merge queue Mar 25, 2024
Merged via the queue into cmss13-devs:master with commit 2b19672 Mar 25, 2024
26 checks passed
cm13-github added a commit that referenced this pull request Mar 25, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Stale beg a maintainer to review your PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants