-
Notifications
You must be signed in to change notification settings - Fork 280
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
feat(content,port): add SEAT_REQUIRES_BALANCE
and skateboard vehicle/profession
#5849
Open
shmakota
wants to merge
14
commits into
cataclysmbnteam:main
Choose a base branch
from
shmakota:skateboard
base: main
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.
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
adds seat_requires_balance tag which allows falling off of vehicle seats with this flag. initial json changes, still needs a few more things ported
…ts, and fixed engine "power" to be more reasonable
…or part install/uninstall CDDA67123
…ion, item, and fix misc json
…ors. run json linter Co-Authored-By: Bruce Linck <[email protected]> Co-Authored-By: KittyTac <[email protected]> Co-Authored-By: casswedson <[email protected]>
Co-Authored-By: Bence <[email protected]>
github-actions
bot
added
docs
PRs releated to docs page
src
changes related to source code.
JSON
related to game datas in JSON format.
labels
Dec 28, 2024
Autofix has formatted code style violation in this PR. I edit commits locally (e.g: git, github desktop) and want to keep autofix
I do not want the automated commit
If you don't do this, your following commits will be based on the old commit, and cause MERGE CONFLICT. |
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.
Checklist
Required
main
so it won't cause conflict when updatingmain
branch later.Optional
Co-Authored-By
in the commit message.doc/
folder.Purpose of change
This is a port of the following:
CleverRaven/Cataclysm-DDA#66596
CleverRaven/Cataclysm-DDA#66813
CleverRaven/Cataclysm-DDA#67123
CleverRaven/Cataclysm-DDA#58723
Describe the solution
This PR combines the four mentioned PR's into one for organization purposes, since the latter three are smaller PR's that are based off or related to the first one anyways. The following changes are made:
Describe alternatives you've considered
Testing
Additional context
The new items/tiles need sprites. Most important ones are probably skateboard and the ramp.