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

Minor additons to Synth vendor, renames a uniform used by colonists #6010

Merged
merged 2 commits into from
Mar 26, 2024

Conversation

QuickLode
Copy link
Contributor

@QuickLode QuickLode commented Mar 25, 2024

About the pull request

This PR adds 2 items to Synth Vendor, a purple armband and a requested white suit & tie.

This suit & tie was previously named "Captain's Service Uniform" and used for years as a colonist uniform - specifically the plain clothes WY Security Guard. The name is weird.

However, at some point, it was renamed to Commanding Officer's Service Uniform and this makes the name even worse. Plain clothed WYSec are the guys in suits next to CLs who don't break the mood with their ugly orange or white more police/militarized counterparts. To be honest i have attended a lot of CO events and I've never seen anyone wear this LOL
It is a suit and tie with black slacks, so I understand why it was added originally. The distinction of it being a dress down uniform is unnecessary

I added a counterpart so we don't have to have this distinction while keeping the classic colonists in.

Explain why it's good for the game

This separates the colony/synths from COs so that they don't have to share names, even if its rarely used by the latter. More immersive this way

Testing Photographs and Procedure

[

[Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.
https://cdn.discordapp.com/attachments/975247220960014386/1221646023261294632/image.png?ex=66135585&is=6600e085&hm=c1eb0ac96f2f9feb992d3f8fbe9c4976dc2854be16ecdf4f6aee708cb7bb90cc&

Changelog

🆑
add: adds a purple armband and uniform to Synth Vendor
add: adds a renamed uniform commonly used by colonists with a better name
/:cl:

@cm13-github
Copy link
Contributor

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

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Mar 25, 2024
@github-actions github-actions bot added the Feature Feature coder badge label Mar 25, 2024
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Mar 25, 2024
@cm13-github
Copy link
Contributor

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

@Drulikar Drulikar added this pull request to the merge queue Mar 26, 2024
Merged via the queue into cmss13-devs:master with commit 6444fec Mar 26, 2024
26 checks passed
cm13-github added a commit that referenced this pull request Mar 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants