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 more stuff #2451

Merged
merged 40 commits into from
Jul 22, 2024
Merged

[MSX] Some more stuff #2451

merged 40 commits into from
Jul 22, 2024

Conversation

gettingusedto
Copy link
Contributor

@gettingusedto gettingusedto commented Jul 21, 2024 •
edited
Loading

Summary

Some more stuff

Content of the change

Aftershock

  • habitat kitchenette
  • habitat storage board
  • intermodal crate (opened and sealed)
  • screen mirror

Basegame

  • nanofabricator
  • atlatl (item and wielded)
  • atlatl spears (item)
  • metal floor
  • tatami mat

Testing

Screenshot_20240722_104945_1
Screenshot_20240722_015442_1
Screenshot_20240722_011538_1
Screenshot_20240722_011629_1

Additional information

@gettingusedto
Create .gitkeep
a933c75
@gettingusedto
Add files via upload
476ab90
@gettingusedto
Delete gfx/MShockXotto+/pngs_tiles_32x32/mods/Aftershock/furniture/f_…
e318edd 
…habitat_kitchenette/.gitkeep
@gettingusedto
Create .gitkeep
f5fa972
@gettingusedto
Add files via upload
f9cc772
@gettingusedto
Delete gfx/MShockXotto+/pngs_tiles_32x32/mods/Aftershock/furniture/f_…
e1ec8be 
…habitat_storage_board/.gitkeep
@gettingusedto
Create .gitkeep
8a4dc42
@gettingusedto
Add files via upload
6b7f600
@gettingusedto
Delete gfx/MShockXotto+/pngs_tiles_32x32/mods/Aftershock/furniture/f_…
6561ce9 
…screenmirror/.gitkeep
@gettingusedto
Create .gitkeep
7acdd1e
@gettingusedto
Add files via upload
0b5003a
@gettingusedto
Delete gfx/MShockXotto+/pngs_tiles_32x32/mods/Aftershock/furniture/f_…
2055b5a 
…intermodal_crate/.gitkeep
@gettingusedto
Delete gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_metal_floor_0.json
3b6c6b4
@gettingusedto
Delete gfx/MShockXotto+/pngs_tiles_32x32/terrain/3121_t_metal_floor_0…
7820da7 
….png
@gettingusedto
Create .gitkeep
1c8fc88
@gettingusedto
Add files via upload
3dbf330
@gettingusedto
Delete gfx/MShockXotto+/pngs_tiles_32x32/terrain/metal_floor/.gitkeep
c4b9615
@gettingusedto
Add files via upload
2d238de
@gettingusedto
Add files via upload
8927299
@gettingusedto
Create .gitkeep
f44c59d
@gettingusedto
Add files via upload
a1652d8
@gettingusedto
Delete gfx/MShockXotto+/pngs_small_20x20/items/atlatl_spear/.gitkeep
d31f3f9
@gettingusedto
Add files via upload
968f8d9
@gettingusedto
Add files via upload
1323c92
@gettingusedto
Add files via upload
262bad9
@gettingusedto
Create f_tatami.json
36e719e
@gettingusedto
Add files via upload
3f8ccc3
@gettingusedto
Delete gfx/MShockXotto+/pngs_tiles_32x32/furniture/1591_f_tatami_0.png
132ff55
@gettingusedto
Delete gfx/MShockXotto+/pngs_tiles_32x32/furniture/1592_f_tatami_2.png
4b59d7b
@gettingusedto
Delete gfx/MShockXotto+/pngs_tiles_32x32/furniture/1593_f_tatami_3.png
7571030
@gettingusedto gettingusedto marked this pull request as ready for review July 22, 2024 05:16
@Fris0uman Fris0uman merged commit 97f2108 into I-am-Erk:master Jul 22, 2024
2 checks passed
@gettingusedto gettingusedto deleted the some-more-stuff branch July 22, 2024 11:40
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