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

Armor name to object #38685

Merged
merged 2 commits into from
Mar 10, 2020
Merged

Armor name to object #38685

merged 2 commits into from
Mar 10, 2020

Conversation

snipercup
Copy link
Contributor

@snipercup snipercup commented Mar 10, 2020

Summary

SUMMARY: none

Purpose of change

Contributes to #36110 and #36611

Describe the solution

Change name to object
Volume to string and add volume
fix looks_like like in #37758

Describe alternatives you've considered

Changing the hauling frame to looks_like backpack_giant but thinking about the sprite it would have I think it fits better with backpack_tactical_large

Testing

image
image
image

@ZhilkinSerg ZhilkinSerg added the [JSON] Changes (can be) made in JSON label Mar 10, 2020
@ZhilkinSerg ZhilkinSerg merged commit 33c5fcd into CleverRaven:master Mar 10, 2020
@snipercup snipercup deleted the Armor-name-to-object branch March 10, 2020 21:04
KorGgenT 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 <[email protected]>
Co-authored-by: ZhilkinSerg <[email protected]>
Co-authored-by: tenmillimaster <>
Co-authored-by: snipercup <[email protected]>
Co-authored-by: chrimchim <[email protected]>
Co-authored-by: Curtis Merrill <[email protected]>
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 <[email protected]>
Co-authored-by: ZhilkinSerg <[email protected]>
Co-authored-by: tenmillimaster <>
Co-authored-by: snipercup <[email protected]>
Co-authored-by: chrimchim <[email protected]>
Co-authored-by: Curtis Merrill <[email protected]>
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 <[email protected]>
Co-authored-by: ZhilkinSerg <[email protected]>
Co-authored-by: tenmillimaster <>
Co-authored-by: snipercup <[email protected]>
Co-authored-by: chrimchim <[email protected]>
Co-authored-by: Curtis Merrill <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[JSON] Changes (can be) made in JSON
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants