-
-
Notifications
You must be signed in to change notification settings - Fork 542
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
Moar hair (mostly ponytails) #3520
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
Sprites
A bikeshed full of soulless bikes.
Code change
Watch something violently break.
labels
Oct 10, 2024
shiptest-server
pushed a commit
that referenced
this pull request
Oct 12, 2024
zimon9
pushed a commit
to zimon9/Shiptest-PR-testing
that referenced
this pull request
Oct 29, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> # please please, please do not port this to tg or a non-ship server. this is me asking nicely to not to, i do not want this on a non-shiptest-like server Shoutout to braided for being the first hairstyle to make me go "This is unsalvageable" ## About The Pull Request part of project re:hair It's that time again for the ✨re:hair ✨ pull request! Hair cuts/Replacement chart in case your character breaks: Braid (High) --> Ponytail (Braided) - Done by @Imaginos16 Braid (Floorlength) --> Ponytail (Braided Short) - Done by @Imaginos16 Ponytail (Long) --> Ponytail (Straight) - Done by rye-rice Ponytail (High) --> Ponytail (Straight Short) - Done by rye-rice Ponytail 2 --> Ponytail (Grace) - Done by rye-rice Ponytail 3 --> Ponytail (Grace) - Done by rye-rice Ruby - Done by rye-rice Ruby (Long) - Done by rye-rice Ponytail (Country) - Done by @Imaginos16 Bobcurl - Done by @Imaginos16 Braided \\ Braided Front | --> The Dumpster Braid (Low) | Braid (Short) / ## Why It's Good For The Game ![image](https://github.com/user-attachments/assets/d4d4419e-6be3-4dbc-a897-944a92482f8d) ![image](https://github.com/user-attachments/assets/c93e2214-5de5-453d-ae92-3a4a2656918c) ![image](https://github.com/user-attachments/assets/f97ac5eb-be9d-4081-a1f8-50b69d96d738) ## Changelog :cl: Imaginos16, rye-rice add: A few hairstyles have been resprited! del: the Braided and Braid line of hairs. /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> --------- Co-authored-by: retlaw34 <[email protected]>
zimon9
pushed a commit
to zimon9/Shiptest-PR-testing
that referenced
this pull request
Oct 29, 2024
MrCat15352
pushed a commit
to MrCat15352/MrCat
that referenced
this pull request
Dec 27, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> # please please, please do not port this to tg or a non-ship server. this is me asking nicely to not to, i do not want this on a non-shiptest-like server Shoutout to braided for being the first hairstyle to make me go "This is unsalvageable" ## About The Pull Request part of project re:hair It's that time again for the ✨re:hair ✨ pull request! Hair cuts/Replacement chart in case your character breaks: Braid (High) --> Ponytail (Braided) - Done by @Imaginos16 Braid (Floorlength) --> Ponytail (Braided Short) - Done by @Imaginos16 Ponytail (Long) --> Ponytail (Straight) - Done by rye-rice Ponytail (High) --> Ponytail (Straight Short) - Done by rye-rice Ponytail 2 --> Ponytail (Grace) - Done by rye-rice Ponytail 3 --> Ponytail (Grace) - Done by rye-rice Ruby - Done by rye-rice Ruby (Long) - Done by rye-rice Ponytail (Country) - Done by @Imaginos16 Bobcurl - Done by @Imaginos16 Braided \\ Braided Front | --> The Dumpster Braid (Low) | Braid (Short) / ## Why It's Good For The Game ![image](https://github.com/user-attachments/assets/d4d4419e-6be3-4dbc-a897-944a92482f8d) ![image](https://github.com/user-attachments/assets/c93e2214-5de5-453d-ae92-3a4a2656918c) ![image](https://github.com/user-attachments/assets/f97ac5eb-be9d-4081-a1f8-50b69d96d738) ## Changelog :cl: Imaginos16, rye-rice add: A few hairstyles have been resprited! del: the Braided and Braid line of hairs. /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> --------- Co-authored-by: retlaw34 <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
please please, please do not port this to tg or a non-ship server. this is me asking nicely to not to, i do not want this on a non-shiptest-like server
Shoutout to braided for being the first hairstyle to make me go "This is unsalvageable"
About The Pull Request
part of project re:hair
It's that time again for the ✨re:hair ✨ pull request!
Hair cuts/Replacement chart in case your character breaks:
Braid (High) --> Ponytail (Braided) - Done by @Imaginos16
Braid (Floorlength) --> Ponytail (Braided Short) - Done by @Imaginos16
Ponytail (Long) --> Ponytail (Straight) - Done by rye-rice
Ponytail (High) --> Ponytail (Straight Short) - Done by rye-rice
Ponytail 2 --> Ponytail (Grace) - Done by rye-rice
Ponytail 3 --> Ponytail (Grace) - Done by rye-rice
Ruby - Done by rye-rice
Ruby (Long) - Done by rye-rice
Ponytail (Country) - Done by @Imaginos16
Bobcurl - Done by @Imaginos16
Braided \
Braided Front | --> The Dumpster
Braid (Low) |
Braid (Short) /
Why It's Good For The Game
Changelog
🆑 Imaginos16, rye-rice
add: A few hairstyles have been resprited!
del: the Braided and Braid line of hairs.
/:cl: