diff --git a/code/game/gamemodes/technomancer/spells/audible_deception.dm b/code/game/gamemodes/technomancer/spells/audible_deception.dm
index 43dfdf978af..9e82c46ad80 100644
--- a/code/game/gamemodes/technomancer/spells/audible_deception.dm
+++ b/code/game/gamemodes/technomancer/spells/audible_deception.dm
@@ -34,10 +34,10 @@
 		"Gun Firing"			=	'sound/weapons/gunshot.ogg',
 		"Desert Eagle Firing"	=	'sound/weapons/deagle.ogg',
 		"Rifle Firing"			=	'sound/weapons/rifleshot.ogg',
-		"Rifle Firing 2"		=	'sound/weapons/svd_shot.ogg',
-		"Sniper Firing"			=	'sound/weapons/sniper.ogg',
+		"Sniper Rifle Firing"	=	'sound/weapons/svd_shot.ogg',
+		"AT Rifle Firing"		=	'sound/weapons/sniper.ogg',
 		"Shotgun Firing"		=	'sound/weapons/shotgun.ogg',
-		"Semi-automatic Firing"	=	'sound/weapons/semiauto.ogg',
+		"Handgun Firing"		=	'sound/weapons/gunshot3.ogg',
 		"Machinegun Firing"		=	'sound/weapons/machinegun.ogg',
 		"Rocket Launcher Firing"=	'sound/weapons/rpg.ogg',
 		"Taser Firing"			=	'sound/weapons/Taser.ogg',
@@ -45,7 +45,7 @@
 		"E-Luger Firing"		=	'sound/weapons/eLuger.ogg',
 		"Xray Gun Firing"		=	'sound/weapons/laser3.ogg',
 		"Pulse Gun Firing"		=	'sound/weapons/pulse.ogg',
-		"Gauss Gun Firing"		=	'sound/weapons/gauss_shoot.ogg',
+		"Energy Sniper Firing"	=	'sound/weapons/gauss_shoot.ogg',
 		"Emitter Firing"		=	'sound/weapons/emitter.ogg',
 		"Energy Blade On"		=	'sound/weapons/saberon.ogg',
 		"Energy Blade Off"		=	'sound/weapons/saberoff.ogg',
diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm
index 504350a198a..e545ebb8485 100644
--- a/code/modules/projectiles/guns/projectile/pistol.dm
+++ b/code/modules/projectiles/guns/projectile/pistol.dm
@@ -7,7 +7,7 @@
 	icon_state = "colt"
 	caliber = ".45"
 	origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
-	fire_sound = 'sound/weapons/semiauto.ogg'
+	fire_sound = 'sound/weapons/gunshot3.ogg'
 	load_method = MAGAZINE
 
 /obj/item/weapon/gun/projectile/colt/update_icon()
@@ -74,7 +74,7 @@
 	magazine_type = /obj/item/ammo_magazine/m45/rubber
 	caliber = ".45"
 	origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
-	fire_sound = 'sound/weapons/semiauto.ogg'
+	fire_sound = 'sound/weapons/gunshot3.ogg'
 	load_method = MAGAZINE
 
 /obj/item/weapon/gun/projectile/sec/update_icon()
@@ -194,7 +194,7 @@
 	caliber = "9mm"
 	silenced = 0
 	origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2, TECH_ILLEGAL = 2)
-	fire_sound = 'sound/weapons/semiauto.ogg'
+	fire_sound = 'sound/weapons/gunshot3.ogg'
 	load_method = MAGAZINE
 	magazine_type = /obj/item/ammo_magazine/m9mm
 	allowed_magazines = list(/obj/item/ammo_magazine/m9mm)
@@ -298,7 +298,7 @@
 	origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 2)
 	caliber = "9mm"
 	load_method = MAGAZINE
-	fire_sound = 'sound/weapons/semiauto.ogg'
+	fire_sound = 'sound/weapons/gunshot3.ogg'
 	magazine_type = /obj/item/ammo_magazine/m9mm
 	allowed_magazines = list(/obj/item/ammo_magazine/m9mm)
 
diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm
index 75697bccb29..81355d10314 100644
--- a/code/modules/projectiles/guns/projectile/revolver.dm
+++ b/code/modules/projectiles/guns/projectile/revolver.dm
@@ -45,7 +45,7 @@
 	icon_state = "detective"
 	caliber = ".38"
 	origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
-	fire_sound = 'sound/weapons/semiauto.ogg'
+	fire_sound = 'sound/weapons/gunshot3.ogg'
 	ammo_type = /obj/item/ammo_casing/a38
 
 /obj/item/weapon/gun/projectile/revolver/detective/verb/rename_gun()
@@ -73,7 +73,7 @@
 	icon_state = "deckard-empty"
 	caliber = ".38"
 	origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
-	fire_sound = 'sound/weapons/semiauto.ogg'
+	fire_sound = 'sound/weapons/gunshot3.ogg'
 	ammo_type = /obj/item/ammo_casing/a38
 
 /obj/item/weapon/gun/projectile/revolver/deckard/emp
@@ -124,7 +124,7 @@
 	origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
 	handle_casings = CYCLE_CASINGS
 	max_shells = 9
-	fire_sound = 'sound/weapons/semiauto.ogg'
+	fire_sound = 'sound/weapons/gunshot3.ogg'
 	caliber = ".38"
 	ammo_type = /obj/item/ammo_casing/a38
 	var/secondary_max_shells = 1
diff --git a/sound/weapons/Gunshot.ogg b/sound/weapons/Gunshot.ogg
index eee7d686489..4fd082ce7f2 100644
Binary files a/sound/weapons/Gunshot.ogg and b/sound/weapons/Gunshot.ogg differ
diff --git a/sound/weapons/Gunshot_heavy.ogg b/sound/weapons/Gunshot_heavy.ogg
new file mode 100644
index 00000000000..eee7d686489
Binary files /dev/null and b/sound/weapons/Gunshot_heavy.ogg differ
diff --git a/sound/weapons/Laser.ogg b/sound/weapons/Laser.ogg
index 4e566c1cf59..0fbb611f9cd 100644
Binary files a/sound/weapons/Laser.ogg and b/sound/weapons/Laser.ogg differ
diff --git a/sound/weapons/gunshot2.ogg b/sound/weapons/gunshot2.ogg
new file mode 100644
index 00000000000..2dfc6fc1e92
Binary files /dev/null and b/sound/weapons/gunshot2.ogg differ
diff --git a/sound/weapons/gunshot3.ogg b/sound/weapons/gunshot3.ogg
new file mode 100644
index 00000000000..97799dff108
Binary files /dev/null and b/sound/weapons/gunshot3.ogg differ
diff --git a/sound/weapons/gunshot4.ogg b/sound/weapons/gunshot4.ogg
new file mode 100644
index 00000000000..2d971f7b1a5
Binary files /dev/null and b/sound/weapons/gunshot4.ogg differ
diff --git a/sound/weapons/semiauto.ogg b/sound/weapons/gunshot_pathetic.ogg
similarity index 100%
rename from sound/weapons/semiauto.ogg
rename to sound/weapons/gunshot_pathetic.ogg