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

Chemistry Revolution: Lithium #37144

Closed
wants to merge 14 commits into from
Closed

Chemistry Revolution: Lithium #37144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
c363889
Update chemicals_and_resources.json
roaringjohn Jan 17, 2020
4079006
Update chemicals_and_resources.json
roaringjohn Jan 17, 2020
ec0c291
Update chemicals_and_resources.json
roaringjohn Jan 17, 2020
0d48a70
Update chemicals_and_resources.json
roaringjohn Jan 17, 2020
e4a3e4d
Update chemicals_and_resources.json
roaringjohn Jan 17, 2020
2a08141
Update chemicals_and_resources.json
roaringjohn Jan 17, 2020
ca9d18d
Chemistry Skill
roaringjohn Jan 17, 2020
7ba809a
Science instead of Chemistry
roaringjohn Jan 17, 2020
de17b18
Revert "Science instead of Chemistry"
roaringjohn Jan 17, 2020
1db0762
Revert "Chemistry Skill"
roaringjohn Jan 17, 2020
dae7afa
Update cooking.json
roaringjohn Jan 17, 2020
4f4fff8
Salts
roaringjohn Jan 17, 2020
3b1df8c
Update recipe_medsandchemicals.json
roaringjohn Jan 17, 2020
75cbd8a
Get rid of useless lithium compounds
roaringjohn Jan 17, 2020
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
20 changes: 20 additions & 0 deletions data/json/items/book/cooking.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,26 @@
"time": "35 m",
"fun": -1
},
{
"id": "salt_chemistry",
"type": "BOOK",
"name": { "str": "Chemistry of Metallic Salts", "str_pl": "copies of Chemistry of Metallic Salts" },
"description": "A textbook on the principle of metallic salts such as aluminum sulfate.",
"weight": "1615 g",
"volume": "1750 ml",
"price": 5000,
"price_postapoc": 20000,
"bashing": 4,
"material": [ "paper" ],
"symbol": "?",
"color": "blue",
"skill": "cooking",
"required_level": 3,
"max_level": 5,
"intelligence": 10,
"time": "20 m",
"fun": -1
},
{
"id": "brewing_cookbook",
"type": "BOOK",
Expand Down
36 changes: 36 additions & 0 deletions data/json/items/chemicals_and_resources.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,6 +542,42 @@
"container": "bottle_plastic_small",
"count": 100
},
{
"type": "AMMO",
"id": "chem_lithium",
"category": "chems",
"price": 600,
"name": "lithium",
"name_plural": "lithium",
"symbol": "=",
"color": "white",
"description": "A piece of lithium in mineral oil. It is a volatile element that is commonly used in the making of heat-resistant glass and ceramics.",
"material": "powder",
"volume": "250 ml",
"weight": "185 g",
"phase": "liquid",
"bashing": 1,
"ammo_type": "components",
"container": "bottle_plastic_small"
},
{
"type": "AMMO",
"id": "chem_lithium_hydride",
"category": "chems",
"price": 600,
"name": "lithium hydride",
"name_plural": "lithium hydride",
"symbol": "=",
"color": "white",
"description": "A handful of lithium hydride. Produced from a reaction between lithium and hydrogen, it can be used in a variety of ways.",
"material": "powder",
"volume": "50 ml",
"weight": "39 g",
"bashing": 1,
"ammo_type": "components",
"container": "bottle_plastic_small",
"count": 100
},
{
"type": "AMMO",
"id": "chem_potassium_chloride",
Expand Down