diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index b31346be9b..e82f536dad 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -182,7 +182,7 @@
 	src.add_fingerprint(user)
 	if (src.bullets < 1)
 		user.show_message("<span class='warning'>*click*</span>", 2)
-		playsound(user, 'sound/weapons/empty.ogg', 100, 1)
+		playsound(src, "gun_dry_fire", 50, 1)
 		return
 	playsound(user, 'sound/weapons/gunshot.ogg', 100, 1)
 	src.bullets--
diff --git a/code/game/sound.dm b/code/game/sound.dm
index 8e66fba95f..085c5eecd5 100644
--- a/code/game/sound.dm
+++ b/code/game/sound.dm
@@ -181,6 +181,8 @@
 								'sound/vore/prey/death_10.ogg')
 			if("bullet_miss")
 				soundin = pick('sound/weapons/bulletflyby.ogg', 'sound/weapons/bulletflyby2.ogg', 'sound/weapons/bulletflyby3.ogg')
+			if("gun_dry_fire")
+				soundin = pick('sound/weapons/dry_fire_1.ogg', 'sound/weapons/dry_fire_2.ogg', 'sound/weapons/dry_fire_3.ogg', 'sound/weapons/dry_fire_4.ogg')
 			if("law")
 				soundin = pick('sound/voice/bgod.ogg', 'sound/voice/biamthelaw.ogg', 'sound/voice/bsecureday.ogg', 'sound/voice/bradio.ogg', 'sound/voice/binsult.ogg', 'sound/voice/bcreep.ogg')
 			if("honkbot_e")
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 0afe3f0c96..37e868462e 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -108,7 +108,7 @@
 
 /obj/item/gun/proc/shoot_with_empty_chamber(mob/living/user as mob|obj)
 	to_chat(user, "<span class='danger'>*click*</span>")
-	playsound(user, 'sound/weapons/empty.ogg', 100, 1)
+	playsound(src, "gun_dry_fire", 50, 1)
 
 
 /obj/item/gun/proc/shoot_live_shot(mob/living/user as mob|obj, pointblank = 0, mob/pbtarget = null, message = 1)
diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm
index 99a098694a..bfc9ceac64 100644
--- a/code/modules/projectiles/guns/ballistic.dm
+++ b/code/modules/projectiles/guns/ballistic.dm
@@ -162,7 +162,7 @@
 			return(OXYLOSS)
 	else
 		user.visible_message("<span class='suicide'>[user] is pretending to blow [user.p_their()] brain[user.p_s()] out with [src]! It looks like [user.p_theyre()] trying to commit suicide!</b></span>")
-		playsound(loc, 'sound/weapons/empty.ogg', 50, 1, -1)
+		playsound(src, "gun_dry_fire", 50, 1)
 		return (OXYLOSS)
 #undef BRAINS_BLOWN_THROW_SPEED
 #undef BRAINS_BLOWN_THROW_RANGE
diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm
index 84aafcdb01..42f4fb8a05 100644
--- a/code/modules/projectiles/guns/ballistic/revolver.dm
+++ b/code/modules/projectiles/guns/ballistic/revolver.dm
@@ -229,7 +229,7 @@
 				return
 
 		user.visible_message("<span class='danger'>*click*</span>")
-		playsound(user, 'sound/weapons/empty.ogg', 100, 1)
+		playsound(src, "gun_dry_fire", 50, 1)
 
 /obj/item/gun/ballistic/revolver/russian/proc/shoot_self(mob/living/carbon/human/user, affecting = "head")
 	user.apply_damage(300, BRUTE, affecting)
diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
index aa5b137a5b..3adadb90eb 100644
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -175,7 +175,7 @@
 			return(OXYLOSS)
 	else
 		user.visible_message("<span class='suicide'>[user] is pretending to blow [user.p_their()] brains out with [src]! It looks like [user.p_theyre()] trying to commit suicide!</b></span>")
-		playsound(loc, 'sound/weapons/empty.ogg', 50, 1, -1)
+		playsound(src, "gun_dry_fire", 50, 1)
 		return (OXYLOSS)
 
 
diff --git a/sound/weapons/dry_fire_1.ogg b/sound/weapons/dry_fire_1.ogg
new file mode 100644
index 0000000000..a129f2e45e
Binary files /dev/null and b/sound/weapons/dry_fire_1.ogg differ
diff --git a/sound/weapons/dry_fire_2.ogg b/sound/weapons/dry_fire_2.ogg
new file mode 100644
index 0000000000..dec8b72180
Binary files /dev/null and b/sound/weapons/dry_fire_2.ogg differ
diff --git a/sound/weapons/dry_fire_3.ogg b/sound/weapons/dry_fire_3.ogg
new file mode 100644
index 0000000000..3ebc5f6f69
Binary files /dev/null and b/sound/weapons/dry_fire_3.ogg differ
diff --git a/sound/weapons/dry_fire_4.ogg b/sound/weapons/dry_fire_4.ogg
new file mode 100644
index 0000000000..b58ee2c7b7
Binary files /dev/null and b/sound/weapons/dry_fire_4.ogg differ