diff --git a/data/mods/Aftershock/items/afs_bioparts.json b/data/mods/Aftershock/items/afs_bioparts.json
index 4a98739889e9d..ba2c72d0aa7c6 100644
--- a/data/mods/Aftershock/items/afs_bioparts.json
+++ b/data/mods/Aftershock/items/afs_bioparts.json
@@ -89,24 +89,26 @@
     "looks_like": "ar15",
     "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.  ",
+    "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",
     "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,
+    "ranged_damage": 19,
     "pierce": 12,
     "dispersion": 90,
     "durability": 7,
-    "loudness": 8,
-    "ammo_effects": [ "LASER", "INCENDIARY" ],
+    "loudness": 4,
+    "clip_size": 80,
+    "ammo_effects": "ACID",
     "flags": [ "NO_UNLOAD", "NON-FOULING" ]
   }
 ]
diff --git a/data/mods/Aftershock/items/afs_tools.json b/data/mods/Aftershock/items/afs_tools.json
index 16a71330921f9..b712de69f5d4b 100644
--- a/data/mods/Aftershock/items/afs_tools.json
+++ b/data/mods/Aftershock/items/afs_tools.json
@@ -19,9 +19,21 @@
         "active": true,
         "type": "transform"
       },
-      "CAMERA"
+      "CAMERA",
+      "MP3"
     ],
-    "flags": [ "WATCH", "ALARMCLOCK" ]
+    "flags": [ "WATCH", "ALARMCLOCK", "NO_UNLOAD", "NO_RELOAD" ]
+  },
+  {
+    "id": "afs_atomic_smartphone_music",
+    "copy-from": "afs_atomic_smartphone",
+    "type": "TOOL",
+    "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",
+    "use_action": "MP3_ON",
+    "flags": [ "WATCH", "TRADER_AVOID", "ALARMCLOCK", "NO_UNLOAD", "NO_RELOAD" ]
   },
   {
     "id": "afs_atomic_smartphone_flashlight",
@@ -36,8 +48,7 @@
       "menu_text": "Turn off flashlight",
       "type": "transform"
     },
-    "//": "since we cost no battery, no reason not to keep these",
-    "flags": [ "WATCH", "ALARMCLOCK", "LIGHT_25" ]
+    "flags": [ "WATCH", "LIGHT_25", "CHARGEDIM", "TRADER_AVOID", "ALARMCLOCK", "NO_UNLOAD", "NO_RELOAD" ]
   },
   {
     "id": "afs_wraitheon_smartphone",
diff --git a/data/mods/Aftershock/items/ammo.json b/data/mods/Aftershock/items/ammo.json
new file mode 100644
index 0000000000000..6e73f36a4d428
--- /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": "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",
+    "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/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 ] ]