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

MartialArtist geta shoes #1520

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

MartialArtist geta shoes #1520

wants to merge 10 commits into from

Conversation

FluffiestFloof
Copy link
Contributor

@FluffiestFloof FluffiestFloof commented Apr 28, 2023 •
edited
Loading

About the PR

Replaces the Martial Artist very real wizard sandals with geta sandals.
Also replaces the six Shoukou real wizard shoes with geta sandals.

Media

  • Have an icon for the shoes.
  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Changelog

🆑

  • add: Added a pair of geta sandals for the Martial Artist.

@Vordenburg
Copy link
Collaborator

They should just have actual footwear and not use wizard shoes. There's clearly a need because on the map, they have a forced description.

@FluffiestFloof
Copy link
Contributor Author

They should just have actual footwear and not use wizard shoes. There's clearly a need because on the map, they have a forced description.

I mean I can yaml a new footwear called "geta" just for them but they'll just have the same sprite since they are 'technically' sandals.

@FluffiestFloof FluffiestFloof changed the title MartialArtist fake shoes and service headset MartialArtist geta shoes and service headset Apr 28, 2023
@FluffiestFloof FluffiestFloof marked this pull request as draft April 28, 2023 22:57
@FluffiestFloof FluffiestFloof changed the title MartialArtist geta shoes and service headset MartialArtist geta shoes Apr 29, 2023
@github-actions
Copy link

github-actions bot commented May 7, 2023

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

@FluffiestFloof
Revert shoukou changes
17ad251 
Should fix merge conflict
@Vordenburg
Copy link
Collaborator

Will you be returning to this?

@FluffiestFloof
Copy link
Contributor Author

Whenever I get a sprite for the icon

@FluffiestFloof
Geta shoes
d91c899 
After 6 months I finally got those sprites
@FluffiestFloof FluffiestFloof marked this pull request as ready for review September 15, 2023 11:27
@FluffiestFloof FluffiestFloof mentioned this pull request Sep 15, 2023
Closed
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Changes: Map Changes: Sprites No C#
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@FluffiestFloof @Vordenburg