Merge remote-tracking branch 'origin/master' into dev

LordTy · Jan 3, 2015 · 98cab00 · 98cab00
2 parents 696dc99 + ea508bb
commit 98cab00
Show file tree

Hide file tree

Showing 32 changed files with 2,944 additions and 557 deletions.
diff --git a/data/json/items/vehicle_parts.json b/data/json/items/vehicle_parts.json
@@ -645,6 +645,22 @@
         "category" : "veh_parts",
         "price" : 6000
     },
+    {
+        "type":"GENERIC",
+        "id" : "sheet_metal_lit",
+        "name" : "wired sheet metal",
+        "description" : "Sheet metal that has had light housing wired into it.",
+        "weight" : 1200,
+        "to_hit" : -2,
+        "color" : "light_cyan",
+        "symbol" : "]",
+        "material" : ["steel", "plastic", "null"],
+        "volume" : 5,
+        "bashing" : 5,
+        "cutting" : 0,
+        "category" : "veh_parts",
+        "price" : 7500
+    },
     {
         "type":"GENERIC",
         "id" : "wood_plate",

diff --git a/data/json/recipes/recipe_electronics.json b/data/json/recipes/recipe_electronics.json
@@ -298,6 +298,38 @@
     [ [ "battery", 15 ] ],
     [ [ "e_scrap", 1 ] ]
   ]
+},{
+  "type" : "recipe",
+  "result": "sheet_metal_lit",
+  "category": "CC_ELECTRONIC",
+  "subcategory": "CSC_ELECTRONIC_LIGHTING",
+  "skill_used": "electronics",
+  "difficulty": 1,
+  "time": 15000,
+  "reversible": false,
+  "autolearn": false,
+  "book_learn": [[ "manual_electronics", 1 ] , [ "mag_electronics", 1 ]],
+  "tools": [
+    [
+      [ "soldering_iron", 5 ],
+      [ "toolset", 5 ]
+    ]
+  ],
+  "components": [
+    [
+      [ "sheet_metal", 1 ]
+    ],
+    [
+      [ "lightstrip_inactive", 1 ],
+      [ "flashlight", 1 ]
+    ],
+    [
+      [ "cable", 10 ]
+    ],
+    [
+      [ "plastic_chunk", 2 ]
+    ]
+  ]
 },{
   "type" : "recipe",
   "result": "flashlight",

diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json
@@ -1553,6 +1553,9 @@
     ],
     [
       [ "wire", 3 ]
+    ],
+    [
+      [ "cable", 10 ]
     ]
   ]
 },{
-Original file line number
+Diff line change
@@ Expand Up / @@ -1553,6 +1553,9 @@ @@
         ],
         [
           [ "wire", 3 ]
+        ],
+        [
+          [ "cable", 10 ]
         ]
       ]
     },{
@@ Expand Down @@