New bionics

data/mods/Aftershock/EOC/_reusable_conditions.json

@@ -7,6 +7,7 @@
         "or": [
           { "u_has_item": "electrohack" },
           { "u_has_item": "afs_wrist_computer" },
+          { "u_has_item": "afs_bio_deck_jack" },
           { "u_has_item": "electrokinetic_electrohack_1" },
           { "u_has_item": "electrokinetic_electrohack_2" },
           { "u_has_item": "electrokinetic_electrohack_3" },

data/mods/Aftershock/itemgroups/bionics_groups.json

@@ -15,6 +15,7 @@
         [ "afs_bio_translocator", 5 ],
         [ "bio_shock_absorber", 2 ],
         [ "afs_bio_skullgun", 5 ],
+        [ "afs_bio_beavy_batteries", 20 ],
         [ "afs_bio_chemical_enhancement_rig", 10 ]
       ]
     }
@@ -23,7 +24,14 @@
     "id": "bionics_common",
     "type": "item_group",
     "copy-from": "bionics_common",
-    "extend": { "items": [ [ "bn_bio_solar", 10 ], [ "afs_bio_linguistic_coprocessor", 8 ], [ "bio_shield_weak", 25 ] ] }
+    "extend": {
+      "items": [
+        [ "bn_bio_solar", 10 ],
+        [ "afs_bio_linguistic_coprocessor", 8 ],
+        [ "afs_bio_beavy_batteries", 20 ],
+        [ "bio_shield_weak", 25 ]
+      ]
+    }
   },
   {
     "id": "bionics_reaver",
@@ -55,7 +63,7 @@
       [ "bio_scent_mask", 10 ],
       [ "bio_cloak", 10 ],
       [ "bio_synaptic_regen", 12 ],
-      [ "bio_fingerhack", 10 ],
+      [ "afs_bio_deck", 10 ],
       [ "bio_lockpick", 10 ],
       [ "bio_blood_anal", 10 ],
       [ "bio_geiger", 10 ],
@@ -86,6 +94,7 @@
     "extend": {
       "items": [
         [ "afs_bio_neurosoft_aeronautics", 10 ],
+        [ "afs_bio_beavy_batteries", 10 ],
         [ "afs_bio_melee_counteraction", 10 ],
         [ "afs_bio_melee_optimization_unit", 10 ],
         [ "afs_bio_monowhip", 10 ],

data/mods/Aftershock/items/cbms.json

@@ -46,6 +46,24 @@
     "price_postapoc": "15 kUSD",
     "difficulty": 5
   },
+  {
+    "id": "afs_bio_deck",
+    "copy-from": "bionic_general",
+    "type": "BIONIC_ITEM",
+    "name": { "str": "Military Infolink CBM" },
+    "description": "An implanted miniaturized computer isolated from the rest of your systems by military-grade firewalls.  An accompanying jack allows you to interface with external computer systems with minimal risk.  Skill in computers is important, and a failed use may damage your circuits.",
+    "price_postapoc": "10 kUSD",
+    "difficulty": 5
+  },
+  {
+    "id": "afs_bio_beavy_batteries",
+    "copy-from": "bionic_general",
+    "type": "BIONIC_ITEM",
+    "name": { "str": "High-Voltage Battery System CBM" },
+    "description": "A high voltage battery port compatible with the power cartridges normally used in military weaponry.  Intended to supplement internally installed power generation and storage.",
+    "price_postapoc": "7 kUSD",
+    "difficulty": 5
+  },
   {
     "id": "afs_bio_blood_brain",
     "copy-from": "bionic_general",

data/mods/Aftershock/items/tools.json

@@ -661,6 +661,64 @@
     "flags": [ "FRAGILE_MELEE" ],
     "melee_damage": { "stab": 1 }
   },
+  {
+    "id": "afs_bio_deck_jack",
+    "type": "TOOL",
+    "category": "tools",
+    "name": { "str": "infolink jack" },
+    "description": "The interface jack of an implanted infolink, coiled within your forearm and accessible through a small port in your wrist.  It can be used to interface and hack into electronic devices.",
+    "weight": "20 g",
+    "volume": "2 ml",
+    "price": "1 USD",
+    "symbol": ",",
+    "color": "green",
+    "ammo": [ "battery" ],
+    "flags": [
+      "INTEGRATED",
+      "UNBREAKABLE",
+      "PERSONAL",
+      "WATER_FRIENDLY",
+      "SOFT",
+      "NO_REPAIR",
+      "ALLOWS_NATURAL_ATTACKS",
+      "TRADER_AVOID",
+      "USES_BIONIC_POWER"
+    ],
+    "charges_per_use": 1,
+    "qualities": [ [ "HACK", 2 ] ]
+  },
+  {
+    "id": "afs_internal_battery_compartment",
+    "type": "TOOL_ARMOR",
+    "name": { "str": "high-voltage battery compartment" },
+    "description": "A battery slot installled in your upper torso, designed to power bionic implants.  Compatible with the power cartridges used by laser weaponry.",
+    "volume": "750 ml",
+    "weight": "1 g",
+    "price": "0 cent",
+    "material": [ "plastic" ],
+    "symbol": "(",
+    "color": "magenta",
+    "flags": [
+      "INTEGRATED",
+      "UNBREAKABLE",
+      "PERSONAL",
+      "NO_REPAIR",
+      "ALLOWS_NATURAL_ATTACKS",
+      "BIONIC_FUEL_SOURCE",
+      "SOFT",
+      "TRADER_AVOID"
+    ],
+    "ammo": [ "battery" ],
+    "pocket_data": [
+      {
+        "pocket_type": "MAGAZINE_WELL",
+        "rigid": true,
+        "max_contains_volume": "20 L",
+        "max_contains_weight": "20 kg",
+        "item_restriction": [ "afs_cartridge", "afs_bootleg_cartridge", "afs_archeotech_cartridge" ]
+      }
+    ]
+  },
   {
     "id": "diamond_press",
     "type": "GENERIC",

data/mods/Aftershock/player/bionics.json

@@ -97,6 +97,26 @@
       }
     ]
   },
+  {
+    "id": "afs_bio_deck",
+    "type": "bionic",
+    "name": { "str": "Military Infolink" },
+    "description": "An implanted miniaturized computer isolated from the rest of your systems by military-grade firewalls.  An accompanying jack allows you to interface with external computer systems with minimal risk.  Skill in computers is important, and a failed use may damage your circuits.",
+    "occupied_bodyparts": [ [ "arm_l", 1 ], [ "arm_r", 1 ] ],
+    "passive_pseudo_items": [ "afs_bio_deck_jack" ]
+  },
+  {
+    "id": "afs_bio_beavy_batteries",
+    "type": "bionic",
+    "name": { "str": "High-Voltage Battery System" },
+    "description": "A high voltage battery port compatible with the power cartridges normally used in military weaponry.  Intended to supplement internally installed power generation and storage.",
+    "occupied_bodyparts": [ [ "torso", 20 ] ],
+    "fuel_options": [ "battery" ],
+    "fuel_efficiency": 2,
+    "time": "1 s",
+    "flags": [ "BIONIC_POWER_SOURCE", "BIONIC_SHOCKPROOF", "BIONIC_TOGGLED" ],
+    "passive_pseudo_items": [ "afs_internal_battery_compartment" ]
+  },
   {
     "id": "afs_bio_blood_brain",
     "type": "bionic",