Allow spawning items with flags #70168
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
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
gkarfakis19
pushed a commit
to gkarfakis19/Cataclysm-DDA
that referenced
this pull request
Dec 14, 2023
* First * Update npctalk.cpp * Update npctalk.cpp * Update src/npctalk.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Maleclypse
pushed a commit
that referenced
this pull request
Dec 20, 2023
* Initial commit. Infrastracture. * monster stash * first attempt at pelagic vs ocean shore creatures * Proper handling of ocean vs pelagic. * added a bunch of fish (JSON linted) * added a bunch of fish (json linted, and fixed) * Proper handling of ocean vs pelagic + added a bunch of fish. * Update player_activity.cpp * Small eoc doc fixes * Invalidate non-adjacent containers for ALL and DRAGGED (#70172) This also changes it to not update the container_base_loc's position for ALL and DRAGGED, which made it so pressing X would exit out to a 1-9 location instead of ALL or DRAGGED Co-authored-by: andrei <68240139+andrei8l@users.noreply.github.com> * Allow spawning items with flags (#70168) * First * Update npctalk.cpp * Update npctalk.cpp * Update src/npctalk.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * [Sky Island] Teleporting items back home (#70200) * Update EOCs.json * Update EOCs.json * Update EOCs.json * Update EOCs.json * Update EOCs.json * Add ```gains_proficiency``` event (#70194) * create gains_proficiency event * add event trigger * Update EFFECT_ON_CONDITION.md * updated memorial test * retrigger checks * [MoM] Add ability for pyrokinetics to cauterize their wounds (#70132) * Initial commit * Bleeding that's too heavy cannot be stopped * Add infection chance * Add missing types * Fix infection intensity * Fix practice recipe * Reduce capacity of test battery a bit The value being this large resulted in an integer overflow in pocket_data::max_contains_volume(). Reduce it until there's no more integer overflow. * Proper handling of ocean vs pelagic + added a bunch of fish. * reversed gitignore accidental change * reversed gitignore accidental change * shark rebalance * Update data/json/monsters/fish.json Co-authored-by: Jianxiang Wang (王健翔) <qrox@sina.com> * Update data/json/monsters/fish.json Co-authored-by: Jianxiang Wang (王健翔) <qrox@sina.com> * Update data/json/monsters/fish.json Co-authored-by: Jianxiang Wang (王健翔) <qrox@sina.com> * small changes to resolve issues * small changes to resolve issues * Update wilderness.json to fix bass typo * Update fish.json * Update data/json/monsters/fish.json Co-authored-by: Karol1223 <68503002+Karol1223@users.noreply.github.com> * removed roe names --------- Co-authored-by: Ramza13 <52087122+Ramza13@users.noreply.github.com> Co-authored-by: Anton Simakov <67688115+GuardianDll@users.noreply.github.com> Co-authored-by: Kamayana <pigbuster@gmail.com> Co-authored-by: andrei <68240139+andrei8l@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: gettingusedto <78019001+gettingusedto@users.noreply.github.com> Co-authored-by: Francisco Machado <franciscomontenegrolm@gmail.com> Co-authored-by: Standing-Storm <120433252+Standing-Storm@users.noreply.github.com> Co-authored-by: ehughsbaird <44244083+ehughsbaird@users.noreply.github.com> Co-authored-by: Jianxiang Wang (王健翔) <qrox@sina.com> Co-authored-by: Karol1223 <68503002+Karol1223@users.noreply.github.com>
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
None
Purpose of change
Fix #69889
Describe the solution
Describe alternatives you've considered
Testing
Used this json
Additional context