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

Extracts and Concentrates pt 3 #37942

Merged
merged 10 commits into from
Apr 26, 2020
Merged

Extracts and Concentrates pt 3 #37942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6ecc0c2
Extracts and Concentrates pt 2
NastyNate2612 Feb 12, 2020
67a6234
linted science.json
NastyNate2612 Feb 12, 2020
3ecfc22
Apply suggestions from code review
NastyNate2612 Feb 13, 2020
9b2ef02
Apply suggestions from code review
NastyNate2612 Feb 13, 2020
3bf124e
changed revert to
NastyNate2612 Feb 13, 2020
d59503d
Update science.json
NastyNate2612 Feb 13, 2020
b3dc7c9
Update fabrication.json
NastyNate2612 Feb 13, 2020
e2cae55
removed buchner flask
NastyNate2612 Feb 14, 2020
9697b2b
Merge branch 'master' into Extracts-and-Concentrates-pt-2
kevingranade Apr 25, 2020
48b0267
Merge branch 'master' into Extracts-and-Concentrates-pt-2
kevingranade Apr 26, 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/fabrication.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,26 @@
"time": "30 m",
"fun": -2
},
{
"id": "textbook_extraction",
"type": "BOOK",
"name": { "str": "The Essential Oil Enthusiasts Handbook", "str_pl": "copies of The Essential Oil Enthusiasts Handbook" },
"description": "A heavy hardback book explaining the process of essential oil making, with schematics for the equipment to do it. Good luck, and don't blow yourself up!",
"looks_like": "textbook_chemistry",
"weight": "1420 g",
"volume": "1 L",
"price": 6000,
"price_postapoc": 10000,
"bashing": 4,
"material": [ "paper" ],
"symbol": "?",
"color": "blue",
"skill": "fabrication",
"required_level": 5,
"max_level": 8,
"intelligence": 10,
"time": "60 m"
},
{
"id": "concrete_book",
"type": "BOOK",
Expand Down
207 changes: 207 additions & 0 deletions data/json/items/tool/science.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,213 @@
],
"magazine_well": 0
},
{
"id": "closed_loop_extractor_small",
"type": "TOOL",
"name": { "str": "small closed loop extractor" },
"description": "A small closed loop extractor used for extracting essential oils from organic material producing a high quality extract. It consists of a long metal tube clamped onto a steel \"honey pot\". Organic material is packed in the tube, flushed with solvent, and essential oils gathered from the pot. Must be powered up to operate.",
"symbol": "E",
"color": "dark_gray",
"looks_like": "still",
"weight": "36000 g",
"volume": "60 L",
"price": 500000,
"to_hit": -10,
"bashing": 40,
"material": "steel",
"flags": [ "ALLOWS_REMOTE_USE" ],
"ammo": "battery",
"power_draw": 1500000,
"charges_per_use": 1,
"use_action": {
"target": "closed_loop_extractor_small_on",
"msg": "You turn on the small closed loop extractor.",
"menu_text": "turn on",
"active": true,
"need_charges": 1,
"need_charges_msg": "The small closed loop extractor's batteries need more charge.",
"type": "transform"
},
"magazines": [
[
"battery",
[
"medium_battery_cell",
"medium_plus_battery_cell",
"medium_disposable_cell",
"medium_atomic_battery_cell",
"heavy_battery_cell",
"heavy_plus_battery_cell",
"heavy_disposable_cell",
"heavy_atomic_battery_cell",
"small_storage_battery",
"medium_storage_battery",
"large_storage_battery",
"storage_battery"
]
]
],
"qualities": [ [ "EXTRACT", 2 ] ]
},
{
"id": "closed_loop_extractor_small_on",
"type": "TOOL",
"name": { "str": "small closed loop extractor (on)", "str_pl": "small closed loop extractors (on)" },
"description": "The small closed loop extractor is running, it just needs some material to pack the tube with and an organic solvent like butane and it's good to go.",
"symbol": "E",
"color": "dark_gray",
"looks_like": "still",
"weight": "36000 g",
"volume": "60 L",
"price": 500000,
"to_hit": -10,
"bashing": 40,
"material": "steel",
"flags": [ "ALLOWS_REMOTE_USE", "TRADER_AVOID" ],
"ammo": "battery",
"power_draw": 1500000,
"revert_to": "closed_loop_extractor_small",
"charges_per_use": 1,
"use_action": {
"target": "closed_loop_extractor_small",
"msg": "You turn off the small closed loop extractor.",
"menu_text": "turn off",
"need_charges": 0,
"need_charges_msg": "The small closed loop extractor's batteries need more charge.",
"type": "transform"
},
"magazines": [
[
"battery",
[
"medium_battery_cell",
"medium_plus_battery_cell",
"medium_disposable_cell",
"medium_atomic_battery_cell",
"heavy_battery_cell",
"heavy_plus_battery_cell",
"heavy_disposable_cell",
"heavy_atomic_battery_cell",
"small_storage_battery",
"medium_storage_battery",
"large_storage_battery",
"storage_battery"
]
]
],
"qualities": [ [ "EXTRACT", 2 ] ]
},
{
"id": "closed_loop_extractor_large",
"type": "TOOL",
"name": { "str": "large closed loop extractor" },
"description": "A large machine used for extracting essential oils from large batches of organic material producing a low quality crude oil. It consists of three long metal tubes funneled into a large drum that's set horizontally. A series of hoses and tubes come out of the machine going to different valves. It needs to be powered up to operate.",
"looks_like": "still",
"weight": "181600 g",
"volume": "240 L",
"price": 2000000,
"to_hit": -10,
"bashing": 40,
"material": "steel",
"symbol": "E",
"color": "dark_gray",
"flags": [ "ALLOWS_REMOTE_USE", "TRADER_AVOID" ],
"ammo": "battery",
"charges_per_use": 1,
"magazines": [
[
"battery",
[
"medium_battery_cell",
"medium_plus_battery_cell",
"medium_disposable_cell",
"medium_atomic_battery_cell",
"heavy_battery_cell",
"heavy_plus_battery_cell",
"heavy_disposable_cell",
"heavy_atomic_battery_cell",
"small_storage_battery",
"medium_storage_battery",
"large_storage_battery",
"storage_battery"
]
]
],
"use_action": {
"target": "closed_loop_extractor_large_on",
"msg": "You turn on the large closed loop extractor.",
"menu_text": "turn on",
"active": true,
"need_charges": 1,
"need_charges_msg": "The large closed loop extractor's batteries need more charge.",
"type": "transform"
},
"qualities": [ [ "EXTRACT", 1 ] ]
},
{
"id": "closed_loop_extractor_large_on",
"type": "TOOL",
"name": { "str": "large closed loop extractor (on)", "str_pl": "large closed loop extractors (on)" },
"description": "The large closed loop extractor is running, it just needs some material to pack the tube with and an organic solvent like butane and it's good to go.",
"looks_like": "still",
"weight": "181600 g",
"volume": "240 L",
"price": 2000000,
"to_hit": -10,
"bashing": 40,
"material": "steel",
"symbol": "E",
"color": "dark_gray",
"flags": [ "ALLOWS_REMOTE_USE", "TRADER_AVOID" ],
"ammo": "battery",
"power_draw": 1500000,
"revert_to": "closed_loop_extractor_large",
"charges_per_use": 1,
"magazines": [
[
"battery",
[
"medium_battery_cell",
"medium_plus_battery_cell",
"medium_disposable_cell",
"medium_atomic_battery_cell",
"heavy_battery_cell",
"heavy_plus_battery_cell",
"heavy_disposable_cell",
"heavy_atomic_battery_cell",
"small_storage_battery",
"medium_storage_battery",
"large_storage_battery",
"storage_battery"
]
]
],
"use_action": {
"target": "closed_loop_extractor_large",
"msg": "You turn off the large closed loop extractor.",
"menu_text": "turn off",
"need_charges": 0,
"need_charges_msg": "The large closed loop extractor's batteries need more charge.",
"type": "transform"
},
"qualities": [ [ "EXTRACT", 1 ] ]
},
{
"id": "oil_extractor_crude",
"type": "TOOL",
"name": { "str": "makeshift essential oil extractor" },
"description": "A makeshift extraction system. It's pretty much just a 55gal drum, a pipe to stir the solution, and a faucet at the bottom to drain the extractor. Not the most ideal piece of equipment but it will work.",
"symbol": "E",
"color": "dark_gray",
"looks_like": "55gal_drum",
"weight": "22700 g",
"volume": "210 L",
"price": 20000,
"to_hit": -5,
"bashing": 8,
"material": "steel",
"qualities": [ [ "EXTRACT", 1 ] ]
},
{
"id": "filter_paper_qualitative",
"type": "TOOL",
Expand Down