diff --git a/data/hai/hai outfits.txt b/data/hai/hai outfits.txt
index b5fc93ae3438..f3b80b1c395b 100644
--- a/data/hai/hai outfits.txt	
+++ b/data/hai/hai outfits.txt	
@@ -53,13 +53,14 @@ outfit "Pulse Cannon"
 		sound "pulse"
 		"hit effect" "pulse impact"
 		"inaccuracy" 1
-		"velocity" 15
-		"lifetime" 30
+		"velocity" 19
+		"lifetime" 24
 		"reload" 20
 		"firing energy" 24
 		"firing heat" 70
 		"shield damage" 45
 		"hull damage" 34
+		"hit force" 1
 	description "Like most examples of Hai engineering that you have seen, the Pulse Cannon does not stand out as a particularly advanced or elegant technology, but it has a reputation for being efficient, reliable, and well-balanced."
 
 outfit "Pulse Turret"
@@ -76,17 +77,30 @@ outfit "Pulse Turret"
 		"hardpoint sprite" "hardpoint/pulse turret"
 		"hardpoint offset" 7.
 		sound "pulse"
-		"hit effect" "pulse impact"
+		"submunition" "Pulse Submunition"
+			"offset" 1 0
+		"submunition" "Pulse Submunition"
+			"offset" -1 0
+		"hit effect" "pulse impact" 2
 		"inaccuracy" 1
 		"turret turn" 2.6
-		"velocity" 15
-		"lifetime" 30
-		"reload" 10
-		"firing energy" 24
-		"firing heat" 70
+		"velocity override" 19
+		"range override" 456
+		"lifetime" 0
+		"reload" 20
+		"firing energy" 28
+		"firing heat" 140
+	description "Pulse Cannons are the primary offensive weapon used by Hai ships. This turret mounts two Pulse Cannons side by side and allows them to track even the fastest-moving of targets."
+
+outfit "Pulse Submunition"
+	weapon
+		sprite "projectile/pulse"
+		"hit effect" "pulse impact"
+		"velocity" 19
+		"lifetime" 24
 		"shield damage" 45
 		"hull damage" 34
-	description "Pulse Cannons are the primary offensive weapon used by Hai ships. This turret mounts two Pulse Cannons side by side and allows them to track even the fastest-moving of targets."
+		"hit force" 1
 
 outfit "Tripulse Shredder"
 	category "Guns"
@@ -99,18 +113,22 @@ outfit "Tripulse Shredder"
 	weapon
 		sprite "projectile/pulse"
 		sound "pulse"
-		"hit effect" "pulse impact"
+		"submunition" "Pulse Submunition"
+		"submunition" "Pulse Submunition"
+			"offset" 1.33 0
+		"submunition" "Pulse Submunition"
+			"offset" -1.33 0
+		"hit effect" "pulse impact" 3
 		"inaccuracy" 5
-		"velocity" 15
-		"lifetime" 30
-		"reload" 6
-		"burst count" 36
+		"velocity override" 19
+		"range override" 456
+		"lifetime" 0
+		"reload" 18
+		"burst count" 12
 		"burst reload" 4
 		"cluster"
-		"firing energy" 25
-		"firing heat" 60
-		"shield damage" 45
-		"hull damage" 34
+		"firing energy" 75
+		"firing heat" 180
 	description "An early stage in the development of better and faster weaponry to rival that of the Wanderers, the Tripulse Shredder consists of three Pulse Cannons in a single housing. Advancements in cooling capabilities have reduced the heat generated by each shot at the cost of drawing slightly more power. Additionally, the single shared housing results in a less consistent firing pattern, limiting it to bursts. These factors have made the Tripulse Shredder a popular hit-and-run weapon among the Unfettered."
 
 effect "pulse impact"
@@ -138,8 +156,8 @@ outfit "Ion Cannon"
 		sound "ion"
 		"hit effect" "ion impact" 2
 		"inaccuracy" 1
-		"velocity" 16
-		"lifetime" 50
+		"velocity" 19
+		"lifetime" 42
 		"reload" 60
 		"firing energy" 120
 		"firing force" 15
@@ -177,8 +195,8 @@ outfit "Ionic Blaster Prototype"
 		sound "ionic blast"
 		"hit effect" "ion impact"
 		"inaccuracy" 4
-		"velocity" 18
-		"lifetime" 30
+		"velocity" 21
+		"lifetime" 26
 		"reload" 30
 		"firing energy" 72
 		"firing force" 18
@@ -209,8 +227,8 @@ outfit "Ionic Turret Prototype"
 		"hit effect" "ionic impact" 5
 		"inaccuracy" 2
 		"turret turn" 1.4
-		"velocity" 12
-		"lifetime" 70
+		"velocity" 16
+		"lifetime" 53
 		"reload" 70
 		"firing energy" 371
 		"firing force" 12
diff --git a/data/human/weapons.txt b/data/human/weapons.txt
index 9d6d5721f97d..0eb1029ce52c 100644
--- a/data/human/weapons.txt
+++ b/data/human/weapons.txt
@@ -24,49 +24,49 @@ outfit "Energy Blaster"
 		sound "blaster"
 		"hit effect" "blaster impact"
 		"inaccuracy" 3
-		"velocity" 10.625
-		"lifetime" 48
-		"reload" 12
-		"firing energy" 5.8
-		"firing heat" 18
-		"shield damage" 10.6
-		"hull damage" 6.6
+		"velocity" 16
+		"lifetime" 32
+		"reload" 24
+		"firing energy" 11.6
+		"firing heat" 36
+		"shield damage" 21.2
+		"hull damage" 13.2
+		"hit force" 1
 	description "Although not the most accurate or damaging of weapons, the Energy Blaster is popular because it is small enough to be installed on even the tiniest of ships. One blaster is not enough to do appreciable damage to anything larger than a fighter, but a ship equipped with several of them becomes a force to be reckoned with."
 
 outfit "Twin Blaster"
 	category "Guns"
 	cost 40000
 	thumbnail "outfit/twin blaster"
-	"mass" 12
-	"outfit space" -12
-	"weapon capacity" -12
+	"mass" 11
+	"outfit space" -11
+	"weapon capacity" -11
 	"gun ports" -1
 	weapon
 		sound "blaster"
 		"submunition" "Blaster Submunition"
-			"offset" 1 0
-			"facing" 0.3
+			"offset" 0.5 0
 		"submunition" "Blaster Submunition"
-			"offset" -1 0
-			"facing" -0.3
+			"offset" -0.5 0
 		"hit effect" "blaster impact" 2
 		"inaccuracy" 3
-		"lifetime" 1
-		"velocity override" 10.625
-		"range override" 510
-		"reload" 12
-		"firing energy" 11.6
-		"firing heat" 36
+		"lifetime" 0
+		"velocity override" 16
+		"range override" 512
+		"reload" 24
+		"firing energy" 23.2
+		"firing heat" 72
 	description "The Energy Blaster's ubiquity, low price, and stable performance have made it irresistible to tinkerers from the day it was first introduced. These blasters have been bolted together to fit within a single gun port, offering twice the damage of a single blaster at the cost of twice the heat and power consumption, along with some additional mass."
 
 outfit "Blaster Submunition"
 	weapon
 		sprite "projectile/blaster"
 		"hit effect" "blaster impact"
-		"velocity" 10.625
-		"lifetime" 48
-		"shield damage" 10.6
-		"hull damage" 6.6
+		"velocity" 16
+		"lifetime" 32
+		"shield damage" 21.2
+		"hull damage" 13.2
+		"hit force" 1
 
 outfit "Blaster Turret"
 	category "Turrets"
@@ -82,16 +82,19 @@ outfit "Blaster Turret"
 		"hardpoint sprite" "hardpoint/blaster turret"
 		"hardpoint offset" 9.
 		sound "blaster"
-		"hit effect" "blaster impact"
+		"submunition" "Blaster Submunition"
+			"offset" 0.5 0
+		"submunition" "Blaster Submunition"
+			"offset" -0.5 0
+		"hit effect" "blaster impact" 2
 		"inaccuracy" 3
-		"turret turn" 3.6
-		"velocity" 10.625
-		"lifetime" 48
-		"reload" 6
-		"firing energy" 5.8
-		"firing heat" 18
-		"shield damage" 10.6
-		"hull damage" 6.6
+		"turret turn" 2
+		"lifetime" 0
+		"velocity override" 16
+		"range override" 512
+		"reload" 24
+		"firing energy" 23.2
+		"firing heat" 72
 	description "A Blaster Turret is a pair of Energy Blasters mounted on a rotating platform, allowing it to fire in any direction. Sophisticated software algorithms allow the turret to correct for a target's motion, making the Blaster Turret effective even against small, quickly moving fighters. Because it needs a special mounting point with a 360 degree field of view, not all ships are capable of being equipped with a turret."
 
 outfit "Quad Blaster Turret"
@@ -110,14 +113,23 @@ outfit "Quad Blaster Turret"
 		sound "blaster"
 		"hit effect" "blaster impact"
 		"inaccuracy" 3
-		"turret turn" 2.6
-		"velocity" 10.625
-		"lifetime" 48
-		"reload" 3
-		"firing energy" 5.8
-		"firing heat" 18
-		"shield damage" 10.6
-		"hull damage" 6.6
+		"submunition" "Blaster Submunition"
+			"offset" 2 0
+		"submunition" "Blaster Submunition"
+			"offset" 1 0
+		"submunition" "Blaster Submunition"
+			"offset" -1 0
+		"submunition" "Blaster Submunition"
+			"offset" -2 0
+		"hit effect" "blaster impact" 4
+		"inaccuracy" 3
+		"turret turn" 1.5
+		"lifetime" 0
+		"velocity override" 16
+		"range override" 512
+		"reload" 24
+		"firing energy" 46.4
+		"firing heat" 144
 	description "A Quad Blaster Turret carries four guns on a single turret mount, doubling the firepower of an ordinary Blaster Turret for ships with enough space to install one and energy to drive it."
 
 effect "blaster impact"
@@ -142,49 +154,49 @@ outfit "Modified Blaster"
 		sound "mod blaster"
 		"hit effect" "blaster impact"
 		"inaccuracy" 4
-		"velocity" 10
-		"lifetime" 48
-		"reload" 12
-		"firing energy" 6.5
-		"firing heat" 25.2
-		"shield damage" 13.2
-		"hull damage" 8.8
+		"velocity" 15
+		"lifetime" 32
+		"reload" 24
+		"firing energy" 13
+		"firing heat" 50.4
+		"shield damage" 30.8
+		"hull damage" 13.2
+		"hit force" 1
 	description "This is an Energy Blaster that has been tampered with to increase its power slightly, at the cost of reduced range and higher energy consumption. Modified Blasters also produce an extreme amount of heat when firing, increasing the risk that your ship will overheat."
 
 outfit "Twin Modified Blaster"
 	category "Guns"
 	cost 84000
 	thumbnail "outfit/twin mod blaster"
-	"mass" 14
-	"outfit space" -14
-	"weapon capacity" -14
+	"mass" 13
+	"outfit space" -13
+	"weapon capacity" -13
 	"gun ports" -1
 	weapon
 		sound "mod blaster"
 		"submunition" "Modified Blaster Submunition"
-			"offset" 1 0
-			"facing" 0.45
+			"offset" 0.5 0
 		"submunition" "Modified Blaster Submunition"
-			"offset" -1 0
-			"facing" -0.45
+			"offset" -0.5 0
 		"hit effect" "blaster impact" 2
 		"inaccuracy" 4
 		"lifetime" 0
-		"velocity override" 10
+		"velocity override" 15
 		"range override" 480
-		"reload" 12
-		"firing energy" 13
-		"firing heat" 50.4
+		"reload" 24
+		"firing energy" 26
+		"firing heat" 100.8
 	description "An enterprising engineer, presumably having decided that the Modified Blaster's already-frightening lack of safety control was insufficient, has taken two of the weapons and shoved them together in the same gun port, crudely welded together with fervid enthusiasm. Whether or not this weapon will destroy the target before it melts its own components is anyone's guess; perhaps the intent was that the twin barrels would intimidate enemies into submission before the weapon would have to be fired."
 
 outfit "Modified Blaster Submunition"
 	weapon
 		sprite "projectile/mod blaster"
 		"hit effect" "blaster impact"
-		"velocity" 10
-		"lifetime" 48
-		"shield damage" 13.2
-		"hull damage" 8.8
+		"velocity" 15
+		"lifetime" 32
+		"shield damage" 30.8
+		"hull damage" 13.2
+		"hit force" 1
 
 outfit "Modified Blaster Turret"
 	category "Turrets"
@@ -200,16 +212,19 @@ outfit "Modified Blaster Turret"
 		"hardpoint sprite" "hardpoint/mod blaster turret"
 		"hardpoint offset" 9.
 		sound "mod blaster"
-		"hit effect" "blaster impact"
+		"submunition" "Modified Blaster Submunition"
+			"offset" 1.5 0
+		"submunition" "Modified Blaster Submunition"
+			"offset" -1.5 0
+		"hit effect" "blaster impact" 2
 		"inaccuracy" 4
-		"turret turn" 3.6
-		"velocity" 10
-		"lifetime" 48
-		"reload" 6
-		"firing energy" 6.5
-		"firing heat" 25.2
-		"shield damage" 13.2
-		"hull damage" 8.8
+		"turret turn" 2
+		"lifetime" 0
+		"velocity override" 15
+		"range override" 480
+		"reload" 24
+		"firing energy" 26
+		"firing heat" 100.8
 	description "This is a turreted version of the Modified Blaster, which is an Energy Blaster modified for greater power at the cost of higher energy consumption and heat. These turrets are popular with pirates and others who are trying to cram as much firepower into their ships as possible."
 
 
@@ -657,8 +672,8 @@ outfit "Plasma Cannon"
 		sound "plasma"
 		"hit effect" "plasma explosion"
 		"inaccuracy" 2
-		"velocity" 12
-		"lifetime" 40
+		"velocity" 17
+		"lifetime" 28
 		"reload" 18
 		"firing energy" 30
 		"firing heat" 180
@@ -683,19 +698,31 @@ outfit "Plasma Turret"
 		"hardpoint sprite" "hardpoint/plasma turret"
 		"hardpoint offset" 15.
 		sound "plasma"
-		"hit effect" "plasma explosion"
+		"hit effect" "plasma explosion" 2
 		"inaccuracy" 2
 		"turret turn" 1.6
-		"velocity" 12
-		"lifetime" 40
-		"reload" 9
-		"firing energy" 30
-		"firing heat" 180
+		"submunition" "Plasma Submunition"
+			"offset" 1.5 0
+		"submunition" "Plasma Submunition"
+			"offset" -1.5 0
+		"velocity override" 17
+		"range override" 476
+		"lifetime" 0
+		"reload" 18
+		"firing energy" 60
+		"firing heat" 360
+	description "The Plasma Turret is a pair of Plasma Cannons mounted on a turret so that they can fire in any direction. It is a fearsome weapon, but only the largest of ships have the space and the energy that it requires."
+
+outfit "Plasma Submunition"
+	weapon
+		sprite "projectile/plasma"
+		"hit effect" "plasma explosion"
+		"velocity" 17
+		"lifetime" 28
 		"hit force" 45
 		"shield damage" 63
 		"hull damage" 25
 		"heat damage" 340
-	description "The Plasma Turret is a pair of Plasma Cannons mounted on a turret so that they can fire in any direction. It is a fearsome weapon, but only the largest of ships have the space and the energy that it requires."
 
 outfit "Plasma Repeater"
 	category "Guns"
@@ -710,8 +737,8 @@ outfit "Plasma Repeater"
 			"frame rate" 3
 		sound "plasma"
 		"hit effect" "plasma explosion"
-		"lifetime" 38
-		"velocity" 12
+		"lifetime" 27
+		"velocity" 17
 		"inaccuracy" 5
 		"reload" 7
 		"firing energy" 13
@@ -1527,7 +1554,7 @@ outfit "Gatling Gun"
 		ammo "Gatling Gun Ammo"
 		icon "icon/gat"
 		"inaccuracy" 2
-		"velocity" 16
+		"velocity" 20
 		"lifetime" 1
 		"reload" 3
 		"burst count" 180
@@ -1564,7 +1591,7 @@ outfit "Gatling Turret"
 		icon "icon/gat turret"
 		"inaccuracy" 2
 		"turret turn" 3.6
-		"velocity" 16
+		"velocity" 20
 		"lifetime" 1
 		"reload" 3
 		"burst count" 180