Changes, QoL, Classes additions #97
Merged
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
|
Conflicting with the main branch now |
This reverts commit 61a4b32.
|
waiting for the quiver fix |
|
Actually. If you can revert the last commit, I'll just full merge this, as it seems overall ready? |
This reverts commit 7624f38.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
TESTMERGE THIS.
Autolock/autounlock door via bump with keychain by PPooch
Permits beds (and subtypes of beds) to be used without buckling to them - DeltaFire15
collect items bundle via clicking on turf - Tenryumi
Butt Layer Change and Clothes inv flag update(This is important and I need feedback for this one as I do not know if it look nice or not, For the time being, It only look good for Small to Large, not the other two.) - Ghostcoffeee
Fix Sellsword's bevor
Musketeer and Gun addition to Man at arm's Boltman.
haven't had any problems compiling and running it