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] Random junk i forgot to submit #2259

Merged
merged 21 commits into from
Dec 27, 2023
Merged

[MSX] Random junk i forgot to submit #2259

merged 21 commits into from
Dec 27, 2023

Conversation

gettingusedto
Copy link
Contributor

@gettingusedto gettingusedto commented Dec 27, 2023 •
edited
Loading

Summary

buncha stuff

Content of the change

Basegame

  • wooden tankard
  • mi-go meat
  • hexamine
  • vibrator
  • waffle iron
  • sports bra (item)
  • makeshift pot
  • bindle (item)
  • long skirt (worn)
  • white beard (worn)
  • varsity jacket (all variants, worn)
  • map board (furniture)

BombasticPerks

  • homunculus (monster)

Testing

Screenshot_2023-12-27_18-29-29_1

Additional information

@gettingusedto
Add files via upload
008ae6b
@gettingusedto
Create .gitkeep
026c25b
@gettingusedto
Add files via upload
a334231
@gettingusedto
Delete gfx/MShockXotto+/pngs_wide_48x48/mods/bombasticperks/monsters/…
df885f5 
…mon_meat_hunk/.gitkeep
@gettingusedto
Add files via upload
4d99e31
@gettingusedto
Add files via upload
421aa93
@gettingusedto
Merge branch 'I-am-Erk:master' into random-junk-i-forgot-to-submit
466ce40
@gettingusedto
Create .gitkeep
14e33eb
@gettingusedto
Add files via upload
c48c0c1
@gettingusedto
Delete gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/worn/jacke…
3a9197a 
…t_varsity/.gitkeep
@gettingusedto
Add files via upload
9796836
@gettingusedto
Create .gitkeep
9cf25a0
@gettingusedto
Add files via upload
4393c80
@gettingusedto
Delete gfx/MShockXotto+/pngs_tiles_32x32/furniture/board_map/.gitkeep
f2715e9
@gettingusedto
Delete gfx/MShockXotto+/pngs_tiles_32x32/item/legacy_sprite/waffleiro…
828c396 
…n.png
@gettingusedto
Delete gfx/MShockXotto+/pngs_tiles_32x32/item/legacy_sprite/vibrator.png
9ee8b64
@gettingusedto
Delete gfx/MShockXotto+/pngs_tiles_32x32/item/legacy_sprite/sports_br…
4a7678c 
…a.png
@gettingusedto
Delete gfx/MShockXotto+/pngs_tiles_32x32/item/legacy_sprite/pot_makes…
a0f6423 
…hift.png
@gettingusedto
Delete gfx/MShockXotto+/pngs_tiles_32x32/item/legacy_sprite/chem_hexa…
52cc191 
…mine.png
@gettingusedto
Delete gfx/MShockXotto+/pngs_tiles_32x32/item/legacy_sprite/bindle.png
62bc9fa
@gettingusedto gettingusedto marked this pull request as ready for review December 27, 2023 11:39
@Fris0uman Fris0uman merged commit a1ae78f into I-am-Erk:master Dec 27, 2023
2 checks passed
@gettingusedto gettingusedto deleted the random-junk-i-forgot-to-submit branch December 27, 2023 13:25
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