Merge branch 'master' into mbr

CleverRaven · Jan 12, 2020 · 1c9a2b3 · 1c9a2b3
2 parents 27d994d + ecaf57f
commit 1c9a2b3
Show file tree

Hide file tree

Showing 136 changed files with 4,329 additions and 3,036 deletions.
diff --git a/README.md b/README.md
@@ -2,6 +2,7 @@
 [![Coverage Status](https://coveralls.io/repos/github/CleverRaven/Cataclysm-DDA/badge.svg?branch=master)](https://coveralls.io/github/CleverRaven/Cataclysm-DDA?branch=master)
 [![Open Source Helpers](https://www.codetriage.com/cleverraven/cataclysm-dda/badges/users.svg)](https://www.codetriage.com/cleverraven/cataclysm-dda)
 [![Lines of Code](https://tokei.rs/b1/github/CleverRaven/Cataclysm-DDA?category=code)](https://github.com/XAMPPRocky/tokei)
+[![Feature Requests](https://feathub.com/CleverRaven/Cataclysm-DDA?format=svg)](https://feathub.com/CleverRaven/Cataclysm-DDA)
 
 # Cataclysm: Dark Days Ahead
 

diff --git a/data/json/bionics.json b/data/json/bionics.json
@@ -141,6 +141,9 @@
     "name": "Cable Charger System",
     "description": "You have a complex port surgically mounted above your hip.  While active, it will recharge bionic power when connected to a power source via jumper cable.",
     "occupied_bodyparts": [ [ "TORSO", 10 ] ],
+    "is_remote_fueled": true,
+    "time": 1,
+    "fuel_efficiency": 1,
     "flags": [ "BIONIC_POWER_SOURCE", "BIONIC_SHOCKPROOF", "BIONIC_TOGGLED" ]
   },
   {

diff --git a/data/json/construction.json b/data/json/construction.json
@@ -3165,7 +3165,7 @@
       [ [ "cu_pipe", 4 ] ],
       [ [ "cable", 12 ] ],
       [ [ "pipe", 4 ] ],
-      [ [ "hand_vice", 1 ] ],
+      [ [ "clamp", 1 ] ],
       [ [ "motor_tiny", 1 ] ],
       [ [ "medium_storage_battery", 2 ] ],
       [ [ "frame", 1 ] ],

diff --git a/data/json/itemgroups/food.json b/data/json/itemgroups/food.json
@@ -550,212 +550,6 @@
       { "item": "mre_hotdog_box" }
     ]
   },
-  {
-    "type": "item_group",
-    "id": "foodintincan",
-    "items": [
-      [ "offal_canned", 1 ],
-      [ "can_coconut", 1 ],
-      [ "con_milk", 1 ],
-      [ "milk_evap", 1 ],
-      [ "sauce_red", 1 ],
-      [ "can_peach", 1 ],
-      [ "apple_canned", 1 ],
-      [ "can_cheese", 1 ],
-      [ "fish_canned", 1 ],
-      [ "can_spam", 1 ],
-      [ "can_sardine", 1 ],
-      [ "ravioli", 1 ],
-      [ "chili", 1 ],
-      [ "pork_beans", 1 ],
-      [ "can_tuna", 1 ],
-      [ "can_salmon", 1 ],
-      [ "can_chicken", 1 ],
-      [ "can_herring", 1 ],
-      [ "can_clams", 1 ],
-      [ "can_chowder", 1 ],
-      [ "meat_canned", 1 ],
-      [ "pelmeni", 1 ],
-      [ "canned_liver", 1 ],
-      [ "can_beans", 1 ],
-      [ "can_tomato", 1 ],
-      [ "broth", 1 ],
-      [ "broth_bone", 1 ],
-      [ "soup_veggy", 1 ],
-      [ "soup_meat", 1 ],
-      [ "soup_fish", 1 ],
-      [ "curry_veggy", 1 ],
-      [ "curry_meat", 1 ],
-      [ "soup_woods", 1 ],
-      [ "soup_chicken", 1 ],
-      [ "soup_mushroom", 1 ],
-      [ "soup_tomato", 1 ],
-      [ "soup_dumplings", 1 ],
-      [ "soup_cullenskink", 1 ],
-      [ "can_corn", 1 ],
-      [ "cooked_pumpkin", 1 ],
-      [ "veggy_canned", 1 ]
-    ]
-  },
-  {
-    "type": "item_group",
-    "id": "cannedfood",
-    "items": [
-      [ "can_beans", 40 ],
-      [ "pork_beans", 40 ],
-      [ "can_tomato", 40 ],
-      [ "can_corn", 35 ],
-      [ "cooked_pumpkin", 25 ],
-      [ "con_milk", 30 ],
-      [ "can_spam", 30 ],
-      [ "can_pineapple", 30 ],
-      [ "can_peach", 30 ],
-      [ "can_coconut", 10 ],
-      [ "can_sardine", 14 ],
-      [ "can_tuna", 35 ],
-      [ "can_salmon", 25 ],
-      [ "can_chowder", 35 ],
-      [ "can_herring", 30 ],
-      [ "can_chicken", 40 ],
-      [ "broth", 15 ],
-      [ "crackers", 10 ],
-      [ "grahmcrackers", 10 ],
-      [ "marshmallow", 10 ],
-      [ "syrup", 15 ],
-      [ "coffee_syrup", 10 ],
-      [ "soup_veggy", 15 ],
-      [ "soup_meat", 15 ],
-      [ "soup_chicken", 15 ],
-      [ "soup_mushroom", 15 ],
-      [ "soup_tomato", 15 ],
-      [ "soup_dumplings", 15 ],
-      [ "curry_veggy", 15 ],
-      [ "curry_meat", 15 ],
-      [ "flour", 30 ],
-      [ "milk_powder", 20 ],
-      [ "cornmeal", 30 ],
-      [ "powder_eggs", 20 ],
-      {
-        "item": "protein_powder",
-        "prob": 12,
-        "container-item": "bottle_plastic_small",
-        "charges-min": 1,
-        "charges-max": 9
-      },
-      [ "dry_meat", 10 ],
-      [ "dry_fish", 10 ],
-      [ "dry_veggy", 10 ],
-      [ "dry_fruit", 10 ],
-      [ "oatmeal", 40 ],
-      [ "toastem", 30 ],
-      [ "toastem2", 30 ],
-      [ "toastem3", 35 ],
-      [ "toasterpastryfrozen", 20 ],
-      [ "sugar", 20 ],
-      [ "lemonade_powder", 5 ],
-      [ "molasses", 10 ],
-      [ "can_cheese", 40 ],
-      [ "cheese_hard", 5 ],
-      [ "salt", 20 ],
-      [ "pepper", 20 ],
-      [ "seasoning_salt", 25 ],
-      [ "vinegar", 15 ],
-      [ "cooking_oil", 30 ],
-      [ "cooking_oil2", 30 ],
-      { "item": "veggy_pickled", "prob": 8, "charges": 2, "container-item": "jar_glass_sealed" },
-      [ "jar_sauerkraut_pickled", 5 ],
-      [ "sports_drink", 10 ],
-      [ "protein_shake", 10 ],
-      { "item": "dogfood", "prob": 5, "container-item": "can_medium" },
-      { "item": "catfood", "prob": 5, "container-item": "can_food" },
-      { "item": "fish_pickled", "prob": 8, "charges": 2, "container-item": "jar_glass_sealed" },
-      [ "lutefisk", 1 ],
-      [ "dry_beans", 40 ],
-      [ "dry_lentils", 40 ],
-      [ "dry_rice", 40 ],
-      { "item": "meat_pickled", "prob": 6, "charges": 2, "container-item": "jar_glass_sealed" },
-      { "item": "meat_canned", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" },
-      { "item": "veggy_canned", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" },
-      { "item": "apple_canned", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" },
-      { "item": "offal_canned", "prob": 1, "charges": 12, "container-item": "jar_3l_glass_sealed" },
-      { "item": "can_tomato", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" },
-      { "item": "fish_pickled", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" },
-      { "item": "meat_pickled", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" },
-      { "item": "veggy_pickled", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" },
-      { "item": "fish_pickled", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" },
-      { "item": "sauce_red", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" },
-      { "item": "kompot", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" },
-      { "group": "big_canned_food", "prob": 4 }
-    ]
-  },
-  {
-    "type": "item_group",
-    "id": "big_canned_food",
-    "items": [
-      { "item": "can_beans", "prob": 4, "charges": 12, "container-item": "can_food_big" },
-      { "item": "can_tomato", "prob": 4, "charges": 24, "container-item": "can_food_big" },
-      { "item": "can_pineapple", "prob": 4, "charges": 12, "container-item": "can_food_big" },
-      { "item": "can_corn", "prob": 4, "charges": 6, "container-item": "can_food_big" },
-      { "item": "sauce_red", "prob": 3, "charges": 96, "container-item": "can_food_big" }
-    ]
-  },
-  {
-    "type": "item_group",
-    "id": "pasta",
-    "items": [
-      [ "spaghetti_raw", 40 ],
-      [ "lasagne_raw", 40 ],
-      [ "macaroni_raw", 40 ],
-      [ "noodles_fast", 30 ],
-      [ "ravioli", 25 ],
-      [ "sauce_red", 20 ],
-      [ "sauce_pesto", 15 ],
-      [ "bread", 14 ],
-      [ "cornbread", 7 ],
-      [ "flatbread", 7 ],
-      [ "crackers", 20 ],
-      [ "grahmcrackers", 20 ],
-      [ "marshmallow", 20 ],
-      [ "biscuit", 12 ],
-      [ "hardtack", 2 ],
-      [ "pastaextruder", 5 ],
-      [ "seasoning_salt", 25 ],
-      [ "seasoning_italian", 25 ]
-    ]
-  },
-  {
-    "type": "item_group",
-    "id": "produce",
-    "items": [
-      [ "apple", 70 ],
-      [ "orange", 65 ],
-      [ "banana", 40 ],
-      [ "lemon", 50 ],
-      [ "pear", 50 ],
-      [ "cherries", 30 ],
-      [ "plums", 30 ],
-      [ "grapes", 50 ],
-      [ "cranberries", 7 ],
-      [ "raspberries", 7 ],
-      [ "blackberries", 7 ],
-      [ "rhubarb", 20 ],
-      [ "mushroom", 4 ],
-      [ "potato", 10 ],
-      [ "blueberries", 3 ],
-      [ "strawberries", 2 ],
-      [ "tomato", 9 ],
-      [ "pumpkin", 11 ],
-      [ "broccoli", 9 ],
-      [ "cucumber", 10 ],
-      [ "zucchini", 7 ],
-      [ "celery", 5 ],
-      [ "wheat", 3 ],
-      [ "onion", 3 ],
-      [ "garlic", 3 ],
-      [ "pine_nuts", 2 ],
-      [ "carrot", 3 ]
-    ]
-  },
   {
     "type": "item_group",
     "id": "alcohol",

diff --git a/data/json/itemgroups/locations_commercial.json b/data/json/itemgroups/locations_commercial.json
@@ -663,7 +663,7 @@
       [ "chem_hexamine", 5 ],
       [ "esbit_stove", 10 ],
       [ "mess_tin", 10 ],
-      [ "angular_grinder", 4 ]
+      [ "angle_grinder", 4 ]
     ]
   },
   {

diff --git a/data/json/itemgroups/misc.json b/data/json/itemgroups/misc.json
@@ -147,6 +147,6 @@
     "id": "horse_gear",
     "type": "item_group",
     "//": "Horse vehicle items",
-    "items": [ [ "riding_saddle", 50 ], [ "yoke_harness", 50 ] ]
+    "items": [ [ "horse_tack", 50 ], [ "yoke_harness", 50 ] ]
   }
 ]
diff --git a/data/json/itemgroups/tools.json b/data/json/itemgroups/tools.json
@@ -34,7 +34,7 @@
       [ "toolbox", 20 ],
       [ "toolbox_workshop", 5 ],
       [ "recharge_station", 10 ],
-      [ "angular_grinder", 30 ]
+      [ "angle_grinder", 30 ]
     ]
   },
   {
@@ -61,7 +61,7 @@
       [ "recharge_station", 10 ],
       [ "hand_crank_charger", 25 ],
       [ "metal_file", 10 ],
-      [ "hand_vice", 10 ]
+      [ "clamp", 10 ]
     ]
   },
   {
@@ -164,7 +164,7 @@
       [ "soldering_iron", 150 ],
       [ "cordless_drill", 100 ],
       [ "pin_reamer", 30 ],
-      [ "hand_vice", 10 ]
+      [ "clamp", 10 ]
     ]
   },
   {
@@ -220,9 +220,9 @@
       { "item": "weldtank", "prob": 60, "count": [ 1, 2 ] },
       { "item": "tinyweldtank", "prob": 60, "count": [ 1, 3 ] },
       [ "polisher", 70 ],
-      [ "angular_grinder", 5 ],
+      [ "angle_grinder", 5 ],
       [ "welder", 10 ],
-      [ "hand_vice", 10 ]
+      [ "clamp", 10 ]
     ]
   },
   {
@@ -304,7 +304,7 @@
       [ "chem_hexamine", 10 ],
       [ "esbit_stove", 15 ],
       [ "mess_tin", 5 ],
-      [ "riding_saddle", 3 ],
+      [ "horse_tack", 3 ],
       [ "saddlebag", 5 ],
       [ "lifestraw", 3 ],
       [ "acetylene_machine", 2 ]
@@ -425,7 +425,7 @@
       [ "sm_extinguisher", 10 ],
       [ "toolbox", 5 ],
       [ "tool_belt", 10 ],
-      [ "hand_vice", 10 ],
+      [ "clamp", 10 ],
       [ "wrench", 10 ]
     ]
   },
@@ -444,7 +444,7 @@
       [ "screwdriver", 35 ],
       [ "pin_reamer", 10 ],
       [ "metal_file", 10 ],
-      [ "hand_vice", 20 ]
+      [ "clamp", 20 ]
     ]
   },
   {
@@ -457,7 +457,7 @@
       [ "jackhammer", 50 ],
       [ "elec_jackhammer", 50 ],
       [ "circsaw_off", 10 ],
-      [ "angular_grinder", 20 ]
+      [ "angle_grinder", 20 ]
     ]
   },
   {

diff --git a/data/json/items/armor.json b/data/json/items/armor.json
@@ -654,11 +654,11 @@
     "symbol": "[",
     "looks_like": "kevlar",
     "color": "light_gray",
-    "covers": [ "TORSO", "ARMS" ],
-    "coverage": 70,
+    "covers": [ "TORSO", "LEGS", "ARMS" ],
+    "coverage": 85,
     "encumbrance": 10,
     "warmth": 10,
-    "material_thickness": 5,
+    "material_thickness": 6,
     "flags": [ "STURDY", "OUTER" ]
   },
   {