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

Just some minor JSON fixes I can't categorize properly #73887

Merged
merged 2 commits into from
May 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions data/json/items/comestibles/other.json
Original file line number Diff line number Diff line change
Expand Up @@ -665,7 +665,7 @@
{
"type": "GENERIC",
"id": "cardboard",
"name": { "str": "cardboard" },
"name": { "str": "piece of cardboard", "str_pl": "pieces of cardboard" },
"looks_like": "paper",
"category": "spare_parts",
"weight": "10 g",
Expand Down Expand Up @@ -1613,7 +1613,7 @@
{
"id": "swarm_bees",
"type": "COMESTIBLE",
"comestible_type": "FOOD",
"comestible_type": "INVALID",
"name": { "str": "swarm of bees", "str_pl": "swarms of bees" },
"description": "A swarm of honey bees, displaced from the hive. Without the support and nutrients of an apiary, or taking root somewhere, they will die in a few days.",
"//": "While bees have mass and volume, it is easier to round to zero for the purposes of the game.",
Expand All @@ -1623,7 +1623,6 @@
"flags": [ "ZERO_WEIGHT", "INEDIBLE" ],
"volume": "500 ml",
"symbol": "B",
"color": "yellow",
"calories": 0
"color": "yellow"
}
]
2 changes: 1 addition & 1 deletion data/json/recipes/armor/feet.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"difficulty": 2,
"time": "10 h",
"autolearn": true,
"reversible": true,
"reversible": { "time": "3 m" },
"using": [ [ "tailoring_leather_small", 22 ], [ "fastener_shoes", 2 ], [ "shoe_rubber", 1 ], [ "adhesive_rubber", 1 ] ],
"proficiencies": [
{ "proficiency": "prof_cobbling" },
Expand Down
Loading