diff --git a/data/json/ammo_effects.json b/data/json/ammo_effects.json
index b668e31b22b71..946a75215ebbf 100644
--- a/data/json/ammo_effects.json
+++ b/data/json/ammo_effects.json
@@ -97,6 +97,11 @@
     "aoe": { "field_type": "fd_plasma", "intensity_min": 2, "intensity_max": 3, "chance": 50 },
     "trail": { "field_type": "fd_plasma", "intensity_min": 1, "intensity_max": 2, "chance": 50 }
   },
+  {
+    "id": "PLASMA_BUBBLE",
+    "type": "ammo_effect",
+    "aoe": { "field_type": "fd_plasma", "intensity_min": 1, "intensity_max": 3, "radius": 1, "chance": 10 }
+  },
   {
     "id": "EXPLOSIVE_HUGE",
     "type": "ammo_effect",
diff --git a/data/json/items/gun/bio.json b/data/json/items/gun/bio.json
index f8f9f6f5603c7..69b9216d8b776 100644
--- a/data/json/items/gun/bio.json
+++ b/data/json/items/gun/bio.json
@@ -58,7 +58,7 @@
     "color": "magenta",
     "skill": "pistol",
     "range": 30,
-    "ranged_damage": { "damage_type": "stab", "amount": 10, "armor_penetration": 15 },
+    "ranged_damage": { "damage_type": "heat", "amount": 10, "armor_penetration": 4 },
     "dispersion": 10,
     "durability": 10,
     "loudness": 7,
diff --git a/data/json/items/gun/ups.json b/data/json/items/gun/ups.json
index b51d092deb626..903fe6c613b61 100644
--- a/data/json/items/gun/ups.json
+++ b/data/json/items/gun/ups.json
@@ -17,12 +17,12 @@
     "color": "cyan",
     "skill": "rifle",
     "range": 35,
-    "ranged_damage": { "damage_type": "stab", "amount": 30, "armor_penetration": 20 },
+    "ranged_damage": { "damage_type": "electric", "amount": 45, "armor_penetration": 4 },
     "dispersion": 10,
     "durability": 10,
     "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ],
     "loudness": 23,
-    "ups_charges": 70,
+    "ups_charges": 60,
     "reload": 0,
     "valid_mod_locations": [
       [ "accessories", 4 ],
@@ -55,14 +55,14 @@
     "color": "blue",
     "skill": "rifle",
     "range": 30,
-    "ranged_damage": { "damage_type": "stab", "amount": 10, "armor_penetration": 10 },
+    "ranged_damage": { "damage_type": "heat", "amount": 20, "armor_penetration": 4 },
     "dispersion": 100,
     "durability": 8,
     "loudness": 12,
-    "ups_charges": 80,
+    "ups_charges": 20,
     "reload": 0,
     "modes": [ [ "DEFAULT", "3 rd.", 3 ], [ "BURST", "5 rd.", 5 ], [ "AUTO", "high auto", 15 ] ],
-    "ammo_effects": [ "LASER", "INCENDIARY" ],
+    "ammo_effects": [ "LASER", "PLASMA_BUBBLE", "INCENDIARY" ],
     "flags": [
       "NO_UNLOAD",
       "NEVER_JAMS",
@@ -92,13 +92,13 @@
     "color": "blue",
     "skill": "rifle",
     "range": 45,
-    "ranged_damage": { "damage_type": "stab", "amount": 30, "armor_penetration": 20 },
+    "ranged_damage": { "damage_type": "heat", "amount": 30, "armor_penetration": 4 },
     "dispersion": 15,
     "durability": 8,
     "loudness": 1,
-    "ups_charges": 180,
+    "ups_charges": 50,
     "reload": 0,
-    "ammo_effects": [ "LASER", "INCENDIARY" ],
+    "ammo_effects": [ "LASER", "PLASMA_BUBBLE", "INCENDIARY" ],
     "flags": [
       "NO_UNLOAD",
       "NEVER_JAMS",
@@ -129,7 +129,7 @@
     "color": "magenta",
     "skill": "rifle",
     "range": 30,
-    "ranged_damage": { "damage_type": "stab", "amount": 10, "armor_penetration": 15 },
+    "ranged_damage": { "damage_type": "heat", "amount": 10, "armor_penetration": 4 },
     "dispersion": 90,
     "durability": 7,
     "loudness": 8,
@@ -166,7 +166,7 @@
     "color": "yellow",
     "skill": "rifle",
     "range": 30,
-    "ranged_damage": { "damage_type": "stab", "amount": 22, "armor_penetration": 15 },
+    "ranged_damage": { "damage_type": "heat", "amount": 25, "armor_penetration": 4 },
     "dispersion": 10,
     "durability": 8,
     "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
@@ -205,11 +205,11 @@
     "color": "magenta",
     "skill": "pistol",
     "range": 30,
-    "ranged_damage": { "damage_type": "stab", "amount": 10, "armor_penetration": 15 },
+    "ranged_damage": { "damage_type": "heat", "amount": 10, "armor_penetration": 4 },
     "dispersion": 180,
     "durability": 8,
     "loudness": 7,
-    "ups_charges": 20,
+    "ups_charges": 10,
     "reload": 200,
     "valid_mod_locations": [
       [ "accessories", 2 ],
diff --git a/data/mods/Aftershock/items/gun/laser.json b/data/mods/Aftershock/items/gun/laser.json
index c44c67eb0bfc2..0490ba013d6aa 100644
--- a/data/mods/Aftershock/items/gun/laser.json
+++ b/data/mods/Aftershock/items/gun/laser.json
@@ -25,8 +25,8 @@
     "description": "A powerful tri-barreled laser weapon, still mounted to the robotic hand of the wraitheon drone it originally belonged too.  Can still be fired when connected to an UPS.",
     "color": "red",
     "range": 10,
-    "ranged_damage": { "damage_type": "stab", "amount": 25, "armor_penetration": 15 },
-    "ups_charges": 50,
+    "ranged_damage": { "damage_type": "heat", "amount": 25, "armor_penetration": 4 },
+    "ups_charges": 30,
     "modes": [ [ "MULTI", "trilaser", 3 ] ],
     "ammo_effects": [ "LASER" ],
     "flags": [ "NEVER_JAMS", "NO_UNLOAD", "NON-FOULING", "NEEDS_NO_LUBE" ]
diff --git a/data/mods/Aftershock/items/weapons.json b/data/mods/Aftershock/items/weapons.json
index 8230e5a7e7d64..1ea37965d17d8 100644
--- a/data/mods/Aftershock/items/weapons.json
+++ b/data/mods/Aftershock/items/weapons.json
@@ -85,7 +85,7 @@
     "armor_data": { "covers": [ "TORSO" ], "coverage": 5, "material_thickness": 1, "encumbrance": 7 },
     "reload_noise_volume": 0,
     "loudness": 0,
-    "ranged_damage": { "damage_type": "stab", "amount": 30, "armor_penetration": 15 },
+    "ranged_damage": { "damage_type": "heat", "amount": 30, "armor_penetration": 15 },
     "range": 30,
     "dispersion": 80,
     "durability": 6,
@@ -173,7 +173,7 @@
     "ammo": "battery",
     "skill": "rifle",
     "range": 10,
-    "ranged_damage": { "damage_type": "stab", "amount": 20 },
+    "ranged_damage": { "damage_type": "heat", "amount": 10 },
     "dispersion": 150,
     "durability": 10,
     "loudness": 8,
diff --git a/data/mods/CRT_EXPANSION/items/crt_gun.json b/data/mods/CRT_EXPANSION/items/crt_gun.json
index 65f351baf1a8a..dec62707f69ee 100644
--- a/data/mods/CRT_EXPANSION/items/crt_gun.json
+++ b/data/mods/CRT_EXPANSION/items/crt_gun.json
@@ -14,7 +14,7 @@
     "color": "red",
     "skill": "pistol",
     "range": 20,
-    "ranged_damage": { "damage_type": "stab", "amount": 6, "armor_penetration": 10 },
+    "ranged_damage": { "damage_type": "heat", "amount": 6, "armor_penetration": 10 },
     "dispersion": 150,
     "durability": 9,
     "loudness": 14,
@@ -49,7 +49,7 @@
     "color": "cyan",
     "skill": "launcher",
     "range": 30,
-    "ranged_damage": { "damage_type": "stab", "amount": 9, "armor_penetration": 8 },
+    "ranged_damage": { "damage_type": "heat", "amount": 9, "armor_penetration": 8 },
     "dispersion": 45,
     "durability": 9,
     "loudness": 28,
@@ -75,7 +75,7 @@
     "color": "blue",
     "skill": "smg",
     "range": 25,
-    "ranged_damage": { "damage_type": "stab", "amount": 13, "armor_penetration": 9 },
+    "ranged_damage": { "damage_type": "heat", "amount": 13, "armor_penetration": 9 },
     "dispersion": 15,
     "durability": 8,
     "modes": [ [ "DEFAULT", "semi-auto", 1 ] ],
diff --git a/data/mods/Modular_Turrets/roboguns.json b/data/mods/Modular_Turrets/roboguns.json
index 7eb1d1e0c52a2..5dad0377169f9 100644
--- a/data/mods/Modular_Turrets/roboguns.json
+++ b/data/mods/Modular_Turrets/roboguns.json
@@ -155,8 +155,7 @@
     "name": "integral laser emitter",
     "skill": "rifle",
     "range": 30,
-    "ranged_damage": 22,
-    "pierce": 15,
+    "ranged_damage": { "damage_type": "heat", "amount": 22, "armor_penetration": 15 },
     "dispersion": 10,
     "durability": 8,
     "loudness": 12,