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

[MSX] Some junk #2610

Merged
merged 24 commits into from
Jan 21, 2025
Merged

[MSX] Some junk #2610

merged 24 commits into from
Jan 21, 2025

Conversation

gettingusedto
Copy link
Contributor

@gettingusedto gettingusedto commented Jan 21, 2025 •
edited
Loading

Summary

some stuff and fixes

Content of the change

Basegame

  • lighthouse (overmap sprite)
  • moonshine still (overmap sprite)
  • gasoline generator (portable and powerful variant. item, furniture, and appliance )

Xedra Evolved

  • balefire
  • throne

Fixes

  • fixes the wielded sprite for wooden spear and makeshift knife spear
  • fixes worn sprites for some fursuits

Testing

Screenshot_20250121_182158
Screenshot_20250121_181827
Screenshot_20250121_180120
Screenshot_20250121_175704

Additional information

@gettingusedto
fix wooden spear wielded sprite not showing up
4cffbf6
@gettingusedto
Create overlay_wielded_spear_knife.json
ebf9930
@gettingusedto
fix some fursuit worn sprites not showing
783a63a
@gettingusedto
Create xe_f_balefire.json
6adddd4
@gettingusedto
Add files via upload
f93863e
@gettingusedto
Add files via upload
fd3cd28
@gettingusedto
Create portable_generator.png
8a9127e
@gettingusedto
Add files via upload
2751a9f
@gettingusedto
Create f_portable_generator.png
ff08a35
@gettingusedto
Add files via upload
f985bd7
@gettingusedto
Create f_12000_gasoline_generator.png
7381761
@gettingusedto
Add files via upload
b0021d2
@gettingusedto
Create 12000_gasoline_generator.png
3db09ed
@gettingusedto
Add files via upload
a2c901c
@gettingusedto
Create moonshine_still.json
6412496
@gettingusedto
Add files via upload
4c6d9ac
@gettingusedto
Create lighthouse.json
dd52cdf
@gettingusedto
Add files via upload
cf06e71
@gettingusedto
Update xe_f_balefire.json
0c47442
@gettingusedto
Delete gfx/MShockXotto+/pngs_overmap_tall_32x48/moonshine_still direc…
0429351 
…tory
@gettingusedto
Create moonshine_still.json
3723388
@gettingusedto
Add files via upload
2099c77
@gettingusedto
Update gasoline_generator.json
d0be6e0
@gettingusedto
Update portable_generator.json
2067d63
@gettingusedto gettingusedto marked this pull request as ready for review January 21, 2025 11:27
@Fris0uman Fris0uman merged commit fd15af3 into I-am-Erk:master Jan 21, 2025
2 checks passed
@gettingusedto gettingusedto deleted the some-junk branch January 21, 2025 11:35
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
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@gettingusedto @Fris0uman