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

Melee Code Cleanup #2932

Merged
merged 63 commits into from
Sep 23, 2024

Conversation

FalloutFalcon
Copy link
Contributor

@FalloutFalcon FalloutFalcon commented Apr 24, 2024

About The Pull Request

Mostly cleaning up paths and de parenting some items like kitchen knife, clay more, or null rod, sprite and code organization.

adds some stuff for scrap weapons and a cargo machete but nothing player facing besides a minor buff to scrap armour (rare drop from hostile rn). I'll work on implementing them in a second pr

Why It's Good For The Game

Makes it easier to work on melee code by making everything a lot clearer

Changelog

🆑
code: bunch of code organization related to melee
refactor: cleaned up a bunch of melee items to have better inheritance and paths
/:cl:

@FalloutFalcon FalloutFalcon marked this pull request as ready for review September 13, 2024 20:54
@FalloutFalcon FalloutFalcon requested review from a team as code owners September 13, 2024 20:54
@FalloutFalcon FalloutFalcon added Test Merge Required They'll have to do it for free. and removed Test Merge Required They'll have to do it for free. labels Sep 16, 2024
Copy link
Contributor

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

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Sep 23, 2024
@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Sep 23, 2024
@MarkSuckerberg MarkSuckerberg added this pull request to the merge queue Sep 23, 2024
Merged via the queue into shiptest-ss13:master with commit f213d6c Sep 23, 2024
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break. DME Edit Map Change Tile placing is hard. Thank you for your service. Sprites A bikeshed full of soulless bikes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants