-
Notifications
You must be signed in to change notification settings - Fork 4.1k
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
Apoc price armor and books #34109
Merged
ZhilkinSerg
merged 7 commits into
CleverRaven:master
from
Maleclypse:Apoc_Price-Armor-and-Books
Sep 20, 2019
Merged
Apoc price armor and books #34109
ZhilkinSerg
merged 7 commits into
CleverRaven:master
from
Maleclypse:Apoc_Price-Armor-and-Books
Sep 20, 2019
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
Goal is to only be committing the changes in this section.
I've gone through Lint with all the files and passed all of them. It seems like I've also solved the issue of grabbing old incorrect stuff my first PR. |
kevingranade
requested changes
Sep 19, 2019
Co-Authored-By: Kevin Granade <kevin.granade@gmail.com>
Co-Authored-By: Kevin Granade <kevin.granade@gmail.com>
kevingranade
requested changes
Sep 20, 2019
Co-Authored-By: Kevin Granade <kevin.granade@gmail.com>
Co-Authored-By: Kevin Granade <kevin.granade@gmail.com>
ZhilkinSerg
added
[JSON]
Changes (can be) made in JSON
Items / Item Actions / Item Qualities
Items and how they work and interact
labels
Sep 20, 2019
misterprimus
pushed a commit
to misterprimus/Cataclysm-DDA
that referenced
this pull request
Sep 21, 2019
* ApocPrice Armor and Books Goal is to only be committing the changes in this section. * Update data/json/items/armor/ammo_pouch.json Co-Authored-By: Kevin Granade <kevin.granade@gmail.com> * Update data/json/items/armor/ammo_pouch.json Co-Authored-By: Kevin Granade <kevin.granade@gmail.com> * Update data/json/items/book/cooking.json Co-Authored-By: Kevin Granade <kevin.granade@gmail.com> * Update data/json/items/book/cooking.json Co-Authored-By: Kevin Granade <kevin.granade@gmail.com>
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Items / Item Actions / Item Qualities
Items and how they work and interact
[JSON]
Changes (can be) made in JSON
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
Summary: Content "Apoc Price armor and books"
Purpose of change
Listed in newcomer projects
Describe the solution
This is my second attempt as I'm trying to not recommit the broken syntax from the ammo files I used for my first PR.
Describe alternatives you've considered
This is my alternative I'm trying.
Additional context
I hope this works.