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
reweight gemstones in item_groups.json (CleverRaven#36734) #42
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
Fixes to ant lair generation
* Holographic transposition spell * Add spawn for the holographic transposition scroll * Remove outdated flag * Remove unused function parameter * Changes suggested by code review. * Update data/mods/Magiclysm/items/spell_scrolls.json Co-Authored-By: Jianxiang Wang (王健翔) <[email protected]> * Fix misplaced coma in spell_scrolls.json * Apply suggestions from code review Co-Authored-By: LaVeyanFiend <[email protected]> Co-authored-by: Jianxiang Wang (王健翔) <[email protected]> Co-authored-by: LaVeyanFiend <[email protected]>
Adding Grape Seeds to the cooking oil recipe
Fix a typo in avatar.cpp
Take down the Christmas decorations
Add documentation for repairs_like
* Use libbacktrace to generate backtrace * Move dbghelp symbol initialization to debug_write_backtrace * Use libbacktrace on cross-compilation to Windows * Download prebuilt libbacktrace before building * Use square brackets instead of angle brackets * Add license text of libbacktrace
Various basecamp actions require components and tools to be consumed. When there are choices to be made amongst these, the player is presented with the choice between the various options in the usual way. However, if the player cancels, the action proceeded regardless. This allowed the player to circumvent the consumption of the requirements. Fix this by separating the selection of the components from the consumption. Now the order of events is: - Select components and tools. - Select NPC. - Send NPC on mission. - Consume components and tools. We needed to perform the split because we need to select both the requirements and the NPC before performing alterations to either. Implemented by introducing a new class basecamp_action_components to store this selection state.
Handle basecamp component selection cancellation
Fix inventory caching bug causing crash when resuming craft
Adding Grape Seeds to the cooking oil recipe
Also fixed weight and volume of children corpses
Fixed weight and volume of children corpses
Correct sandbag recipe for charges
Overhaul anthill generation to avoid conflicting with other map features
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