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

Adds a fade for the curly bob #19008

Merged
merged 5 commits into from
May 28, 2024
Merged

Adds a fade for the curly bob #19008

merged 5 commits into from
May 28, 2024

Conversation

klushy225
Copy link
Contributor

@klushy225 klushy225 commented May 19, 2024

[OBJECTS]
(I didn't really know what to label this for the area, so I just chose objects. That is the closest lable I could think of)

About the PR

Adds a simple fade for the curly bob that applies well to other hairstyles.
image
image
image
image

Why's this needed?

I think the amount of fades available for the shorter hairstyles are quite lacking, so I decided to make one. If people like this one then I'll probably make fades for the rest of the short hairs later on down the line.

Changelog

(u)Klushy225
(+)Added a fade style for the curly bob

@boring-cyborg boring-cyborg bot added the C-Sprites Automatically applied on any .dmi or icons folder change label May 19, 2024
@github-actions github-actions bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label May 19, 2024
@keywordlabeler keywordlabeler bot added the A-Game-Objects The point of this PR is to deal with a specific game object label May 19, 2024
@klushy225
Copy link
Contributor Author

realised I accidentally left the unfinished jelly fade I was making in there- that was not meant to be in the PR, just the curly bob

Copy link
Contributor

@TobleroneSwordfish TobleroneSwordfish left a comment

Choose a reason for hiding this comment

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

Fades should be blocked from random character generation, otherwise looks good 👍

code/datums/customization_styles.dm Show resolved Hide resolved
Co-authored-by: TobleroneSwordfish <20713227+TobleroneSwordfish@users.noreply.github.com>
@klushy225
Copy link
Contributor Author

mh I don't like the east facing sprite, I'm redoing it /:

@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 28, 2024
@frawhst
Copy link
Member

frawhst commented May 28, 2024

!merge_upstream

@frawhst frawhst merged commit ea5cb77 into goonstation:master May 28, 2024
2 checks passed
github-actions bot pushed a commit that referenced this pull request May 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-Game-Objects The point of this PR is to deal with a specific game object C-Sprites Automatically applied on any .dmi or icons folder change S-Merge-Conflict Applied and removed when a PR has or no longer has a merge conflict size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants