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.

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

[MSX] Some weapons and other things #2130

Merged
merged 45 commits into from
Sep 13, 2023

Conversation

gettingusedto
Copy link
Contributor

@gettingusedto gettingusedto commented Sep 12, 2023

Summary

Weapons and some random stuff.

Content of the change

  • Sledgehammers (medium, small, large, engineer's hammer, and Disorder. Item and Wielded)
  • Trench Knives (hardened, mild, medium, high, and tempered. Item and Wielded)
  • Shillelagh and loaded stick (Item and Wielded)
  • bandolier (rifle and torso shotgun. Worn)
  • Bokken (Item and wielded)
  • Smart Watch (Item)
  • gasfilter_med (Item)
  • Pipe Maces (Pipe Mace and Great Pipe Mace. Item and Wielded)
  • P90 (Item and wielded)

Testing

Screenshot_2023-09-13_13-06-56_1
Screenshot_2023-09-13_13-00-35_1
Screenshot_2023-09-13_13-17-24_1
Screenshot_2023-09-13_13-04-11_1
Screenshot_2023-09-13_13-19-33_1
Screenshot_2023-09-13_13-15-05_1
Screenshot_2023-09-13_13-11-48_1
Screenshot_2023-09-13_12-52-47_1

Additional information

@gettingusedto gettingusedto marked this pull request as ready for review September 13, 2023 06:23
@Fris0uman Fris0uman merged commit 71e13bc into I-am-Erk:master Sep 13, 2023
2 checks passed
@gettingusedto gettingusedto deleted the some-weapons-and-other-things branch September 13, 2023 19:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants