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

Hair! #51

Merged
merged 17 commits into from
Oct 24, 2023
Merged

Hair! #51

merged 17 commits into from
Oct 24, 2023

Conversation

Colin-Tel
Copy link
Contributor

@Colin-Tel Colin-Tel commented Sep 27, 2023

About the PR

Things are about to get hairy.

This PR is for adding the hairstyles that were "modernized" that look subjectively better than their replacements.

It is intended that this PR remains a draft until players are able to play on the rebase version, and they are then able to point out which hairstyles should make a return. (either in a PR comment, in the Discord, or otherwise) yeah that didn't happen lol

Technical details

Prettified the human_hair.rsi meta.json so it doesn't look terrible.

Media

image
image
image
image

Things are about to get hairy
@github-actions github-actions bot added the Changes: YML Changes any yml files label Sep 27, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Sep 27, 2023

RSI Diff Bot; head commit ac379dd merging into d0a4745
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/DeltaV/Mobs/Customization/hair.rsi

State Old New Status
classicgentle Added
classiclowfade Added
classicmedfade Added
classicnofade Added

Edit: diff updated after ac379dd

@FluffiestFloof
Copy link
Contributor

FluffiestFloof commented Sep 27, 2023

Fade (None)
nofade.png

Actually probably all the fades

Classic High fade is indistinguishable from High fade,  at least to me it is.
@github-actions
Copy link
Contributor

github-actions bot commented Oct 9, 2023

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

@Colin-Tel
Copy link
Contributor Author

this meta file SUCKS

Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
@github-actions github-actions bot added Status: Merge Conflict Fix your PR! and removed Status: Merge Conflict Fix your PR! labels Oct 9, 2023
@github-actions
Copy link
Contributor

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

@DebugOk
Copy link
Contributor

DebugOk commented Oct 18, 2023

You ever gonna finish this? Or do we close it for now

@Colin-Tel
Copy link
Contributor Author

Colin-Tel commented Oct 18, 2023

I was intending on keeping it open until people find more hairstyles, so it could all be in one PR, but I think I'll just send it with the few hairstyles we've found so far. I'll fix it before Monday this was a fuckin LIE 😭

@Colin-Tel Colin-Tel closed this Oct 24, 2023
@Colin-Tel Colin-Tel reopened this Oct 24, 2023
@github-actions github-actions bot removed the Status: Merge Conflict Fix your PR! label Oct 24, 2023
Moved the added hairstyles to Delta directory
whitespace :trollface:
untouched the file

Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
why didn't it do this last commit grrr aaah
Fully removed the added hairstyles from any upstream files.
@Colin-Tel Colin-Tel marked this pull request as ready for review October 24, 2023 13:30
Copy link
Contributor

@FluffiestFloof FluffiestFloof left a comment

Choose a reason for hiding this comment

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

Looks good except the fact that they don't follow the same naming convention?
HumanHairBobClassic = Bob Hair Classic
HumanHairClassicGentle = Classic Gentle

@Colin-Tel
Copy link
Contributor Author

Looks good except the fact that they don't follow the same naming convention? HumanHairBobClassic = Bog Hair Classic HumanHairClassicGentle = Classic Gentle

lol that is true, because I merged the PR that added those hairstyles like 10 minutes before I finished this PR, and prior to that there was no precedent set.

@Colin-Tel
Copy link
Contributor Author

I'm fine with having Classic Gentle becoming Gentle Classic, but Classic Fade (Medium) into Fade Classic (Medium) just rubs me the wrong way.

per floofy review

Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
@Colin-Tel Colin-Tel enabled auto-merge (squash) October 24, 2023 14:19
@Colin-Tel
Copy link
Contributor Author

image
nvm this is best

@Colin-Tel Colin-Tel enabled auto-merge (squash) October 24, 2023 14:34
@Colin-Tel Colin-Tel merged commit c0fbf71 into DeltaV-Station:master Oct 24, 2023
12 checks passed
@Colin-Tel Colin-Tel deleted the hairtodaygonetomorrow branch June 3, 2024 05:59
TypoChel1 pushed a commit to TypoChel1/Ifi07 that referenced this pull request Jul 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants