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.

Sign up for GitHub

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

Comestible name to object #38095

Merged
merged 1 commit into from
Feb 17, 2020
Merged

Comestible name to object #38095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions data/json/items/comestibles/brewing.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,7 @@
{
"type": "COMESTIBLE",
"id": "wash_rum",
"name": "rum wash",
"name_plural": "rum washes",
"name": { "str": "rum wash", "str_pl": "rum washes" },
"description": "Fermented, but not distilled rum. No longer tastes sweet.",
"weight": "50 g",
"color": "light_cyan",
Expand Down
3 changes: 1 addition & 2 deletions data/json/items/comestibles/carnivore.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,8 +350,7 @@
"id": "salted_fish",
"copy-from": "fish",
"type": "COMESTIBLE",
"name": "salted fish",
"name_plural": "salted fish",
"name": { "str": "salted fish", "str_pl": "salted fish" },
"description": "Salty dried fish that lasts for a long time, but will make you thirsty.",
"primary_material": "cured_meat",
"container": "bag_plastic",
Expand Down
3 changes: 1 addition & 2 deletions data/json/items/comestibles/drink.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,8 +767,7 @@
{
"type": "COMESTIBLE",
"id": "rootbeer",
"name": "root beer",
"name_plural": "root beer",
"name": { "str": "root beer", "str_pl": "root beer" },
"weight": "260 g",
"color": "brown",
"container": "can_drink",
Expand Down
6 changes: 2 additions & 4 deletions data/json/items/comestibles/junkfood.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,7 @@
{
"type": "COMESTIBLE",
"id": "popcorn2",
"name": "salted popcorn",
"name_plural": "salted popcorn",
"name": { "str": "salted popcorn", "str_pl": "salted popcorn" },
"copy-from": "popcorn",
"quench": -3,
"healthy": -1,
Expand Down Expand Up @@ -228,8 +227,7 @@
{
"type": "COMESTIBLE",
"id": "smores",
"name": "s'mores",
"name_plural": "s'mores",
"name": { "str": "s'mores", "str_pl": "s'mores" },
"weight": "180 g",
"color": "brown",
"spoils_in": "90 days",
Expand Down
6 changes: 2 additions & 4 deletions data/json/items/comestibles/meat_dishes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,8 +279,7 @@
{
"type": "COMESTIBLE",
"id": "rehydrated_fish",
"name": "rehydrated fish",
"name_plural": "rehydrated fish",
"name": { "str": "rehydrated fish", "str_pl": "rehydrated fish" },
"copy-from": "fish_cooked",
"color": "white",
"description": "Reconstituted fish flakes, which are much more enjoyable to eat now that they have been rehydrated.",
Expand Down Expand Up @@ -1183,8 +1182,7 @@
{
"type": "COMESTIBLE",
"id": "sashimi",
"name": "sashimi",
"name_plural": "sashimi",
"name": { "str": "sashimi", "str_pl": "sashimi" },
"copy-from": "fish_cooked",
"color": "white",
"spoils_in": "12 hours",
Expand Down
3 changes: 1 addition & 2 deletions data/json/items/comestibles/med.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,8 +563,7 @@
"id": "eyedrops",
"type": "COMESTIBLE",
"comestible_type": "MED",
"name": "saline eye drop",
"name_plural": "saline eye drops",
"name": { "str": "saline eye drop" },
"description": "Sterile saline eye drops. Can be used to treat dry eyes, or to wash out contaminants.",
"volume": "10ml",
"weight": "3 g",
Expand Down
3 changes: 1 addition & 2 deletions data/json/items/comestibles/other.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,7 @@
{
"type": "COMESTIBLE",
"id": "royal_jelly",
"name": "royal jelly",
"name_plural": "royal jellies",
"name": { "str": "royal jelly", "str_pl": "royal jellies" },
"category": "drugs",
"weight": "150 g",
"color": "white",
Expand Down
6 changes: 2 additions & 4 deletions data/json/items/comestibles/raw_veggy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,8 +486,7 @@
{
"type": "COMESTIBLE",
"id": "potato",
"name": "raw potato",
"name_plural": "raw potatoes",
"name": { "str": "raw potato", "str_pl": "raw potatoes" },
"weight": "210 g",
"color": "brown",
"spoils_in": "60 days",
Expand Down Expand Up @@ -734,8 +733,7 @@
{
"type": "COMESTIBLE",
"id": "raw_lentils",
"name": "raw lentils",
"name_plural": "raw lentils",
"name": { "str": "raw lentils", "str_pl": "raw lentils" },
"color": "light_green",
"spoils_in": "2 days",
"comestible_type": "FOOD",
Expand Down
15 changes: 5 additions & 10 deletions data/json/items/comestibles/seed.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,7 @@
"id": "seed_rose",
"copy-from": "seed_fruit",
"type": "COMESTIBLE",
"name": "rose seeds",
"name_plural": "rose seeds",
"name": { "str": "rose seeds", "str_pl": "rose seeds" },
"description": "Some rose seeds.",
"seed_data": { "plant_name": "rose", "fruit": "rose_hips", "byproducts": [ "withered" ], "grow": "91 days" }
},
Expand Down Expand Up @@ -262,8 +261,7 @@
"type": "COMESTIBLE",
"id": "seed_salsify_raw",
"copy-from": "seed",
"name": "salsify seeds",
"name_plural": "salsify seeds",
"name": { "str": "salsify seeds", "str_pl": "salsify seeds" },
"color": "green",
"description": "Some salsify seeds.",
"charges": 2,
Expand Down Expand Up @@ -459,8 +457,7 @@
"type": "COMESTIBLE",
"id": "seed_lentils",
"copy-from": "seed",
"name": "raw lentils",
"name_plural": "raw lentils",
"name": { "str": "raw lentils", "str_pl": "raw lentils" },
"weight": "194 g",
"symbol": "%",
"description": "Raw, uncooked lentils, ready for planting.",
Expand Down Expand Up @@ -595,8 +592,7 @@
"type": "COMESTIBLE",
"id": "seed_rhubarb",
"copy-from": "seed",
"name": "rhubarb stems",
"name_plural": "rhubarb stems",
"name": { "str": "rhubarb stems", "str_pl": "rhubarb stems" },
"color": "green",
"description": "Some rhubarb stems.",
"charges": 2,
Expand Down Expand Up @@ -740,8 +736,7 @@
"copy-from": "coffee_bean",
"category": "other",
"container": "bag_plastic",
"name": "roasted coffee beans",
"name_plural": "roasted coffee beans",
"name": { "str": "roasted coffee beans", "str_pl": "roasted coffee beans" },
"description": "Some roasted coffee beans, can be ground into powder.",
"addiction_type": "caffeine",
"flags": [ "EDIBLE_FROZEN" ]
Expand Down
3 changes: 1 addition & 2 deletions data/json/items/comestibles/veggy_dishes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,8 +480,7 @@
{
"type": "COMESTIBLE",
"id": "sauerkraut_onions",
"name": "sauerkraut w/ sautee'd onions",
"name_plural": "sauerkraut w/ sautee'd onions",
"name": { "str": "sauerkraut w/ sautee'd onions", "str_pl": "sauerkraut w/ sautee'd onions" },
"weight": "424 g",
"color": "light_gray",
"spoils_in": "5 days",
Expand Down
6 changes: 2 additions & 4 deletions data/json/items/comestibles/wheat.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@
{
"type": "COMESTIBLE",
"id": "spaghetti_raw",
"name": "raw spaghetti pasta",
"name_plural": "raw spaghetti pasta",
"name": { "str": "raw spaghetti pasta", "str_pl": "raw spaghetti pasta" },
"weight": "60 g",
"color": "yellow",
"spoils_in": "360 days",
Expand Down Expand Up @@ -102,8 +101,7 @@
{
"type": "COMESTIBLE",
"id": "macaroni_raw",
"name": "raw macaroni",
"name_plural": "raw macaroni",
"name": { "str": "raw macaroni", "str_pl": "raw macaroni" },
"weight": "60 g",
"color": "yellow",
"spoils_in": "360 days",
Expand Down