Permalink
Browse files

Merge branch 'master' into experimental

  • Loading branch information...
Coolthulhu committed Aug 30, 2017
2 parents 895775f + 31834b0 commit 181c36c69b2a3a2a07b6dacebed58446ddc74923
View
@@ -8384,24 +8384,25 @@
["v_planter_item_advanced", 8]
]
},{
"type" : "item_group",
"id" : "museum_primitive",
"items" : [
["primitive_knife", 50],
["primitive_axe", 50],
["primitive_shovel", 50],
["primitive_hammer", 50],
["primitive_adze", 50 ],
["needle_bone", 50],
["needle_wood", 50],
["steel_chunk", 50],
["loincloth_fur", 50],
["distaff_spindle", 50],
["carding_paddles", 50],
["knitting_needles", 50],
["pointy_stick", 50],
["copper_knife", 10],
["copper_ax", 10]
"id": "museum_primitive",
"type": "item_group",
"items": [
[ "primitive_knife", 50 ],
[ "primitive_axe", 50 ],
[ "primitive_shovel", 50 ],
[ "primitive_hammer", 50 ],
[ "primitive_adze", 50 ],
[ "needle_bone", 50 ],
[ "needle_wood", 50 ],
[ "steel_chunk", 50 ],
[ "loincloth_fur", 50 ],
[ "distaff_spindle", 50 ],
[ "carding_paddles", 50 ],
[ "knitting_needles", 50 ],
[ "pointy_stick", 50 ],
[ "copper_knife", 10 ],
[ "copper_ax", 10 ],
[ "bone_flute", 10 ]
]
},{
"type" : "item_group",
@@ -241,7 +241,7 @@
"color": "light_gray",
"name": "empty canister",
"description": "An empty canister, which may have once held tear gas or other substances.",
"material": "aluminum",
"material": "steel",
"weight": 158,
"volume": 1,
"bashing": 2,
View
@@ -662,6 +662,37 @@
"color": "red",
"use_action": "BOLTCUTTERS"
},
{
"id": "bone_flute",
"type": "TOOL",
"category": "tools",
"name": "bone flute",
"name_plural": "bone flutes",
"description": "A polished bone flute with five finger holes.",
"weight": 250,
"volume": 2,
"price": 5000,
"bashing": 2,
"material": "bone",
"symbol": "-",
"color": "white",
"initial_charges": 1,
"max_charges": 1,
"use_action": {
"type": "musical_instrument",
"volume": 12,
"fun": -5,
"fun_bonus": 2,
"speed_penalty": 10,
"description_frequency": 20,
"descriptions": [
"You play a little tune on your flute.",
"You play a beautiful piece on your flute.",
"You play a piece on your bone flute that resembles the howling wind through Aurignacian caves.",
"Your bone flute wails for the fallen during the hunt."
]
}
},
{
"id": "boobytrap",
"type": "TOOL",
@@ -86,7 +86,7 @@
"book_learn": [ [ "mag_fieldrepair", 2 ] ],
"qualities": [ { "id": "CUT", "level": 1 } ],
"components": [
[ [ "can_drink_unsealed", 1 ], [ "can_food_unsealed", 1 ] ],
[ [ "can_drink_unsealed", 1 ], [ "can_food_unsealed", 1 ], [ "canister_empty", 1 ] ],
[ [ "paper", 50 ] ],
[ [ "duct_tape", 20 ] ]
]
@@ -932,6 +932,7 @@
[
[ "can_drink_unsealed", 2 ],
[ "can_food_unsealed", 2 ],
[ "canister_empty", 2 ],
[ "scrap", 4 ]
],
[
@@ -963,6 +964,7 @@
[
[ "can_drink_unsealed", 2 ],
[ "can_food_unsealed", 2 ],
[ "canister_empty", 2 ],
[ "scrap", 4 ]
],
[
@@ -994,6 +996,7 @@
[
[ "can_drink_unsealed", 2 ],
[ "can_food_unsealed", 2 ],
[ "canister_empty", 2 ],
[ "scrap", 4 ]
],
[
@@ -1025,6 +1028,7 @@
[
[ "can_drink_unsealed", 2 ],
[ "can_food_unsealed", 2 ],
[ "canister_empty", 2 ],
[ "scrap", 4 ]
],
[
@@ -1056,6 +1060,7 @@
[
[ "can_drink_unsealed", 2 ],
[ "can_food_unsealed", 2 ],
[ "canister_empty", 2 ],
[ "scrap", 4 ]
],
[
@@ -384,6 +384,7 @@
[ "scrap", 4 ],
[ "can_drink_unsealed", 1 ],
[ "can_food_unsealed", 1 ],
[ "canister_empty", 1 ],
[ "bottle_glass", 1 ],
[ "bottle_plastic", 1 ],
[ "bottle_plastic_small", 1 ]
@@ -717,7 +717,19 @@
[ "splinter", 1 ]
]
]
},{
},{
"result": "bone_flute",
"type": "recipe",
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_TOOLS",
"skill_used": "survival",
"difficulty": 3,
"skills_required": [ "fabrication", 3 ],
"time": 60000,
"autolearn": true,
"qualities": [ { "id": "CUT", "level": 1 } ],
"components": [ [ [ "bone", 1 ], [ "bone_human", 1 ] ] ]
},{
"type" : "recipe",
"result": "primitive_knife",
"category": "CC_OTHER",
@@ -2620,7 +2632,8 @@
[
[ "clay_canister", 1 ],
[ "can_drink_unsealed", 1 ],
[ "can_food_unsealed", 1 ]
[ "can_food_unsealed", 1 ],
[ "canister_empty", 1 ]
]
]
},{
@@ -32,7 +32,7 @@
{ "id": "SCREW", "level": 1 }
],
"components": [
[ [ "can_drink_unsealed", 1 ], [ "can_food_unsealed", 1 ] ],
[ [ "can_drink_unsealed", 1 ], [ "can_food_unsealed", 1 ], [ "canister_empty", 1 ] ],
[ [ "spring", 1 ] ],
[ [ "scrap", 1 ] ],
[ [ "duct_tape", 20 ] ]
@@ -539,6 +539,7 @@ def extract_mutation_category(item):
simple_fields = [ "mutagen_message",
"iv_message",
"iv_sleep_message",
"iv_sound_message",
"junkie_message"
]
Oops, something went wrong.

0 comments on commit 181c36c

Please sign in to comment.