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

Personal Civilian Clothing Storage Unit For Marines #6401

Merged
merged 1 commit into from
Jun 16, 2024

Conversation

Steelpoint
Copy link
Contributor

@Steelpoint Steelpoint commented Jun 8, 2024

About the pull request

Adds a set of civilian clothing vendors on the Almayer in the Gym., these vendors can be used by anyone to vend civilian style clothing, the contents are almost identical to the Synthetic clothing vendor, minus the military themed clothing and unique backpack/similar options. These vendors are locked behind a set of shutters with the same high-level access requirements as the Dress uniform vendors, so CIC can determine when access is authorized.

Anyone can access the vendor, each person has a 120 point limit to what they can buy.

Explain why it's good for the game

Grants regular Marines the ability to vend their own personal civilian clothing, for events or whenever CIC authorizes it (Maybe a event where the marines are going on shore leave before something terrible happened?).

The advantage here is to further allow regular players to craft their own characters apperance and roleplay what they might wear off-duty, in circumstances that allow for it.

The area is locked thus CIC has control on when Marines can access it, and there is also the fact it is the job of the MPs to ensure Marines are wearing proper clothing.

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑
mapadd: Civilian Clothing Storage Vendors have been added to the Gym on the USS Almayer. These allow anyone to vend civilian clothes. These vendors require CIC access to unlock however.
/:cl:

@Steelpoint Steelpoint requested a review from Nanu308 as a code owner June 8, 2024 04:59
@github-actions github-actions bot added the Mapping did you remember to save in tgm format? label Jun 8, 2024
@CeUvi
Copy link

CeUvi commented Jun 8, 2024

What is the reasoning behind locking the vendor under CIC access? It seems like either CIC will open them every round anyway or forget about them entirely and in both those scenarios not having it locked under CIC access sounds a lot better IMO.

@hislittlecuzingames
Copy link
Contributor

What is the reasoning behind locking the vendor under CIC access? It seems like either CIC will open them every round anyway or forget about them entirely and in both those scenarios not having it locked under CIC access sounds a lot better IMO.

Probably beta test or prevent front lines being full of booty jorts and crop tops.

@Steelpoint
Copy link
Contributor Author

What is the reasoning behind locking the vendor under CIC access? It seems like either CIC will open them every round anyway or forget about them entirely and in both those scenarios not having it locked under CIC access sounds a lot better IMO.

This PR has the most minimal impact on the average game. The MPs, CIC and the Commander are still bound by the SOP's to make Marines follow a proper dress code, and whilst it is the duty of the MPs to ensure Marines follow proper dress code, I nonetheless felt that this implementation of restricting the civilian clothing so that only CIC or admins can allow it to occur, would be the best way to implement it in such a way that this PR would be accepted.

Perhaps there will be room to allow more free access to these items in the future, or even to allow free access in this very PR. But I chose to start conservatively.

@Lagomorphica
Copy link
Contributor

Perhaps there will be room to allow more free access to these items in the future, or even to allow free access in this very PR

if service jackets and service uniforms are locked behind CO access (not just CiC - this PR also locks it behind the CO, which is good and it should be kept as that if it is even merged) then this should also be locked behind the same thing rather than being free access

@Zonespace27 Zonespace27 added the Feature Feature coder badge label Jun 8, 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 Jun 16, 2024
Copy link
Member

@harryob harryob left a comment

Choose a reason for hiding this comment

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

what's the worst that could happen

@harryob harryob added this pull request to the merge queue Jun 16, 2024
Merged via the queue into cmss13-devs:master with commit 688a321 Jun 16, 2024
29 checks passed
cm13-github added a commit that referenced this pull request Jun 16, 2024
@Steelpoint Steelpoint deleted the Civilian branch June 16, 2024 11:19
@nuklearcellphoneg
Copy link

Look,

Put the Robustness Award Plaque back on the wall. I don't care about the uniform vendor nonsense, let marines die in a jacket if they want to, but put the plaque back.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Mapping did you remember to save in tgm format? Stale beg a maintainer to review your PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants