-
Notifications
You must be signed in to change notification settings - Fork 551
Give Me A Hand: Hand Slots, Attacks, Grabs, And More #21443
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
Open
JohnWildkins
wants to merge
21
commits into
Aurorastation:master
Choose a base branch
from
JohnWildkins:give-me-a-hand
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+6,132
−6,069
Conversation
This file contains hidden or 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
|
!review |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
…to give-me-a-hand
|
Conflicts have been resolved. Mark the PR as ready for review again if it is ready to be reviewed. |
|
!review |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
1 similar comment
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
⚠ High Risk
Reasonable chance of causing many or high-severity bugs.
🗺️ Mapping - Away Ship/Away Site
The PR touches away ship and/or away site map files.
🗺️ Mapping - Random Ruins
The PR touches random ruins map files.
Merge Conflict
Refactor
Sprites
Adds new or changes existing sprites.
Test Merge Candidate
The PR is eligible for test merging.
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.
Ports NebulaSS13/Nebula#740, NebulaSS13/Nebula#665, NebulaSS13/Nebula#728, NebulaSS13/Nebula#2140, NebulaSS13/Nebula#2039, NebulaSS13/Nebula#2031, and NebulaSS13/Nebula#18.
Begins the work of moving us over to a general inventory slot system and away from a colossal cobweb of hardcoded spaghetti.
Notably, this allows for species and mobs to have a number of hands other than two, and changes all existing interactions to handle mobs that may have more than one "off-hand". Balance implications and specific mechanics can be tackled later when we actually have a species that can do this, but for now, it's there.
UPDATE: This PR now also completely obliterates pulling, turns grabs into singletons, rewrites attack_hand, and adds default intent interaction handlers to make attack_hand less of a monolithic proc. No, I'm not sorry.
Dependency for #21389. Yes, really.