forked from CleverRaven/Cataclysm-DDA
-
Notifications
You must be signed in to change notification settings - Fork 0
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
Merge pull request CleverRaven#37839 from jbytheway/mapgen_fix_missin… #85
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
* Mention cddatags in the JSON docs * Strip platform-specific path separator for tags This is fixing a hypothetical bug which I think cddatags would have suffered from on Windows (but untested there). * Use cddatags in Makefile There were already two rules for creating tags; update them both. * Move some cddatags docs to DEVELOPER_TOOLING The second paragraph was not useful to non-code-writing contributors, so move it and rewrite it. * cddatags: Force UTF-8 encoding for json files * Expand on the cddatags docs Thanks to snipercup for researching useful tips for Windows.
Armor Name to object, volume to string
Comestible name to object
Armor name to object, fix looks_like, volume to string
* Lower time needed for hard_tack recipe. * Raise time for recipe from 45 min to 75 min.
Minireactor powered vehicles haven't fit in canon fore a while, so they shouldn't be spawning. Have them spawn in Aftershock instead.
Fix missing mapgen keys
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.
Summary
Purpose of change
Describe the solution
Describe alternatives you've considered
Testing
Additional context