From 765b42d07100a12c051a0671d16f9b854f920645 Mon Sep 17 00:00:00 2001
From: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Date: Tue, 24 Dec 2019 16:45:40 -0500
Subject: [PATCH 01/17] Update afs_speech.json

---
 data/mods/Aftershock/afs_speech.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/mods/Aftershock/afs_speech.json b/data/mods/Aftershock/afs_speech.json
index aacc67356893a..94c20cee2f116 100644
--- a/data/mods/Aftershock/afs_speech.json
+++ b/data/mods/Aftershock/afs_speech.json
@@ -32,7 +32,7 @@
   {
     "type": "speech",
     "speaker": "afs_mon_migoturret",
-    "sound": "\"The better to eat you! I don't actually think I eat anymore.\"",
+    "sound": "\"The better to eat you!  I don't actually think I eat anymore.\"",
     "volume": 40
   },
   {

From 029207b17adc6f5b7960278b8ae1e2580a2552bf Mon Sep 17 00:00:00 2001
From: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Date: Tue, 24 Dec 2019 22:45:40 -0500
Subject: [PATCH 02/17] Fixes

---
 data/mods/Aftershock/items/afs_bioparts.json | 6 ++----
 data/mods/Aftershock/maps/afs_furniture.json | 2 --
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/data/mods/Aftershock/items/afs_bioparts.json b/data/mods/Aftershock/items/afs_bioparts.json
index eb43c4a03da3b..9e627d552ede0 100644
--- a/data/mods/Aftershock/items/afs_bioparts.json
+++ b/data/mods/Aftershock/items/afs_bioparts.json
@@ -105,10 +105,8 @@
     "pierce": 12,
     "dispersion": 90,
     "durability": 7,
-    "loudness": 8,
-    "max_charges": 80,
-    "initial_charges": 80,
+    "clip_size": 80,
     "ammo_effects": [ "LASER", "INCENDIARY" ],
-    "flags": [ "NO_UNLOAD", "NON-FOULING" ]
+    "flags": [ "NO_UNLOAD", "NON-FOULING", "NO_RELOAD" ]
   }
 ]
diff --git a/data/mods/Aftershock/maps/afs_furniture.json b/data/mods/Aftershock/maps/afs_furniture.json
index 1fe96a263d40b..8032a00fb04e2 100644
--- a/data/mods/Aftershock/maps/afs_furniture.json
+++ b/data/mods/Aftershock/maps/afs_furniture.json
@@ -8,7 +8,6 @@
     "color": "white",
     "move_cost_mod": -1,
     "required_str": 10,
-    "insulation": 3,
     "flags": [ "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR", "MINEABLE", "EASY_DECONSTRUCT" ],
     "deconstruct": { "items": [ { "item": "afs_fridge", "count": 1 } ] },
     "max_volume": 4000,
@@ -42,7 +41,6 @@
     "color": "light_blue",
     "move_cost_mod": -1,
     "required_str": 10,
-    "insulation": 3,
     "flags": [ "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR", "MINEABLE", "EASY_DECONSTRUCT" ],
     "deconstruct": { "items": [ { "item": "afs_freezer", "count": 1 } ] },
     "max_volume": 4000,

From 75fa5a0af99f8bb3239a8ee0e226425fd8f36b47 Mon Sep 17 00:00:00 2001
From: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Date: Tue, 24 Dec 2019 23:14:07 -0500
Subject: [PATCH 03/17] Fixes

---
 data/mods/Aftershock/items/afs_item_groups.json          | 4 ++--
 data/mods/Aftershock/maps/afs_regional_map_settings.json | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/data/mods/Aftershock/items/afs_item_groups.json b/data/mods/Aftershock/items/afs_item_groups.json
index 88212c58a12bb..c8291186e6dbd 100644
--- a/data/mods/Aftershock/items/afs_item_groups.json
+++ b/data/mods/Aftershock/items/afs_item_groups.json
@@ -11,7 +11,7 @@
       { "item": "pants_cargo" },
       { "item": "kevlar" },
       { "item": "leather_pouch" },
-      { "item": "balclava", "chance": 75 },
+      { "item": "balclava" },
       { "item": "bootsheath" }
     ]
   },
@@ -19,7 +19,7 @@
     "type": "item_group",
     "id": "afs_gardener_carried",
     "subtype": "collection",
-    "entries": [ { "group": "hardware", "count": [ 1, 2 ] }, { "group": "snacks", "repeat": [ 1, 3 ] } ]
+    "entries": [ { "group": "hardware", "count": [ 1, 2 ] }, { "group": "snacks", "count": [ 1, 3 ] } ]
   },
   {
     "type": "item_group",
diff --git a/data/mods/Aftershock/maps/afs_regional_map_settings.json b/data/mods/Aftershock/maps/afs_regional_map_settings.json
index d60348f670c99..4b3ed6fbaa9f0 100644
--- a/data/mods/Aftershock/maps/afs_regional_map_settings.json
+++ b/data/mods/Aftershock/maps/afs_regional_map_settings.json
@@ -4,6 +4,5 @@
     "id": "brightnights_overlay",
     "regions": [ "all" ],
     "city": { "basements": { "basement": 1000, "basement_hidden_lab_stairs": 100, "basement_bionic": 100 } },
-    "weather": { "base_temperature": 0.0 }
   }
 ]

From 3703511917447daf64491582dac15af0856166de Mon Sep 17 00:00:00 2001
From: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Date: Tue, 24 Dec 2019 23:19:00 -0500
Subject: [PATCH 04/17] Update afs_regional_map_settings.json

---
 data/mods/Aftershock/maps/afs_regional_map_settings.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/mods/Aftershock/maps/afs_regional_map_settings.json b/data/mods/Aftershock/maps/afs_regional_map_settings.json
index 4b3ed6fbaa9f0..151b4c44fd58b 100644
--- a/data/mods/Aftershock/maps/afs_regional_map_settings.json
+++ b/data/mods/Aftershock/maps/afs_regional_map_settings.json
@@ -3,6 +3,6 @@
     "type": "region_overlay",
     "id": "brightnights_overlay",
     "regions": [ "all" ],
-    "city": { "basements": { "basement": 1000, "basement_hidden_lab_stairs": 100, "basement_bionic": 100 } },
+    "city": { "basements": { "basement": 1000, "basement_hidden_lab_stairs": 100, "basement_bionic": 100 } }
   }
 ]

From 83e45ed9b4427528a1b70b812487e8aa1b857836 Mon Sep 17 00:00:00 2001
From: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Date: Mon, 30 Dec 2019 00:12:49 -0500
Subject: [PATCH 05/17] Update afs_bioparts.json

---
 data/mods/Aftershock/items/afs_bioparts.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/data/mods/Aftershock/items/afs_bioparts.json b/data/mods/Aftershock/items/afs_bioparts.json
index 9e627d552ede0..ea134f249b353 100644
--- a/data/mods/Aftershock/items/afs_bioparts.json
+++ b/data/mods/Aftershock/items/afs_bioparts.json
@@ -105,7 +105,6 @@
     "pierce": 12,
     "dispersion": 90,
     "durability": 7,
-    "clip_size": 80,
     "ammo_effects": [ "LASER", "INCENDIARY" ],
     "flags": [ "NO_UNLOAD", "NON-FOULING", "NO_RELOAD" ]
   }

From c691e8f411572a631fdad059011f4755f247c63c Mon Sep 17 00:00:00 2001
From: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Date: Mon, 30 Dec 2019 08:44:14 -0500
Subject: [PATCH 06/17] remove friendly mapgen fix linux patron

---
 data/mods/Aftershock/maps/mapgen/prepnet_orchard.json | 4 ++--
 data/mods/Aftershock/player/afs_professions.json      | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/data/mods/Aftershock/maps/mapgen/prepnet_orchard.json b/data/mods/Aftershock/maps/mapgen/prepnet_orchard.json
index f5d8745818874..e339eb13a4262 100644
--- a/data/mods/Aftershock/maps/mapgen/prepnet_orchard.json
+++ b/data/mods/Aftershock/maps/mapgen/prepnet_orchard.json
@@ -65,7 +65,7 @@
       "sealed_item": { "p": { "items": { "item": "farming_seeds", "chance": 100 }, "furniture": "f_plant_harvest" } },
       "place_monsters": [
         { "monster": "GROUP_PARK_SCENIC", "x": 12, "y": 14, "chance": 2 },
-        { "monster": "GROUP_PrepNet", "x": [ 3, 20 ], "y": [ 16, 20 ], "repeat": 4, "friendly": true }
+        { "monster": "GROUP_PrepNet", "x": [ 3, 20 ], "y": [ 16, 20 ], "repeat": 4 }
       ],
       "place_npcs": [ { "class": "prepnet_gardener", "x": 10, "y": 9 } ]
     }
@@ -138,7 +138,7 @@
       "sealed_item": { "p": { "items": { "item": "farming_seeds", "chance": 100 }, "furniture": "f_plant_harvest" } },
       "place_monsters": [
         { "monster": "GROUP_PARK_SCENIC", "x": 12, "y": 14, "chance": 2 },
-        { "monster": "GROUP_PrepNet", "x": [ 3, 20 ], "y": [ 16, 20 ], "repeat": 3, "friendly": true }
+        { "monster": "GROUP_PrepNet", "x": [ 3, 20 ], "y": [ 16, 20 ], "repeat": 3 }
       ],
       "place_npcs": [ { "class": "prepnet_gardener", "x": 10, "y": 9 } ]
     }
diff --git a/data/mods/Aftershock/player/afs_professions.json b/data/mods/Aftershock/player/afs_professions.json
index a42b13cf739a2..a466638c6efe6 100644
--- a/data/mods/Aftershock/player/afs_professions.json
+++ b/data/mods/Aftershock/player/afs_professions.json
@@ -32,8 +32,10 @@
     "points": 2,
     "skills": [ { "level": 5, "name": "computer" } ],
     "items": {
-      "both": [ "laptop", "software_useless", "linuxtshirt", "pants_cargo", "socks", "slingpack", "sneakers", "smart_phone" ],
-      "entries": [ { "item": "light_plus_battery_cell", "ammo-item": "battery", "charges": 150, "container-item": "eink_tablet_pc" } ],
+      "both": {
+      "itmes": [ "laptop", "software_useless", "linuxtshirt", "pants_cargo", "socks", "slingpack", "sneakers", "smart_phone" ],
+      "entries": [ { "item": "light_plus_battery_cell", "ammo-item": "battery", "charges": 150, "container-item": "eink_tablet_pc" } ]
+    },
       "male": [ "briefs" ],
       "female": [ "bra", "panties" ]
     }

From 7360b94944df20d5b8c1fef3a6ac6fac474fb44f Mon Sep 17 00:00:00 2001
From: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Date: Mon, 30 Dec 2019 08:55:50 -0500
Subject: [PATCH 07/17] Update afs_vehicle_overrides.json

---
 data/mods/Aftershock/vehicles/afs_vehicle_overrides.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/mods/Aftershock/vehicles/afs_vehicle_overrides.json b/data/mods/Aftershock/vehicles/afs_vehicle_overrides.json
index cf8d2507ee7dc..19dbe068f9d67 100644
--- a/data/mods/Aftershock/vehicles/afs_vehicle_overrides.json
+++ b/data/mods/Aftershock/vehicles/afs_vehicle_overrides.json
@@ -97,7 +97,7 @@
       {
         "y": 1,
         "x": 3,
-        "parts": [ "turret_mount", { "ammo_type": [ "40x46mm_m433" ], "part": "mounted_mk19", "ammo": 60, "ammo_qty": [ 1, 25 ] } ]
+        "parts": [ "turret_mount", { "ammo_type":  "40x46mm_m433" , "part": "mounted_mk19", "ammo": 60, "ammo_qty": [ 1, 25 ] } ]
       },
       { "y": 1, "x": 3, "parts": [ "seat", "seatbelt_heavyduty" ] },
       { "y": 0, "x": 3, "parts": [ "hdframe_vertical_2", "stowboard_vertical", "hdroof" ] },

From 133bdb6b395e666a27ab9be9564045e3c2e3f00f Mon Sep 17 00:00:00 2001
From: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Date: Mon, 30 Dec 2019 09:35:48 -0500
Subject: [PATCH 08/17] Update afs_tools.json

---
 data/mods/Aftershock/items/afs_tools.json | 57 ++++++++++++++---------
 1 file changed, 34 insertions(+), 23 deletions(-)

diff --git a/data/mods/Aftershock/items/afs_tools.json b/data/mods/Aftershock/items/afs_tools.json
index eb71696c73a95..df4d64c836c87 100644
--- a/data/mods/Aftershock/items/afs_tools.json
+++ b/data/mods/Aftershock/items/afs_tools.json
@@ -13,32 +13,43 @@
     "symbol": ";",
     "color": "light_green",
     "use_action": [
-      {
-        "target": "afs_atomic_smartphone_flashlight",
-        "msg": "You activate the flashlight app.",
-        "active": true,
+        {
+          "target": "afs_atomic_smartphone_flashlight",
+          "msg": "You activate the flashlight app.",
+          "active": true,
+          "type": "transform"
+        },
+        "CAMERA",
+        "MP3"
+      ],
+      "flags": [ "WATCH", "ALARMCLOCK", "NO_UNLOAD", "NO_RELOAD" ]
+    },
+    {
+      "id": "afs_atomic_smartphone_music",
+      "copy-from": "afs_atomic_smartphone",
+      "type": "TOOL",
+      "name": "aomic smartphone - music",
+      "name_plural": "atomic smartphones - music",
+      "description": "This phone is playing music, steadily raising your morale.  You can't hear anything else while you're listening.",
+      "revert_to": "afs_atomic_smartphone",
+      "use_action": "MP3_ON",
+      "flags": [ "WATCH", "TRADER_AVOID", "ALARMCLOCK", "NO_UNLOAD", "NO_RELOAD" ]
+    },
+    {
+      "id": "afs_atomic_smartphone_flashlight",
+      "copy-from": "afs_atomic_smartphone",
+      "type": "TOOL",
+      "name": "atomic smartphone - Flashlight",
+      "name_plural": "atomic smartphones - Flashlight",
+      "revert_to": "afs_atomic_smartphone",
+      "use_action": {
+        "target": "afs_atomic_smartphone",
+        "msg": "You deactivate the flashlight app.",
+        "menu_text": "Turn off flashlight",
         "type": "transform"
       },
-      { "revert_to": "afs_atomic_smartphone", "type": "CAMERA" }
-    ],
-    "flags": [ "WATCH", "ALARMCLOCK" ]
-  },
-  {
-    "id": "afs_atomic_smartphone_flashlight",
-    "copy-from": "afs_atomic_smartphone",
-    "type": "TOOL",
-    "name": "atomic smartphone - Flashlight",
-    "name_plural": "atomic smartphones - Flashlight",
-    "revert_to": "afs_atomic_smartphone",
-    "use_action": {
-      "target": "afs_atomic_smartphone",
-      "msg": "You deactivate the flashlight app.",
-      "menu_text": "Turn off flashlight",
-      "type": "transform"
+      "flags": [ "WATCH", "LIGHT_25", "CHARGEDIM", "TRADER_AVOID", "ALARMCLOCK", "NO_UNLOAD", "NO_RELOAD" ]
     },
-    "//": "since we cost no battery, no reason not to keep these",
-    "flags": [ "WATCH", "ALARMCLOCK", "LIGHT_25" ]
-  },
   {
     "id": "afs_atompot",
     "type": "TOOL",

From 21743495c3f9a6a1e2223d790c7c45086e19cb4f Mon Sep 17 00:00:00 2001
From: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Date: Mon, 30 Dec 2019 09:54:26 -0500
Subject: [PATCH 09/17] factions and linting

---
 data/mods/Aftershock/npcs/afs_factions.json              | 1 +
 data/mods/Aftershock/vehicles/afs_vehicle_overrides.json | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/data/mods/Aftershock/npcs/afs_factions.json b/data/mods/Aftershock/npcs/afs_factions.json
index 4df287e763e82..de2311fdcce07 100644
--- a/data/mods/Aftershock/npcs/afs_factions.json
+++ b/data/mods/Aftershock/npcs/afs_factions.json
@@ -68,6 +68,7 @@
       "hells_raiders": { "kill on sight": true },
       "marloss": { "kill on sight": true }
     },
+    "mon_faction": "PrepNet",
     "description": "A group of bionic preppers who had expected the collapse of the economy and global chaos, instead they were slightly more ready than others for the Cataclysm."
   }
 ]
diff --git a/data/mods/Aftershock/vehicles/afs_vehicle_overrides.json b/data/mods/Aftershock/vehicles/afs_vehicle_overrides.json
index 19dbe068f9d67..9bf935967617e 100644
--- a/data/mods/Aftershock/vehicles/afs_vehicle_overrides.json
+++ b/data/mods/Aftershock/vehicles/afs_vehicle_overrides.json
@@ -97,7 +97,7 @@
       {
         "y": 1,
         "x": 3,
-        "parts": [ "turret_mount", { "ammo_type":  "40x46mm_m433" , "part": "mounted_mk19", "ammo": 60, "ammo_qty": [ 1, 25 ] } ]
+        "parts": [ "turret_mount", { "ammo_type": "40x46mm_m433", "part": "mounted_mk19", "ammo": 60, "ammo_qty": [ 1, 25 ] } ]
       },
       { "y": 1, "x": 3, "parts": [ "seat", "seatbelt_heavyduty" ] },
       { "y": 0, "x": 3, "parts": [ "hdframe_vertical_2", "stowboard_vertical", "hdroof" ] },

From 0cd878498725e5f5cb38b336bfeb0f9f38287da0 Mon Sep 17 00:00:00 2001
From: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Date: Mon, 30 Dec 2019 10:01:35 -0500
Subject: [PATCH 10/17] linting

---
 data/mods/Aftershock/items/afs_tools.json | 68 +++++++++++------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/data/mods/Aftershock/items/afs_tools.json b/data/mods/Aftershock/items/afs_tools.json
index f991128d016f2..857e5bdd0d20b 100644
--- a/data/mods/Aftershock/items/afs_tools.json
+++ b/data/mods/Aftershock/items/afs_tools.json
@@ -13,43 +13,43 @@
     "symbol": ";",
     "color": "light_green",
     "use_action": [
-        {
-          "target": "afs_atomic_smartphone_flashlight",
-          "msg": "You activate the flashlight app.",
-          "active": true,
-          "type": "transform"
-        },
-        "CAMERA",
-        "MP3"
-      ],
-      "flags": [ "WATCH", "ALARMCLOCK", "NO_UNLOAD", "NO_RELOAD" ]
-    },
-    {
-      "id": "afs_atomic_smartphone_music",
-      "copy-from": "afs_atomic_smartphone",
-      "type": "TOOL",
-      "name": "aomic smartphone - music",
-      "name_plural": "atomic smartphones - music",
-      "description": "This phone is playing music, steadily raising your morale.  You can't hear anything else while you're listening.",
-      "revert_to": "afs_atomic_smartphone",
-      "use_action": "MP3_ON",
-      "flags": [ "WATCH", "TRADER_AVOID", "ALARMCLOCK", "NO_UNLOAD", "NO_RELOAD" ]
-    },
-    {
-      "id": "afs_atomic_smartphone_flashlight",
-      "copy-from": "afs_atomic_smartphone",
-      "type": "TOOL",
-      "name": "atomic smartphone - Flashlight",
-      "name_plural": "atomic smartphones - Flashlight",
-      "revert_to": "afs_atomic_smartphone",
-      "use_action": {
-        "target": "afs_atomic_smartphone",
-        "msg": "You deactivate the flashlight app.",
-        "menu_text": "Turn off flashlight",
+      {
+        "target": "afs_atomic_smartphone_flashlight",
+        "msg": "You activate the flashlight app.",
+        "active": true,
         "type": "transform"
       },
-      "flags": [ "WATCH", "LIGHT_25", "CHARGEDIM", "TRADER_AVOID", "ALARMCLOCK", "NO_UNLOAD", "NO_RELOAD" ]
+      "CAMERA",
+      "MP3"
+    ],
+    "flags": [ "WATCH", "ALARMCLOCK", "NO_UNLOAD", "NO_RELOAD" ]
+  },
+  {
+    "id": "afs_atomic_smartphone_music",
+    "copy-from": "afs_atomic_smartphone",
+    "type": "TOOL",
+    "name": "aomic smartphone - music",
+    "name_plural": "atomic smartphones - music",
+    "description": "This phone is playing music, steadily raising your morale.  You can't hear anything else while you're listening.",
+    "revert_to": "afs_atomic_smartphone",
+    "use_action": "MP3_ON",
+    "flags": [ "WATCH", "TRADER_AVOID", "ALARMCLOCK", "NO_UNLOAD", "NO_RELOAD" ]
+  },
+  {
+    "id": "afs_atomic_smartphone_flashlight",
+    "copy-from": "afs_atomic_smartphone",
+    "type": "TOOL",
+    "name": "atomic smartphone - Flashlight",
+    "name_plural": "atomic smartphones - Flashlight",
+    "revert_to": "afs_atomic_smartphone",
+    "use_action": {
+      "target": "afs_atomic_smartphone",
+      "msg": "You deactivate the flashlight app.",
+      "menu_text": "Turn off flashlight",
+      "type": "transform"
     },
+    "flags": [ "WATCH", "LIGHT_25", "CHARGEDIM", "TRADER_AVOID", "ALARMCLOCK", "NO_UNLOAD", "NO_RELOAD" ]
+  },
   {
     "id": "afs_wraitheon_smartphone",
     "type": "TOOL",

From 730022c672be3ea85ee1594cd7db1d48c452eca0 Mon Sep 17 00:00:00 2001
From: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Date: Mon, 30 Dec 2019 10:20:39 -0500
Subject: [PATCH 11/17] Update afs_professions.json

---
 data/mods/Aftershock/player/afs_professions.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/mods/Aftershock/player/afs_professions.json b/data/mods/Aftershock/player/afs_professions.json
index 3604eca1ca94d..1f9e1ebba3959 100644
--- a/data/mods/Aftershock/player/afs_professions.json
+++ b/data/mods/Aftershock/player/afs_professions.json
@@ -33,9 +33,9 @@
     "skills": [ { "level": 5, "name": "computer" } ],
     "items": {
       "both": {
-      "itmes": [ "laptop", "software_useless", "linuxtshirt", "pants_cargo", "socks", "slingpack", "sneakers", "smart_phone" ],
-      "entries": [ { "item": "light_plus_battery_cell", "ammo-item": "battery", "charges": 150, "container-item": "eink_tablet_pc" } ]
-    },
+        "itmes": [ "laptop", "software_useless", "linuxtshirt", "pants_cargo", "socks", "slingpack", "sneakers", "smart_phone" ],
+        "entries": [ { "item": "light_plus_battery_cell", "ammo-item": "battery", "charges": 150, "container-item": "eink_tablet_pc" } ]
+      },
       "male": [ "briefs" ],
       "female": [ "bra", "panties" ]
     }

From c5515915757589063621e76c5ff483fdf2d52584 Mon Sep 17 00:00:00 2001
From: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Date: Mon, 30 Dec 2019 10:34:40 -0500
Subject: [PATCH 12/17] Update afs_professions.json

---
 data/mods/Aftershock/player/afs_professions.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/mods/Aftershock/player/afs_professions.json b/data/mods/Aftershock/player/afs_professions.json
index 1f9e1ebba3959..27d21f1b0159e 100644
--- a/data/mods/Aftershock/player/afs_professions.json
+++ b/data/mods/Aftershock/player/afs_professions.json
@@ -33,7 +33,7 @@
     "skills": [ { "level": 5, "name": "computer" } ],
     "items": {
       "both": {
-        "itmes": [ "laptop", "software_useless", "linuxtshirt", "pants_cargo", "socks", "slingpack", "sneakers", "smart_phone" ],
+        "items": [ "laptop", "software_useless", "linuxtshirt", "pants_cargo", "socks", "slingpack", "sneakers", "smart_phone" ],
         "entries": [ { "item": "light_plus_battery_cell", "ammo-item": "battery", "charges": 150, "container-item": "eink_tablet_pc" } ]
       },
       "male": [ "briefs" ],

From ac71bbe798e488cfc9c644df95f132a6dad3a3dc Mon Sep 17 00:00:00 2001
From: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Date: Mon, 30 Dec 2019 21:46:27 -0500
Subject: [PATCH 13/17] fix bioblaster drop

---
 data/mods/Aftershock/items/afs_bioparts.json  | 10 +++++----
 data/mods/Aftershock/items/ammo.json          | 22 +++++++++++++++++++
 data/mods/Aftershock/items/ammo_type.json     |  8 +++++++
 data/mods/Aftershock/npcs/afs_factions.json   |  1 -
 .../recipes/afs_deconstruction.json           |  1 +
 5 files changed, 37 insertions(+), 5 deletions(-)
 create mode 100644 data/mods/Aftershock/items/ammo.json
 create mode 100644 data/mods/Aftershock/items/ammo_type.json

diff --git a/data/mods/Aftershock/items/afs_bioparts.json b/data/mods/Aftershock/items/afs_bioparts.json
index 9c2e951e7bbbf..b0d0e2300262c 100644
--- a/data/mods/Aftershock/items/afs_bioparts.json
+++ b/data/mods/Aftershock/items/afs_bioparts.json
@@ -90,23 +90,25 @@
     "type": "GUN",
     "name": "vibrating bioblaster",
     "name_plural": "bioblasters",
-    "description": "You ripped this from a mi-go abomination.  You have no clue how or if it can be reloaded.  ",
+    "description": "You ripped this from a mi-go abomination.  You think you should wear gloves to reload it.  ",
     "weight": "5140 g",
     "volume": "1500 ml",
     "price": 400000,
+    "ammo": "acidic_bore",
     "to_hit": -1,
     "bashing": 4,
     "material": [ "alien_resin" ],
     "symbol": "(",
     "color": "magenta",
-    "skill": "rifle",
+    "skill": "launcher",
     "range": 30,
     "ranged_damage": 16,
     "pierce": 12,
     "dispersion": 90,
     "durability": 7,
     "loudness": 8,
-    "ammo_effects": [ "LASER", "INCENDIARY" ],
-    "flags": [ "NO_UNLOAD", "NON-FOULING", "NO_RELOAD" ]
+    "clip_size": 80,
+    "ammo_effects": "ACID",
+    "flags": [ "NO_UNLOAD", "NON-FOULING" ]
   }
 ]
diff --git a/data/mods/Aftershock/items/ammo.json b/data/mods/Aftershock/items/ammo.json
new file mode 100644
index 0000000000000..fbf2a46400ba7
--- /dev/null
+++ b/data/mods/Aftershock/items/ammo.json
@@ -0,0 +1,22 @@
+[
+  {
+    "type": "AMMO",
+    "id": "acidic_bore",
+    "price": 10000,
+    "price_postapoc": 500,
+    "name": "acidic bore",
+    "symbol": "=",
+    "color": "red",
+    "description": "You shouldn't have this item.",
+    "material": "alien_resin",
+    "volume": "250 ml",
+    "weight": "1 g",
+    "ammo_type": "acidic_bore",
+    "damage": 5,
+    "dispersion": 100,
+    "count": 80,
+    "stack_size": 80,
+    "loudness": 9,
+    "effects": "NEVER_MISFIRES"
+  }
+]
diff --git a/data/mods/Aftershock/items/ammo_type.json b/data/mods/Aftershock/items/ammo_type.json
new file mode 100644
index 0000000000000..6c70202a19ba2
--- /dev/null
+++ b/data/mods/Aftershock/items/ammo_type.json
@@ -0,0 +1,8 @@
+[
+  {
+    "type": "ammunition_type",
+    "id": "acidic_bore",
+    "name": "acidic bore",
+    "default": "acidic_bore"
+  }
+]
diff --git a/data/mods/Aftershock/npcs/afs_factions.json b/data/mods/Aftershock/npcs/afs_factions.json
index de2311fdcce07..4df287e763e82 100644
--- a/data/mods/Aftershock/npcs/afs_factions.json
+++ b/data/mods/Aftershock/npcs/afs_factions.json
@@ -68,7 +68,6 @@
       "hells_raiders": { "kill on sight": true },
       "marloss": { "kill on sight": true }
     },
-    "mon_faction": "PrepNet",
     "description": "A group of bionic preppers who had expected the collapse of the economy and global chaos, instead they were slightly more ready than others for the Cataclysm."
   }
 ]
diff --git a/data/mods/Aftershock/recipes/afs_deconstruction.json b/data/mods/Aftershock/recipes/afs_deconstruction.json
index 9114be0f469b5..66ecf088bae9e 100644
--- a/data/mods/Aftershock/recipes/afs_deconstruction.json
+++ b/data/mods/Aftershock/recipes/afs_deconstruction.json
@@ -12,6 +12,7 @@
       [ [ "brain", 4 ] ],
       [ [ "mutant_meat", 12 ] ],
       [ [ "vibrating_blaster", 1 ] ],
+      [ [ "acidic_bore", 60 ] ],
       [ [ "humming_heart", 1 ] ],
       [ [ "sensory_cluster", 1 ] ],
       [ [ "bioweapon_chassis", 1 ] ]

From e3476b49786018f86fb1bd3f19f6441c09431e5c Mon Sep 17 00:00:00 2001
From: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Date: Tue, 31 Dec 2019 01:57:20 -0500
Subject: [PATCH 14/17] Update data/mods/Aftershock/items/afs_tools.json

Co-Authored-By: ZhilkinSerg <ZhilkinSerg@users.noreply.github.com>
---
 data/mods/Aftershock/items/afs_tools.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/mods/Aftershock/items/afs_tools.json b/data/mods/Aftershock/items/afs_tools.json
index b9e12b59f237a..b712de69f5d4b 100644
--- a/data/mods/Aftershock/items/afs_tools.json
+++ b/data/mods/Aftershock/items/afs_tools.json
@@ -28,7 +28,7 @@
     "id": "afs_atomic_smartphone_music",
     "copy-from": "afs_atomic_smartphone",
     "type": "TOOL",
-    "name": "aomic smartphone - music",
+    "name": "atomic smartphone - music",
     "name_plural": "atomic smartphones - music",
     "description": "This phone is playing music, steadily raising your morale.  You can't hear anything else while you're listening.",
     "revert_to": "afs_atomic_smartphone",

From fd1e9bef9a20f35061d84844eb0e68595caeb5d5 Mon Sep 17 00:00:00 2001
From: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Date: Tue, 31 Dec 2019 08:57:39 -0500
Subject: [PATCH 15/17] Update afs_bioparts.json

---
 data/mods/Aftershock/items/afs_bioparts.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/mods/Aftershock/items/afs_bioparts.json b/data/mods/Aftershock/items/afs_bioparts.json
index b0d0e2300262c..b9c4bb15cd3d8 100644
--- a/data/mods/Aftershock/items/afs_bioparts.json
+++ b/data/mods/Aftershock/items/afs_bioparts.json
@@ -89,7 +89,7 @@
     "looks_like": "ar15",
     "type": "GUN",
     "name": "vibrating bioblaster",
-    "name_plural": "bioblasters",
+    "name_plural": "vibrating bioblasters",
     "description": "You ripped this from a mi-go abomination.  You think you should wear gloves to reload it.  ",
     "weight": "5140 g",
     "volume": "1500 ml",

From 1284733028175258abe0af245fe5bf258fa8e6e4 Mon Sep 17 00:00:00 2001
From: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Date: Tue, 31 Dec 2019 09:03:18 -0500
Subject: [PATCH 16/17] Update afs_bioparts.json

---
 data/mods/Aftershock/items/afs_bioparts.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/mods/Aftershock/items/afs_bioparts.json b/data/mods/Aftershock/items/afs_bioparts.json
index b9c4bb15cd3d8..ba2c72d0aa7c6 100644
--- a/data/mods/Aftershock/items/afs_bioparts.json
+++ b/data/mods/Aftershock/items/afs_bioparts.json
@@ -102,11 +102,11 @@
     "color": "magenta",
     "skill": "launcher",
     "range": 30,
-    "ranged_damage": 16,
+    "ranged_damage": 19,
     "pierce": 12,
     "dispersion": 90,
     "durability": 7,
-    "loudness": 8,
+    "loudness": 4,
     "clip_size": 80,
     "ammo_effects": "ACID",
     "flags": [ "NO_UNLOAD", "NON-FOULING" ]

From e6bb6c4d0996df56df3ec3063434f76e324ff74f Mon Sep 17 00:00:00 2001
From: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Date: Tue, 31 Dec 2019 09:05:56 -0500
Subject: [PATCH 17/17] update description now that gun is reloadable

---
 data/mods/Aftershock/items/ammo.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/mods/Aftershock/items/ammo.json b/data/mods/Aftershock/items/ammo.json
index fbf2a46400ba7..6e73f36a4d428 100644
--- a/data/mods/Aftershock/items/ammo.json
+++ b/data/mods/Aftershock/items/ammo.json
@@ -7,7 +7,7 @@
     "name": "acidic bore",
     "symbol": "=",
     "color": "red",
-    "description": "You shouldn't have this item.",
+    "description": "This wriggling nodule of resin and flesh appears to be secreting a pungent fluid.  You'd probably best feed it into the bioblaster. ",
     "material": "alien_resin",
     "volume": "250 ml",
     "weight": "1 g",