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.

Sign up for GitHub

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

Jump to bottom

New Marine Hairstyles #6641

Merged
merged 5 commits into from
Oct 26, 2024
Merged

New Marine Hairstyles #6641

merged 5 commits into from
Oct 26, 2024

Conversation

zc-byte-boxer
Copy link
Contributor

About the pull request

I have tested these changes. This PR adds 12 new hairstyles for marines to use that are designed around helmets.

Explain why it's good for the game

Adds more customization options for marines.

Testing Photographs and Procedure

Screenshots & Videos

Loaded up local host and tried these sprites on from the character editor.

image

image

image

image

Tested hairs.

image

All newly added hairs.

Changelog

🆑 Byte-Boxer
add: Added 12 new hairstyles for marines!
/:cl:

@github-actions github-actions bot added Sprites Remove the soul from the game. Feature Feature coder badge labels Jul 7, 2024
@zc-byte-boxer
Copy link
Contributor Author

Hairs done by Mossmoth.

@github-actions GitHub Actions
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 Jul 15, 2024
@Drulikar Drulikar requested a review from a team July 15, 2024 18:04
@Drulikar Drulikar added Stale Exempt PR can't go stale and removed Stale beg a maintainer to review your PR labels Jul 15, 2024
@Drulikar
Copy link
Contributor

Stale exempt until sprite reviewed.

nauticall
nauticall requested changes Jul 25, 2024
View reviewed changes
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.

the hair having a gray base practically guarantees it will throw off any coloring people try to put on it. should be darkened to near-black like all the other ones for the sake of consistency. either that or make every other hair gray to compensate (which i know is out of scope)

@nauticall nauticall removed the Stale Exempt PR can't go stale label Jul 25, 2024
@Drulikar Drulikar marked this pull request as draft July 28, 2024 11:50
@zc-byte-boxer zc-byte-boxer marked this pull request as ready for review July 31, 2024 07:25
@zc-byte-boxer
Copy link
Contributor Author

image

Should be done and good, @nauticall

@zc-byte-boxer
Copy link
Contributor Author

@nauticall

@zc-byte-boxer
Copy link
Contributor Author

@nauticall

@nauticall nauticall added the Sprites Approved confirmed no stray pixels label Oct 22, 2024
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Oct 26, 2024
@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 Oct 26, 2024
@cm13-github
Copy link
Contributor

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

@Blundir Blundir added this pull request to the merge queue Oct 26, 2024
Merged via the queue into cmss13-devs:master with commit b6b18e5 Oct 26, 2024
27 checks passed
cmss13-ci bot added a commit that referenced this pull request Oct 26, 2024
@cmss13-ci
Automatic changelog for PR #6641 [ci skip]
d1eda18
@DorfGuy1
Copy link

Fairly Certain you broke something. All of a sudden hair styles that worked fine yesterday are completely different.

@DorfGuy1
Copy link

Please refer to #7393
Thank you.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Blundir Blundir Blundir approved these changes

@nauticall nauticall nauticall approved these changes

Assignees
No one assigned
Labels
Feature Feature coder badge Sprites Approved confirmed no stray pixels Sprites Remove the soul from the game.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@zc-byte-boxer @Drulikar @cm13-github @DorfGuy1 @nauticall @Blundir