Merge branch 'Bionic-thieves' of github.com:John-Candlebury/Cataclysm-DDA

Author: Rivet-the-Zombie

data/json/item_groups.json

@@ -869,6 +869,7 @@
       ["thread", 40],
       ["flashlight", 40],
       ["suit", 60],
+      ["waistcoat", 30],
       ["tophat", 10],
       ["bowhat", 10],
       ["cowboy_hat", 10],
@@ -2399,6 +2400,7 @@
       ["pants", 75],
       ["leather_belt", 30],
       ["suit", 60],
+      ["waistcoat", 30],
       ["tophat", 10],
       ["bowhat", 10],
       ["cowboy_hat", 10],
@@ -3378,6 +3380,7 @@
       ["rapier", 3],
       ["cane", 10],
       ["suit", 60],
+      ["waistcoat", 30],
       ["gold_watch", 20],
       ["sf_watch", 10],
       ["mask_gas", 10],

data/json/items/armor.json

@@ -2071,6 +2071,30 @@
         "coverage" : 95,
         "material_thickness" : 3
     },
+    {
+        "type" : "ARMOR",
+        "id" : "waistcoat",
+        "name" : "waistcoat",
+        "weight" : 516,
+        "color" : "light_gray",
+        "covers" : ["TORSO"],
+        "to_hit" : 0,
+        "storage" : 6,
+        "symbol" : "[",
+        "description" : "An elegant waistcoat. Ideal for those occasions when wearing only a shirt would be too casual and a suit would be just overdoing it.",
+        "price" : 200,
+        "material" : ["cotton", "null"],
+        "volume" : 4,
+        "cutting" : 0,
+        "warmth" : 5,
+        "phase" : "solid",
+        "enviromental_protection" : 0,
+        "encumbrance" : 0,
+        "bashing" : -3,
+        "flags" : ["VARSIZE", "FANCY"],
+        "coverage" : 60,
+        "material_thickness" : 1
+    },
     {
         "type" : "ARMOR",
         "id" : "cleansuit",

data/json/items/ranged.json

@@ -256,6 +256,32 @@
     "clip_size": 8,
     "reload": 400
   },
+  {
+    "id": "briefcase_smg",
+    "type": "GUN",
+    "symbol": "[",
+    "color": "dark_gray",
+    "name": "briefcase smg",
+    "description": "A custom built 9mm submachine gun camouflaged to look as the average buisnessman suitcase, panes of cutting edge materials and its clever internal construction allowed it to bypass even the most scrupulous of security checkpoints. Due to the fact that the average security guard is now only concerned in eating you, this million dollar baby has been reduced to little more than a novelty item.",
+    "price": 4000,
+    "material": ["steel", "leather"],
+    "flags": "MODE_BURST",
+    "skill": "smg",
+    "ammo": "9mm",
+    "weight": 2900,
+    "volume": 7,
+    "bashing": 15,
+    "cutting": 0,
+    "to_hit": 0,
+    "ranged_damage": 1,
+    "range": 0,
+    "dispersion": 17,
+    "recoil": -3,
+    "durability": 8,
+    "burst": 3,
+    "clip_size": 30,
+    "reload": 800
+  },
   {
     "id": "sig_mosquito",
     "type": "GUN",

data/json/professions.json

@@ -650,18 +650,23 @@
         "type" : "profession",
         "ident": "bionic_thief",
         "name": "Bionic Thief",
-        "description": "You have done many high profile heists, but your gains mean nothing in this world. All you have left is your bionic lockpick that you keep powered via batteries.",
-        "points": 2,
+        "description": "You have done many high profile heists, but your gains mean nothing in this world. All you have left are the tools of your trade and your impeccable style.",
+        "points": 3,
         "CBMs":[
             "bio_batteries",
             "bio_lockpick",
+            "bio_fingerhack",
             "bio_power_storage_mkII"
         ],
         "items":[
-            "sunglasses",
-            "jeans",
+            "waistcoat",
+            "pants",
             "dress_shirt",
-            "dress_shoes"
+            "dress_shoes",
+            "gold_watch",
+            "briefcase_smg",
+            "PDA",
+            "9mm"
         ]
     },
     {