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

Modified marisa hair sprite. #35

Merged
merged 7 commits into from
Jan 20, 2025
Merged

Modified marisa hair sprite. #35

merged 7 commits into from
Jan 20, 2025

Conversation

Merrokitsune
Copy link
Owner

@Merrokitsune Merrokitsune commented Jan 16, 2025 •
edited
Loading

Description

Modifies the marisa hair sprite for consistency reasons. Also, I don't really like the full-neon aesthetic the old sprite gives.
The old marisa hair sprite can be brought back, via a petition.

Media

Old:
Screenshot from 2025-01-16 20-57-59
Screenshot from 2025-01-16 20-58-10
Screenshot from 2025-01-16 20-58-20
Screenshot from 2025-01-16 20-58-29
Screenshot from 2025-01-16 20-58-50
Screenshot from 2025-01-16 20-58-59
Screenshot from 2025-01-16 20-59-11
Screenshot from 2025-01-16 20-59-22

New:
Screenshot from 2025-01-16 22-31-42
Screenshot from 2025-01-16 22-31-52
Screenshot from 2025-01-16 22-32-03
Screenshot from 2025-01-16 22-32-15
Screenshot from 2025-01-16 22-32-50
Screenshot from 2025-01-16 22-32-59
Screenshot from 2025-01-16 22-33-09
Screenshot from 2025-01-16 22-33-18

Characters made using this hair:
Screenshot from 2025-01-16 22-38-52
Screenshot from 2025-01-16 22-48-54
Screenshot from 2025-01-16 22-51-06
Screenshot from 2025-01-16 22-52-41
Screenshot from 2025-01-16 23-02-57

Changelog

🆑

  • tweak: Marisa hair got resprited to be consistent with other hair.

@github-actions github-actions bot added Changes: YML Changes any `.yml` files. Changes: Sprite Changes any `.png` or `.json` in a RSI. labels Jan 16, 2025
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jan 16, 2025 •
edited
Loading

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

Resources/Textures/_Ronstation/Mobs/Customization/human_hair.rsi

State Old New Status
marisa Added

Edit: diff updated after 935789c

@Merrokitsune Merrokitsune added the Priority: 5-Whenever Doesn't matter when this gets resolved. label Jan 16, 2025
@github-actions github-actions bot added the Status: Needs Review Someone please review this. label Jan 16, 2025
@Merrokitsune Merrokitsune marked this pull request as ready for review January 16, 2025 19:42
GitHubUser53123
GitHubUser53123 reviewed Jan 20, 2025
View reviewed changes
Copy link
Collaborator

@GitHubUser53123 GitHubUser53123 left a comment

Choose a reason for hiding this comment

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

just add an old marisa hair and a new marisa hair

@Merrokitsune
Copy link
Owner Author

Merrokitsune commented Jan 20, 2025 •
edited
Loading

@GitHubUser53123, you can merge.

@GitHubUser53123
Copy link
Collaborator

waiting for checks

@Merrokitsune
Copy link
Owner Author

Merrokitsune commented Jan 20, 2025 •
edited
Loading

Sure.
It's gonna take a while though.

@GitHubUser53123 GitHubUser53123 merged commit 186828e into master Jan 20, 2025
11 of 12 checks passed
@Merrokitsune Merrokitsune deleted the Marisa-hair-modifications- branch January 20, 2025 14:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GitHubUser53123 GitHubUser53123 GitHubUser53123 left review comments

Assignees
No one assigned
Labels
Changes: Sprite Changes any `.png` or `.json` in a RSI. Changes: YML Changes any `.yml` files. Priority: 5-Whenever Doesn't matter when this gets resolved. Status: Needs Review Someone please review this.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Merrokitsune @GitHubUser53123