Skip to content
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
merged 7 commits into from
Sep 20, 2019

Conversation

Maleclypse
Copy link
Member

@Maleclypse Maleclypse commented Sep 19, 2019

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.

@Maleclypse
Copy link
Member Author

Maleclypse commented Sep 19, 2019

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.

data/json/items/armor/ammo_pouch.json Outdated Show resolved Hide resolved
data/json/items/armor/ammo_pouch.json Outdated Show resolved Hide resolved
Maleclypse and others added 2 commits September 19, 2019 19:05
Co-Authored-By: Kevin Granade <kevin.granade@gmail.com>
Co-Authored-By: Kevin Granade <kevin.granade@gmail.com>
data/json/items/book/cooking.json Outdated Show resolved Hide resolved
data/json/items/book/cooking.json Outdated Show resolved Hide resolved
Maleclypse and others added 2 commits September 19, 2019 22:52
Co-Authored-By: Kevin Granade <kevin.granade@gmail.com>
Co-Authored-By: Kevin Granade <kevin.granade@gmail.com>
@ZhilkinSerg 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
@ZhilkinSerg ZhilkinSerg merged commit f32f7fa into CleverRaven:master 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>
@eltank eltank mentioned this pull request Sep 21, 2019
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants