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

New CIC uniform #4320

Merged
merged 19 commits into from
Sep 26, 2023
Merged

New CIC uniform #4320

merged 19 commits into from
Sep 26, 2023

Conversation

CapCamIII
Copy link
Contributor

@CapCamIII CapCamIII commented Sep 2, 2023

About the pull request

Does new CIC sprites, they look cool.
New cosmetic options with brown gloves and boots
New outfit that looks like the operation uniform gorman wears in the movie
CTs getting actual caps instead of beanies is nice, RO(i'm not calling it QM 🖕) still has a distinct hat to seperate the two out.

Explain why it's good for the game

New sprites, service uniforms being static to the map makes sense as the operations uniform is what is wore groundside in the movie, service uniform is more of a shipside/non-combat uniform

Images

image

Changelog

🆑 CapCamIII, AmoryBlaine
add: Adds new service uniform sprite that is standard across maps, sprites by AmoryBlaine
add: Resprites old dress uniform, renames it, adds to XO vendor as a uniform choice as it fits there now, sprites by AmoryBlaine
add: Adds new uniform, command boiler suit like gorman wears in the movie, available in SO locker, SO vendor, XO vendor, CO vendor, sprites by AmoryBlaine
add: Adds new brown versions of gloves and boot to custom loadout, also lowers the price of jungle boots to two, sprites by AmoryBlaine
add: Seperates officer cap and RO cap, officers get officer cap, QM gets RO cap, CTs get req cap, sprites once again by AmoryBlaine
add: UPP boots and gloves use the new brown sprite, as it fits their color scheme and looks cool.
fix: Freelancer leader now spawns with a knife in their boots
imageadd: Resprites patrol cap, officer cap, SEA cap, standard black boot, standard black glove, and formal gloves, sprites by AmoryBlaine
/:cl:

@github-actions github-actions bot added Sprites Remove the soul from the game. Feature Feature coder badge Fix Fix one bug, make ten more labels Sep 2, 2023
@CapCamIII CapCamIII changed the title New SO uniform New CIC uniform Sep 2, 2023
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Sep 4, 2023
@cm13-github
Copy link
Contributor

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

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Sep 4, 2023
@cm13-github
Copy link
Contributor

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

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Sep 8, 2023
@cm13-github
Copy link
Contributor

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

@kooarbiter
Copy link

I can't believe nobody's discussing the huge balance change of giving one random ert role a bootknife smh smh

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Sep 8, 2023
@cm13-github
Copy link
Contributor

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

Copy link
Contributor

@nauticall nauticall left a comment

Choose a reason for hiding this comment

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

As much as everyone likes to talk about movie accuracy, this is one of the instances where I think an exception should be made. The boiler suits, while they look good, don't represent the idea of an "officer" at all, and if the star wasn't there, people would easily confuse SOs for being maint/cargo techs or janitors. The existing dress shirt + slacks combination, while a bit uptight for a ship's uniform, does the job of distinguishing the SO as an officer and someone to actually at least try to take seriously.

I'm not saying to scrap these boiler uniforms entirely, but they should not be used as staff officer uniforms, sorry. People are not gonna look at them and think, "oh, an officer". If they don't want to look like an officer then they can just wear regular fatigues.

Copy link
Contributor

@nauticall nauticall left a comment

Choose a reason for hiding this comment

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

image
White uniform lacks contrast here and conflicts with existing styles on whites. Not saying to blacken the edges completely, but make the outlines slightly darker.

image
We already have dress blues, they just haven't been added to uniform vendors yet. Making yet another 'dress' uniform for marines will just add to confusion and redundancy.

image
Boots are too dark. Make them match the brown gloves in palette.

image
Palette for the gloves here are all over the place. You'd be better off just having it use the same sprite as the latex gloves, honestly, or at least basing the sprite off those. Both latex and formal cloth gloves are white and smooth-textured.

@CapCamIII CapCamIII closed this Sep 9, 2023
@CapCamIII CapCamIII marked this pull request as draft September 9, 2023 15:55
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Sep 11, 2023
@cm13-github
Copy link
Contributor

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

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Sep 11, 2023
@cm13-github
Copy link
Contributor

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

@LC4492
Copy link
Contributor

LC4492 commented Sep 12, 2023

As an idea, I think it would be nice if the Chief Engineer also received a more..."tailored" outfift, of which the beret matched with a possible officer jacket, but this is already good as it is

@CapCamIII CapCamIII marked this pull request as ready for review September 15, 2023 21:43
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Sep 24, 2023
@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 cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Sep 24, 2023
Copy link
Contributor

@nauticall nauticall left a comment

Choose a reason for hiding this comment

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

👌 sprites good now, cheers

@morrowwolf
Copy link
Member

morrowwolf commented Sep 26, 2023

TM'ing just in case of any niche issues

@morrowwolf morrowwolf added the Testmerge Candidate we'll test this while you're asleep and the server has 10 players label Sep 26, 2023
@morrowwolf morrowwolf added this pull request to the merge queue Sep 26, 2023
Merged via the queue into cmss13-devs:master with commit 513f645 Sep 26, 2023
25 checks passed
cm13-github added a commit that referenced this pull request Sep 26, 2023
@CapCamIII CapCamIII deleted the so-stuff branch September 26, 2023 16:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Fix Fix one bug, make ten more Sprites Remove the soul from the game. Testmerge Candidate we'll test this while you're asleep and the server has 10 players
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants