diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm
index 1277bb3d4e..517350c916 100644
--- a/code/game/objects/items/stacks/rods.dm
+++ b/code/game/objects/items/stacks/rods.dm
@@ -20,7 +20,7 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \
 	custom_materials = list(/datum/material/iron=1000)
 	max_amount = 50
 	attack_verb = list("hit", "bludgeoned", "whacked")
-	hitsound = 'sound/weapons/grenadelaunch.ogg'
+	hitsound = 'sound/items/trayhit1.ogg'
 	embedding = list()
 	novariants = TRUE
 
diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm
index 00e59d09f8..e8d53ddeb8 100644
--- a/code/modules/projectiles/guns/ballistic/automatic.dm
+++ b/code/modules/projectiles/guns/ballistic/automatic.dm
@@ -12,6 +12,7 @@
 	name = "\improper Nanotrasen Saber SMG"
 	desc = "A prototype three-round burst 9mm submachine gun, designated 'SABR'. Has a threaded barrel for suppressors."
 	icon_state = "saber"
+	fire_sound = "sound/weapons/gunshot_smg_alt.ogg"
 	mag_type = /obj/item/ammo_box/magazine/smgm9mm
 	pin = null
 
@@ -125,6 +126,7 @@
 	desc = "An outdated personal defence weapon. Uses 4.6x30mm rounds and is designated the WT-550 Semi-Automatic SMG."
 	icon_state = "wt550"
 	item_state = "arg"
+	fire_sound = "sound/weapons/gunshot_smg_alt.ogg"
 	mag_type = /obj/item/ammo_box/magazine/wt550m9
 	can_suppress = FALSE
 	burst_size = 2
@@ -138,6 +140,10 @@
 	. = ..()
 	spread = 15
 
+/obj/item/gun/ballistic/automatic/wt550/afterattack()
+	. = ..()
+	empty_alarm()
+
 /obj/item/gun/ballistic/automatic/wt550/disable_burst()
 	. = ..()
 	spread = 0
@@ -158,7 +164,7 @@
 	icon_state = "m90"
 	item_state = "m90"
 	mag_type = /obj/item/ammo_box/magazine/m556
-	fire_sound = 'sound/weapons/gunshot_smg.ogg'
+	fire_sound = 'sound/weapons/rifleshot.ogg'
 	can_suppress = FALSE
 	automatic_burst_overlay = FALSE
 	var/obj/item/gun/ballistic/revolver/grenadelauncher/underbarrel
@@ -243,7 +249,7 @@
 	item_state = "arg"
 	slot_flags = 0
 	mag_type = /obj/item/ammo_box/magazine/m556
-	fire_sound = 'sound/weapons/gunshot_smg.ogg'
+	fire_sound = 'sound/weapons/rifleshot.ogg'
 	can_suppress = FALSE
 	burst_size = 3
 	burst_shot_delay = 1
@@ -258,7 +264,7 @@
 	w_class = WEIGHT_CLASS_NORMAL
 	weapon_weight = WEAPON_MEDIUM
 	mag_type = /obj/item/ammo_box/magazine/m12g
-	fire_sound = 'sound/weapons/gunshot.ogg'
+	fire_sound = 'sound/weapons/gunshotshotgunshot.ogg'
 	automatic_burst_overlay = FALSE
 	can_suppress = FALSE
 	burst_size = 1
@@ -293,11 +299,11 @@
 	desc = "A heavily modified 1.95x129mm light machine gun, designated 'L6 SAW'. Has 'Aussec Armoury - 2531' engraved on the receiver below the designation."
 	icon_state = "l6closed100"
 	item_state = "l6closedmag"
+	fire_sound = "sound/weapons/lmgshot.ogg"
 	w_class = WEIGHT_CLASS_HUGE
 	slot_flags = 0
 	mag_type = /obj/item/ammo_box/magazine/mm195x129
 	weapon_weight = WEAPON_HEAVY
-	fire_sound = 'sound/weapons/gunshot_smg.ogg'
 	var/cover_open = FALSE
 	can_suppress = FALSE
 	burst_size = 3
@@ -363,6 +369,7 @@
 	desc = "A long ranged weapon that does significant damage. No, you can't quickscope."
 	icon_state = "sniper"
 	item_state = "sniper"
+	fire_sound = "sound/weapons/noscope.ogg"
 	recoil = 2
 	weapon_weight = WEAPON_HEAVY
 	mag_type = /obj/item/ammo_box/magazine/sniper_rounds
@@ -397,6 +404,7 @@
 	desc = "One of countless obsolete ballistic rifles that still sees use as a cheap deterrent. Uses 10mm ammo and its bulky frame prevents one-hand firing."
 	icon_state = "surplus"
 	item_state = "moistnugget"
+	fire_sound = 'sound/weapons/rifleshot.ogg'
 	weapon_weight = WEAPON_HEAVY
 	mag_type = /obj/item/ammo_box/magazine/m10mm/rifle
 	fire_delay = 30
diff --git a/code/modules/projectiles/guns/ballistic/pistol.dm b/code/modules/projectiles/guns/ballistic/pistol.dm
index 9ed9630f2f..98b654aadb 100644
--- a/code/modules/projectiles/guns/ballistic/pistol.dm
+++ b/code/modules/projectiles/guns/ballistic/pistol.dm
@@ -138,7 +138,7 @@
 	can_suppress = FALSE
 	w_class = WEIGHT_CLASS_NORMAL
 	actions_types = list()
-	fire_sound = 'sound/weapons/blastcannon.ogg'
+	fire_sound = 'sound/weapons/noscope.ogg'
 	spread = 20		//damn thing has no rifling.
 	automatic_burst_overlay = FALSE
 
diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm
index 3e564a9ace..06342937dc 100644
--- a/code/modules/projectiles/guns/ballistic/revolver.dm
+++ b/code/modules/projectiles/guns/ballistic/revolver.dm
@@ -3,6 +3,7 @@
 	desc = "A suspicious revolver. Uses .357 ammo." //usually used by syndicates
 	icon_state = "revolver"
 	mag_type = /obj/item/ammo_box/magazine/internal/cylinder
+	fire_sound = "sound/weapons/revolvershot.ogg"
 	casing_ejector = FALSE
 
 /obj/item/gun/ballistic/revolver/Initialize()
diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm
index 796e544603..8035440906 100644
--- a/code/modules/projectiles/guns/ballistic/shotgun.dm
+++ b/code/modules/projectiles/guns/ballistic/shotgun.dm
@@ -3,6 +3,7 @@
 	desc = "A traditional shotgun with wood furniture and a four-shell capacity underneath."
 	icon_state = "shotgun"
 	item_state = "shotgun"
+	fire_sound = "sound/weapons/gunshotshotgunshot.ogg"
 	w_class = WEIGHT_CLASS_BULKY
 	force = 10
 	flags_1 =  CONDUCT_1
diff --git a/modular_citadel/code/modules/projectiles/guns/ballistic/rifles.dm b/modular_citadel/code/modules/projectiles/guns/ballistic/rifles.dm
index c2bf251de9..ca76a5370b 100644
--- a/modular_citadel/code/modules/projectiles/guns/ballistic/rifles.dm
+++ b/modular_citadel/code/modules/projectiles/guns/ballistic/rifles.dm
@@ -9,7 +9,7 @@
 	item_state = "arg"
 	slot_flags = 0
 	mag_type = /obj/item/ammo_box/magazine/m556	//Uses the m90gl's magazine, just like the NT-ARG
-	fire_sound = 'sound/weapons/gunshot_smg.ogg'
+	fire_sound = 'sound/weapons/rifleshot.ogg'
 	can_suppress = 0
 	burst_size = 6	//in line with XCOMEU stats. This can fire 5 bursts from a full magazine.
 	fire_delay = 1
@@ -148,7 +148,7 @@
 	slot_flags = 0
 	pin = /obj/item/firing_pin/implant/pindicate
 	mag_type = /obj/item/ammo_box/magazine/flechette
-	fire_sound = 'sound/weapons/gunshot_smg.ogg'
+	fire_sound = 'sound/weapons/rifleshot.ogg'
 	can_suppress = 0
 	burst_size = 5
 	fire_delay = 1
diff --git a/sound/weapons/LaserSlugv3.ogg b/sound/weapons/LaserSlugv3.ogg
index 0c3de3d4fd..759774c5c9 100644
Binary files a/sound/weapons/LaserSlugv3.ogg and b/sound/weapons/LaserSlugv3.ogg differ
diff --git a/sound/weapons/ParticleBlaster.ogg b/sound/weapons/ParticleBlaster.ogg
index ae0ae165f9..c52282aaab 100644
Binary files a/sound/weapons/ParticleBlaster.ogg and b/sound/weapons/ParticleBlaster.ogg differ
diff --git a/sound/weapons/beam_sniper.ogg b/sound/weapons/beam_sniper.ogg
index 0bd7b89c8d..257df1c545 100644
Binary files a/sound/weapons/beam_sniper.ogg and b/sound/weapons/beam_sniper.ogg differ
diff --git a/sound/weapons/grenadelaunch.ogg b/sound/weapons/grenadelaunch.ogg
index 4662058f28..6a9020f737 100644
Binary files a/sound/weapons/grenadelaunch.ogg and b/sound/weapons/grenadelaunch.ogg differ
diff --git a/sound/weapons/gunshot_smg_alt.ogg b/sound/weapons/gunshot_smg_alt.ogg
new file mode 100644
index 0000000000..373c1ea4ba
Binary files /dev/null and b/sound/weapons/gunshot_smg_alt.ogg differ
diff --git a/sound/weapons/gunshotshotgunshot.ogg b/sound/weapons/gunshotshotgunshot.ogg
new file mode 100644
index 0000000000..7c513184ec
Binary files /dev/null and b/sound/weapons/gunshotshotgunshot.ogg differ
diff --git a/sound/weapons/lmgshot.ogg b/sound/weapons/lmgshot.ogg
new file mode 100644
index 0000000000..a895e59aa2
Binary files /dev/null and b/sound/weapons/lmgshot.ogg differ
diff --git a/sound/weapons/magpistol.ogg b/sound/weapons/magpistol.ogg
index 4b94aa1e0a..96eb22c77d 100644
Binary files a/sound/weapons/magpistol.ogg and b/sound/weapons/magpistol.ogg differ
diff --git a/sound/weapons/magrifle.ogg b/sound/weapons/magrifle.ogg
index 67d6500a6c..1c10ea6b0e 100644
Binary files a/sound/weapons/magrifle.ogg and b/sound/weapons/magrifle.ogg differ
diff --git a/sound/weapons/noscope.ogg b/sound/weapons/noscope.ogg
new file mode 100644
index 0000000000..84c607fe03
Binary files /dev/null and b/sound/weapons/noscope.ogg differ
diff --git a/sound/weapons/plasma_cutter.ogg b/sound/weapons/plasma_cutter.ogg
index ba95317cc1..d555110afa 100644
Binary files a/sound/weapons/plasma_cutter.ogg and b/sound/weapons/plasma_cutter.ogg differ
diff --git a/sound/weapons/revolvershot.ogg b/sound/weapons/revolvershot.ogg
new file mode 100644
index 0000000000..ac6caaf247
Binary files /dev/null and b/sound/weapons/revolvershot.ogg differ
diff --git a/sound/weapons/rifleshot.ogg b/sound/weapons/rifleshot.ogg
new file mode 100644
index 0000000000..3bc70a7914
Binary files /dev/null and b/sound/weapons/rifleshot.ogg differ
diff --git a/sound/weapons/rocketlaunch.ogg b/sound/weapons/rocketlaunch.ogg
index 6972eda044..42a99c7518 100644
Binary files a/sound/weapons/rocketlaunch.ogg and b/sound/weapons/rocketlaunch.ogg differ