Merge remote-tracking branch 'origin/development'

* origin/development:
  New core content pack: Aftershock (CleverRaven#28386)

Author: kevingranade

data/mods/Aftershock/README.md

@@ -0,0 +1,27 @@
+# Here be dragons!
+
+These are the files for Aftershock. Whatever you're looking for has been sorted into subfolders for ease of access:
+
+### items
+
+Contains json data for food, weapons, tools, and materials.
+
+### maps
+
+Contains json data for map generation, item groups, and furniture.
+
+### mobs
+
+Contains json data for new monsters and monster spawn groups.
+
+### player
+
+Contains json data for things that affect the player; bionics, mutations, professions, techniques, status effects, etc.
+
+### recipes
+
+Contains json data for all recipes, sorted by category or niche.
+
+### vehicles
+
+Contains json data for vehicles, vehicle parts, and vehicle spawn groups.

data/mods/Aftershock/items/afs__items.json

@@ -0,0 +1,138 @@
+[
+  {
+    "id": "afs_solderers_item",
+    "copy-from": "fake_item",
+    "type": "TOOL",
+    "name": "precision solderers",
+    "flags": "TRADER_AVOID",
+    "qualities": [ [ "SAW_M_FINE", 1 ], [ "SCREW_FINE", 1 ], [ "CUT_FINE", 2 ] ]
+  },
+  {
+    "id": "afs_basin",
+    "type": "CONTAINER",
+    "name": "basin",
+    "description": "A wide, shallow basin used to hold liquid, hammered from a piece of sheet metal.  Ideal for collecting water.",
+    "weight": 5000,
+    "volume": 10,
+    "price": 1000,
+    "to_hit": -1,
+    "bashing": 1,
+    "material": "plastic",
+    "symbol": ")",
+    "color": "dark_gray",
+    "contains": 200,
+    "watertight": true,
+    "qualities": [ [ "COOK", 1 ], [ "BOIL", 2 ], [ "CONTAIN", 1 ] ]
+  },
+  {
+    "id": "afs_fridge",
+    "type": "GENERIC",
+    "name": "vehicle refrigerator",
+    "description": "A household refrigerator with impressive capacity.  Its power connection has been refurbished, and it can be mounted onto a vehicle to draw from its power.",
+    "symbol": "{",
+    "color": "white",
+    "weight": 142882,
+    "volume": 1200,
+    "price": 40000,
+    "price_postapoc": 10000,
+    "material": [ "steel" ],
+    "to_hit": -4,
+    "bashing": 8,
+    "flags": [ "DURABLE_MELEE" ],
+    "looks_like": "minifridge"
+  },
+  {
+    "id": "afs_freezer",
+    "type": "GENERIC",
+    "name": "vehicle freezer",
+    "copy-from": "afs_fridge",
+    "description": "This refurbished refrigerator has been stripped of much of its internal components and converted to run at a much lower temperature, causing it to serve as a freezer for more power.  Like its predecessor, it runs on vehicle power.",
+    "color": "light_blue"
+  },
+  {
+    "id": "afs_rolling_pin",
+    "type": "GENERIC",
+    "name": "rolling pin",
+    "description": "A light wooden rolling pin used to flatten dough.",
+    "symbol": "[",
+    "color": "brown",
+    "weight": 472,
+    "volume": 4,
+    "price": 1500,
+    "price_postapoc": 500,
+    "material": [ "wood" ],
+    "to_hit": -1,
+    "bashing": 6,
+    "flags": [ "DURABLE_MELEE", "FIREWOOD" ],
+    "techniques": [ "RAPID" ],
+    "looks_like": "bat"
+  },
+  {
+    "type": "GENERIC",
+    "id": "afs_scrap_titanium",
+    "symbol": ",",
+    "color": "white",
+    "name": "scrap titanium",
+    "name_plural": "scrap titanium",
+    "category": "spare_parts",
+    "description": "A piece of light titanium, usable for crafting or repairs.",
+    "price": 1000,
+    "material": "titanium",
+    "weight": 100,
+    "volume": 1,
+    "bashing": 1,
+    "to_hit": -2
+  },
+  {
+    "type": "GENERIC",
+    "id": "afs_titanium_frame",
+    "name": "ultralight frame",
+    "description": "A sturdy, lightweight frame made from titanium.  Useful for crafting.",
+    "weight": 1000,
+    "to_hit": -3,
+    "color": "white",
+    "symbol": "]",
+    "material": [ "titanium" ],
+    "techniques": [ "DEF_DISARM" ],
+    "volume": 30,
+    "bashing": 15,
+    "category": "veh_parts",
+    "price": 4000
+  },
+  {
+    "type": "GENERIC",
+    "id": "afs_metal_rig",
+    "copy-from": "vehicle_rig",
+    "name": "MetalMaster forge buddy",
+    "name_plural": "MetalMaster forge buddies",
+    "description": "From the makers of the best-selling* FOODCO kitchen buddy comes the MetalMaster forge buddy, for all your metalworking and welding needs!  It's just as clunky and awkward as the thing it's spinning off, and still requires a vehicle battery to function."
+  },
+  {
+    "type": "GENERIC",
+    "id": "afs_cooking_rig",
+    "copy-from": "vehicle_rig",
+    "name": "cooking rig",
+    "name_plural": "cooking rigs",
+    "description": "Skillet, pot, hotplate, and chemistry set; everything you need to cook food and chemicals.  Includes proper fume vents and a separator, so you don't contaminate your food with toxic chemicals."
+  },
+  {
+    "id": "afs_large_storage_battery",
+    "type": "MAGAZINE",
+    "category": "veh_parts",
+    "name": "large storage battery",
+    "name_plural": "large storage batteries",
+    "description": "A huge lithium ion storage battery, weighing easily 600 pounds.  Holds a tremendous amount of energy.",
+    "weight": 300000,
+    "volume": 80,
+    "price": 400000,
+    "price_postapoc": 50000,
+    "to_hit": -2,
+    "bashing": 40,
+    "material": [ "plastic", "steel" ],
+    "symbol": ":",
+    "color": "light_cyan",
+    "ammo_type": "battery",
+    "capacity": 100000,
+    "flags": [ "NO_SALVAGE", "NO_UNLOAD", "NO_RELOAD", "RECHARGE" ]
+  }
+]