Merge branch 'CleverRaven:master' into dino_slower_adulthood

data/json/itemgroups/Clothing_Gear/clothing.json

@@ -3205,7 +3205,6 @@
       [ "tireplate", 10 ],
       [ "ballistic_vest_esapi", 2 ],
       { "group": "military_ballistic_vest", "prob": 4 },
-      [ "dragonskin", 1 ],
       [ "corset", 1 ],
       [ "corset_waist", 1 ],
       [ "football_armor", 18 ],

data/json/itemgroups/Locations_MapExtras/locations_commercial.json

@@ -621,7 +621,6 @@
       [ "motorbike_armor", 2 ],
       [ "motorbike_pants", 2 ],
       [ "motorbike_boots", 2 ],
-      [ "dragonskin", 2 ],
       [ "kittel", 1 ],
       [ "kippah", 3 ],
       [ "thawb", 2 ],

data/json/itemgroups/collections_domestic.json

@@ -1352,7 +1352,6 @@
       [ "petrified_eye", 5 ],
       [ "talking_doll", 40 ],
       [ "bondage_mask", 20 ],
-      [ "dragonskin", 2 ],
       [ "knife_hunting", 25 ],
       [ "throwing_knife", 25 ],
       { "item": "throwing_knife", "count": [ 1, 6 ], "entry-wrapper": "leg_sheath6", "prob": 5 },

data/json/itemgroups/main.json

@@ -15,22 +15,12 @@
     "magazine": 100,
     "subtype": "distribution",
     "entries": [
-      { "item": "12mm", "prob": 10 },
-      { "item": "alloy_plate", "prob": 10 },
-      { "item": "plasma_gun", "prob": 10 },
-      { "item": "can_sealer", "prob": 10 },
-      { "item": "hk_g80", "prob": 10 },
-      { "item": "hk_g80mag", "prob": 10 },
-      { "item": "stillsuit", "prob": 10 },
-      { "item": "hk_g80mag", "prob": 10 },
       { "item": "emp_gun", "prob": 10 },
       { "item": "laser_rifle", "prob": 10 },
-      { "item": "UPS_OFF", "prob": 10 },
       { "item": "optical_cloak", "prob": 10 },
       { "item": "holo_cloak", "prob": 10 },
       { "item": "plasma_rifle", "prob": 10 },
       { "item": "portal", "prob": 10 },
-      { "item": "atomic_coffeepot", "prob": 10 },
       { "item": "rm13_armor", "prob": 10 },
       { "item": "high_density_capacitor", "prob": 10 },
       { "item": "beam_scatterer", "prob": 10 },

data/json/items/armor/ballistic_armor.json

@@ -1318,42 +1318,6 @@
       }
     ]
   },
-  {
-    "id": "dragonskin",
-    "type": "ARMOR",
-    "category": "armor",
-    "name": { "str": "dragon skin vest" },
-    "//": "Based on a true story related to the real-world design",
-    "description": "This type of ballistic vest once promised to be the future of body armor, claiming to allow a greater range of movement than conventional ballistic vests as well as better protection.  Created by the now-defunct company Meridian Ballistics, it features a unique design consisting of overlapping ceramic disks, and was once famously demonstrated on TV absorbing high-energy rifle rounds at point blank.\n\nThe US Army quickly snapped up several hundred units of the armor, but testing soon revealed that they were extremely heavy, weighing almost fifty pounds, and that the design failed spectacularly in environmental tests.  After a series of investigations, claims of fraud, and court hearings, Meridian went bankrupt, and the Department of Justice subsequently dropped this design from its certifications.\n\nThere were no known users of these vests by the time that the world ended; this one was either an original production in the hands of a collector, or a similar design from a different company.  Whatever the case may be, you have one now, in all its unwieldy glory.",
-    "weight": "21545 g",
-    "volume": "6 L",
-    "price": "5000 USD",
-    "price_postapoc": "60 USD",
-    "to_hit": { "grip": "bad", "length": "short", "surface": "any", "balance": "uneven" },
-    "material": [ "ceramic", "nylon" ],
-    "symbol": "[",
-    "looks_like": "kevlar",
-    "color": "yellow",
-    "warmth": 12,
-    "flags": [ "STURDY", "OUTER", "NO_REPAIR" ],
-    "use_action": [ { "type": "attach_molle", "size": 10 }, { "type": "detach_molle" } ],
-    "//2": "Ceramic disks in real-life dragon skin are 6.4mm thick; the actual fabric itself wasn't intended to provide high-grade protection, and so it's quite thin here.",
-    "//3": "The double instance of ceramic here represents possible hits on parts where the disks themselves are overlapping, providing enhanced protection.",
-    "armor": [
-      {
-        "material": [
-          { "type": "nylon", "covered_by_mat": 100, "thickness": 1.0 },
-          { "type": "ceramic", "covered_by_mat": 90, "thickness": 6.4 },
-          { "type": "ceramic", "covered_by_mat": 30, "thickness": 6.4 }
-        ],
-        "encumbrance": 8,
-        "coverage": 100,
-        "cover_vitals": 90,
-        "covers": [ "torso" ]
-      }
-    ],
-    "melee_damage": { "bash": 6 }
-  },
   {
     "id": "xl_ballistic_vest",
     "type": "ARMOR",

data/json/items/armor/suits_protection.json

@@ -3070,27 +3070,6 @@
       "target": "xedra_enviro_suit"
     }
   },
-  {
-    "id": "stillsuit",
-    "type": "ARMOR",
-    "name": { "str": "WS-47G moisture retention suit" },
-    "description": "The WebbStar moisture retention suit utilizes advanced technology to prevent up to 30% of moisture loss through perspiration.  The suit is powered by the micro-motions of the body, especially breathing and walking motions.  Because of this, your walking speed is impaired while wearing it.",
-    "weight": "3481 g",
-    "volume": "7500 ml",
-    "price": "45 kUSD",
-    "price_postapoc": "20 USD",
-    "material": [ "lycra", "neoprene" ],
-    "symbol": "[",
-    "looks_like": "jumpsuit",
-    "color": "dark_gray",
-    "warmth": 15,
-    "material_thickness": 1,
-    "flags": [ "VARSIZE", "SKINTIGHT", "HOOD", "WATERPROOF", "MUNDANE", "ONLY_ONE" ],
-    "relic_data": {
-      "passive_effects": [ { "has": "WORN", "values": [ { "value": "THIRST", "multiply": -0.3 }, { "value": "MOVE_COST", "multiply": 0.1 } ] } ]
-    },
-    "armor": [ { "encumbrance": 18, "coverage": 95, "covers": [ "foot_l", "foot_r", "leg_l", "leg_r", "torso", "arm_l", "arm_r" ] } ]
-  },
   {
     "id": "suit",
     "type": "ARMOR",

data/json/monsterdrops/zombie_survivor.json

@@ -388,7 +388,6 @@
       [ "vest_leather", 20 ],
       [ "vest_leather_mod", 8 ],
       [ "stab_vest", 15 ],
-      [ "dragonskin", 1 ],
       [ "chainmail_junk_vest", 1 ],
       [ "chestguard_hard", 10 ],
       [ "armor_riot_torso", 10 ],

data/json/obsoletion_and_migration_0.I/migration_items.json

@@ -2159,5 +2159,15 @@
     "id": "peanutbutter_imitation",
     "type": "MIGRATION",
     "replace": "peanutbutter"
+  },
+  {
+    "id": "dragonskin",
+    "type": "MIGRATION",
+    "replace": "ballistic_vest_esapi"
+  },
+  {
+    "id": "stillsuit",
+    "type": "MIGRATION",
+    "replace": "h20survivor_jumpsuit"
   }
 ]

data/mods/TEST_DATA/known_bad_density.json

@@ -13,7 +13,6 @@
       "bot_gasbomb_hack",
       "tailoring_pattern_set",
       "k_gambeson_vest_xs",
-      "dragonskin",
       "mutant_cracklins",
       "venom_wasp",
       "cooked_marrow",

src/sdltiles.cpp

@@ -168,7 +168,7 @@ static void ClearScreen()
 static void InitSDL()
 {
     int init_flags = SDL_INIT_VIDEO | SDL_INIT_TIMER;
-#if defined(SOUND)
+#if defined(SDL_SOUND)
     init_flags |= SDL_INIT_AUDIO;
 #endif
     int ret;