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

Solstice Wreaths and trees #36368

Merged
merged 11 commits into from
Dec 30, 2019
Merged

Conversation

Maleclypse
Copy link
Member

Summary

SUMMARY: Content "Holiday Wreaths and Trees"

Purpose of change

Adds seasonal holiday items for the winter solstice/Christmas.

Describe the solution

Recipes, items and furniture.

Describe alternatives you've considered

None

Testing

TBD

Additional context

None

@ymber
Copy link
Member

ymber commented Dec 23, 2019

Why isn't it called a Christmas tree? I've never heard anyone call it a solstice tree.

@Amoebka
Copy link
Contributor

Amoebka commented Dec 23, 2019

Should probably be called "politically neutral winter holiday tree" instead.

@Maleclypse
Copy link
Member Author

Maleclypse commented Dec 23, 2019

Because all my friends who bother to put up trees are pagan and because whether Christmas survives post cataclysm with the resurrection trying to murder you the celestial event that Christmas commemorates will still exist. :) but if anyone is worried the PC police are infiltrating their safe space I can rename it to whatever.

Edit:
I honestly just didn’t feel like naming it Christmas last night. Because Christmas is an endurance test when you marry into a large family.

@Fris0uman
Copy link
Contributor

Fris0uman commented Dec 25, 2019

Decorated Tree might be a slightly clearer name, and since it's purely descriptif it's flavour neutral and players can decide if it's a pagan, a christian, a capitalist or a whatever thing.

@Maleclypse
Copy link
Member Author

Decorated Tree might be a slightly clearer name, and since it's purely descriptif it's flavour neutral and players can decide if it's a pagan, a christian, a capitalist or a whatever thing.

Perfect :) done.

@Maleclypse
Copy link
Member Author

Here is the fail I was able to find Backtrace emission took 2 seconds. src/json.cpp:112: Failed to visit member 'entries' in JsonObject at line 320:14277: { "id": "nanomaterials", "type": "item_group", "entries": [ { "item": "nanomaterial", "prob": 100 } ]

@curstwist curstwist added [JSON] Changes (can be) made in JSON Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. Items / Item Actions / Item Qualities Items and how they work and interact labels Dec 27, 2019
Copy link
Member

@I-am-Erk I-am-Erk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like we're going to need boxes of garlands and things as clutter items...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. 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.

7 participants