-
-
Notifications
You must be signed in to change notification settings - Fork 491
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
MarkSuckerberg
merged 63 commits into
shiptest-ss13:master
from
FalloutFalcon:oops-all-refactors
Sep 23, 2024
Merged
Melee Code Cleanup #2932
MarkSuckerberg
merged 63 commits into
shiptest-ss13:master
from
FalloutFalcon:oops-all-refactors
Sep 23, 2024
+2,208
−4,527
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit d26bf9f.
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
Draft
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Signed-off-by: FalloutFalcon <[email protected]>
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.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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: