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

Add demon chitin armor & repairing dragon armor #36733

Merged
merged 20 commits into from Mar 15, 2020
Merged

Add demon chitin armor & repairing dragon armor #36733

merged 20 commits into from Mar 15, 2020

Conversation

ghost
Copy link

@ghost ghost commented Jan 5, 2020

Summary

SUMMARY: Mods "Demon chitin armor for Magiclysm"

Purpose of change

Requested addition by KorG.

Describe the solution

Creating the set by copying from the chitinous set, and changing material to demon chitin.

Describe alternatives you've considered

Copying from biosilicificated instead(higher thickness, weight, volume, and encumberance).

Testing

Checked for load errors, looked at tailor's & sewing kits to see if new material repairs were shown.

Additional context

image
image
image
image
image

@ZhilkinSerg ZhilkinSerg added Mods: Magiclysm Anything to do with the Magiclysm mod Mods Issues related to mods or modding [JSON] Changes (can be) made in JSON Items / Item Actions / Item Qualities Items and how they work and interact labels Jan 6, 2020
@ghost ghost changed the title Add demon chitin armor Add demon chitin armor & repairing dragon armor Jan 20, 2020
@ghost ghost marked this pull request as ready for review March 13, 2020 14:35
@KorGgenT KorGgenT self-assigned this Mar 14, 2020
@KorGgenT KorGgenT changed the base branch from master to dev March 15, 2020 00:16
@KorGgenT KorGgenT merged commit 1bd931d into CleverRaven:dev Mar 15, 2020
@ghost ghost deleted the DChitinArmor branch March 15, 2020 04:32
ZhilkinSerg added a commit that referenced this pull request Mar 15, 2020
* Make carried vehicle cargo available for inventory

* Update migration.json

de-duplicate lines 1002-1057

* Generic name to object (#38686)

* Generic name to object

* Name to object

* Armor name to object (#38685)

* Armor fix looks_like

* Name to object, volume to string

* Lowered beaver aggression and morale to be more accurate and believable. (#38688)

* made vacuum sealing more consistent

* Add demon chitin armor

* Add d-chitin armor recipes


Add armormaking book, remove autolearn from recipes


Fix recipe category


Add armorsmithing book to mapgen

* Fix playtest errors

* Add repairing ability to sewing kits

* Capitals

* Itemgroup description fix

* Linting

* Forgot gauntlet recipe + adjust crafting times

* Fix fire protection being too low

* Add dog & horse d-chitin armors

* Update data/mods/Magiclysm/items/recipe_books.json

Co-authored-by: jkraybill <jeremy@dashcord.com>
Co-authored-by: ZhilkinSerg <ZhilkinSerg@users.noreply.github.com>
Co-authored-by: tenmillimaster <>
Co-authored-by: snipercup <50166150+snipercup@users.noreply.github.com>
Co-authored-by: chrimchim <58823248+chrimchim@users.noreply.github.com>
Co-authored-by: Curtis Merrill <curtis.r.merrill@gmail.com>
ZhilkinSerg added a commit that referenced this pull request Mar 15, 2020
* Make carried vehicle cargo available for inventory

* Update migration.json

de-duplicate lines 1002-1057

* Generic name to object (#38686)

* Generic name to object

* Name to object

* Armor name to object (#38685)

* Armor fix looks_like

* Name to object, volume to string

* Lowered beaver aggression and morale to be more accurate and believable. (#38688)

* made vacuum sealing more consistent

* Add demon chitin armor

* Add d-chitin armor recipes


Add armormaking book, remove autolearn from recipes


Fix recipe category


Add armorsmithing book to mapgen

* Fix playtest errors

* Add repairing ability to sewing kits

* Capitals

* Itemgroup description fix

* Linting

* Forgot gauntlet recipe + adjust crafting times

* Fix fire protection being too low

* Add dog & horse d-chitin armors

* Update data/mods/Magiclysm/items/recipe_books.json

Co-authored-by: jkraybill <jeremy@dashcord.com>
Co-authored-by: ZhilkinSerg <ZhilkinSerg@users.noreply.github.com>
Co-authored-by: tenmillimaster <>
Co-authored-by: snipercup <50166150+snipercup@users.noreply.github.com>
Co-authored-by: chrimchim <58823248+chrimchim@users.noreply.github.com>
Co-authored-by: Curtis Merrill <curtis.r.merrill@gmail.com>
twadams pushed a commit to twadams/Cataclysm-DDA that referenced this pull request Mar 24, 2020
twadams pushed a commit to twadams/Cataclysm-DDA that referenced this pull request Mar 29, 2020
twadams pushed a commit to twadams/Cataclysm-DDA that referenced this pull request Mar 30, 2020
twadams pushed a commit to twadams/Cataclysm-DDA that referenced this pull request Mar 30, 2020
@ZhilkinSerg ZhilkinSerg mentioned this pull request Apr 1, 2020
13 tasks
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 Mods: Magiclysm Anything to do with the Magiclysm mod Mods Issues related to mods or modding
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants