Skip to content

Commit

Permalink
Comestible modern json (#37273)
Browse files Browse the repository at this point in the history
* Comestible modern json

* Correct amonia plural

* Correct almond pulp plural
  • Loading branch information
snipercup authored and I-am-Erk committed Jan 22, 2020

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent 6e7dd64 commit f27d795
Showing 4 changed files with 7 additions and 12 deletions.
3 changes: 1 addition & 2 deletions data/json/items/chemicals_and_resources.json
Original file line number Diff line number Diff line change
@@ -226,8 +226,7 @@
{
"type": "COMESTIBLE",
"id": "ammonia",
"name": "ammonia",
"name_plural": "ammonia",
"name": { "str": "ammonia", "str_pl": "ammonia" },
"weight": "124 g",
"color": "white",
"use_action": "BLECH",
2 changes: 1 addition & 1 deletion data/json/items/comestibles/drink.json
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@
{
"type": "COMESTIBLE",
"id": "almond_milk",
"name": "almond milk",
"name": { "str": "almond milk" },
"weight": "258 g",
"color": "white",
"spoils_in": "3 days",
8 changes: 3 additions & 5 deletions data/json/items/comestibles/med.json
Original file line number Diff line number Diff line change
@@ -18,8 +18,7 @@
"id": "adderall",
"type": "COMESTIBLE",
"comestible_type": "MED",
"name": "Adderall",
"name_plural": "Adderall",
"name": { "str": "Adderall", "str_pl": "Adderall" },
"description": "Medical grade amphetamine salts mixed with Dextroamphetamine salts, commonly prescribed to treat hyperactive attention deficits. It suppresses the appetite, and is quite addictive.",
"weight": "1 g",
"volume": "250 ml",
@@ -32,14 +31,13 @@
"fun": 10,
"addiction_potential": 10,
"addiction_type": "amphetamine",
"flags": "NPC_SAFE"
"flags": [ "NPC_SAFE" ]
},
{
"id": "adrenaline_injector",
"type": "COMESTIBLE",
"comestible_type": "MED",
"name": "syringe of adrenaline",
"name_plural": "syringes of adrenaline",
"name": { "str": "syringe of adrenaline", "str_pl": "syringes of adrenaline" },
"description": "A syringe filled with a shot of adrenaline. It serves as a powerful stimulant when you inject yourself with it. Asthmatics can use it in an emergency to clear their asthma.",
"weight": "12 g",
"volume": "10ml",
6 changes: 2 additions & 4 deletions data/json/items/comestibles/nuts.json
Original file line number Diff line number Diff line change
@@ -97,8 +97,7 @@
{
"type": "COMESTIBLE",
"id": "almond_pulp",
"name": "almond pulp",
"name_plural": "almond pulp",
"name": { "str": "almond pulp", "str_pl": "almond pulp" },
"looks_like": "granola",
"weight": "30 g",
"color": "brown",
@@ -448,8 +447,7 @@
{
"type": "COMESTIBLE",
"id": "acorns_cooked",
"name": "cooked acorn meal",
"name_plural": "cooked acorn meal",
"name": { "str": "cooked acorn meal" },
"weight": "22 g",
"color": "brown",
"spoils_in": "30 days",

0 comments on commit f27d795

Please sign in to comment.