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

Brown Pants medal, red captain reward, and slight sprite fixes to alt coloured captain gear. #4860

Merged
merged 5 commits into from May 27, 2021

Conversation

DimWhat
Copy link
Contributor

@DimWhat DimWhat commented May 24, 2021

[Medal] [Sprites]

About the PR

Adds a new medal "Brown Pants" which has the reward of the red captain set. This alters the blue captain reward's code as to not be broken with the red captain clothing as well. Also raises the blue captain fancy uniform up two pixels because it was too low on the human base and raises the blue captain's coat and red captain's coat object states one pixel as to be the same as the captain's coat.
image
image

Why's this needed?

We've had the red captain sprites for longer than I've been around and have been completely unused. I believe there should be a method of unlocking the clothing available.

Changelog

(u)DimWhat
(*)Added a new medal "Brown Pants" which has the reward of the red captain set.
(+)Made a red version of the captain's fancy uniform.

@boring-cyborg boring-cyborg bot added the C-Sprites Automatically applied on any .dmi or icons folder change label May 24, 2021
@keywordlabeler keywordlabeler bot added the A-Medal Adds or modifies a medal label May 24, 2021
@github-actions github-actions bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label May 24, 2021
@DimWhat
Copy link
Contributor Author

DimWhat commented May 24, 2021

The reward now works perfectly. I consider it ready.

@DimWhat DimWhat marked this pull request as ready for review May 24, 2021 19:50
@DimWhat DimWhat changed the title Brown Pants medal, red captain reward,and a slight blue cap fancy sprite fix. Brown Pants medal, red captain reward, and slight sprite fixes to alt coloured captain gear. May 24, 2021
@Studenterhue Studenterhue added the E-Add-To-Wiki A PR that will require changes to the wiki label May 25, 2021
@Eagletanker
Copy link
Contributor

Finally, Poo (jokes) has returned

@Gannets
Copy link
Contributor

Gannets commented May 26, 2021

Not sure how I feel about the red sash on a red uniform, but aside from that I love this idea.

@github-actions github-actions bot added the S-Merge-Conflict Applied and removed when a PR has or no longer has a merge conflict label May 26, 2021
@github-actions github-actions bot removed the S-Merge-Conflict Applied and removed when a PR has or no longer has a merge conflict label May 26, 2021
@UrsulaMejor UrsulaMejor merged commit 82012aa into goonstation:master May 27, 2021
github-actions bot pushed a commit that referenced this pull request May 27, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-Medal Adds or modifies a medal C-Sprites Automatically applied on any .dmi or icons folder change E-Add-To-Wiki A PR that will require changes to the wiki size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants