diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm index f159ad8f08e..37ce08544f6 100644 --- a/code/modules/projectiles/guns/projectile/pistol.dm +++ b/code/modules/projectiles/guns/projectile/pistol.dm @@ -45,7 +45,7 @@ allowed_magazines = list(/obj/item/ammo_magazine/c45m) caliber = ".45" origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2) - fire_sound = 'sound/weapons/Gunshot_light.ogg' + fire_sound = 'sound/weapons/gunshot_pistol.ogg' load_method = MAGAZINE /obj/item/weapon/gun/projectile/sec/update_icon() @@ -187,7 +187,7 @@ caliber = "9mm" silenced = 0 origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2, TECH_ILLEGAL = 2) - fire_sound = 'sound/weapons/Gunshot_light.ogg' + fire_sound = 'sound/weapons/gunshot_pistol.ogg' load_method = MAGAZINE magazine_type = /obj/item/ammo_magazine/mc9mm allowed_magazines = list(/obj/item/ammo_magazine/mc9mm) diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index ad7a7fc8065..bb5059c7fbc 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -50,7 +50,7 @@ max_shells = 6 caliber = "38" origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2) - fire_sound = 'sound/weapons/Gunshot_light.ogg' + fire_sound = 'sound/weapons/gunshot_strong.ogg' ammo_type = /obj/item/ammo_casing/c38 /obj/item/weapon/gun/projectile/revolver/detective/verb/rename_gun() @@ -79,7 +79,7 @@ icon_state = "deckard-empty" caliber = "38" ammo_type = /obj/item/ammo_casing/c38 - fire_sound = 'sound/weapons/Gunshot_light.ogg' + fire_sound = 'sound/weapons/gunshot_strong.ogg' /obj/item/weapon/gun/projectile/revolver/deckard/update_icon() ..() @@ -138,7 +138,7 @@ handle_casings = CYCLE_CASINGS max_shells = 6 caliber = "38" - fire_sound = 'sound/weapons/Gunshot_light.ogg' + fire_sound = 'sound/weapons/gunshot_strong.ogg' ammo_type = /obj/item/ammo_casing/c38 var/secondary_max_shells = 1 var/secondary_caliber = "shotgun" diff --git a/code/modules/projectiles/guns/projectile/rifle.dm b/code/modules/projectiles/guns/projectile/rifle.dm index 27596574c22..c078b87d37f 100644 --- a/code/modules/projectiles/guns/projectile/rifle.dm +++ b/code/modules/projectiles/guns/projectile/rifle.dm @@ -60,7 +60,7 @@ ammo_type = /obj/item/ammo_casing/a556 slot_flags = SLOT_BELT|SLOT_HOLSTER load_method = SINGLE_CASING - fire_sound = 'sound/weapons/rifleshot.ogg' + fire_sound = 'sound/weapons/gunshot3.ogg' var/retracted_bolt = 0 var/icon_retracted = "pockrifle-empty" diff --git a/html/changelogs/MattAtlas-firearmsounds.yml b/html/changelogs/MattAtlas-firearmsounds.yml new file mode 100644 index 00000000000..5701cdceda1 --- /dev/null +++ b/html/changelogs/MattAtlas-firearmsounds.yml @@ -0,0 +1,4 @@ +author: MattAtlas +delete-after: True +changes: + - soundadd: "Added new firearm sounds. Enjoy." diff --git a/sound/weapons/gunshot3.ogg b/sound/weapons/gunshot3.ogg new file mode 100644 index 00000000000..49c2b0c5548 Binary files /dev/null and b/sound/weapons/gunshot3.ogg differ diff --git a/sound/weapons/gunshot_pistol.ogg b/sound/weapons/gunshot_pistol.ogg new file mode 100644 index 00000000000..c9d63229921 Binary files /dev/null and b/sound/weapons/gunshot_pistol.ogg differ diff --git a/sound/weapons/gunshot_strong.ogg b/sound/weapons/gunshot_strong.ogg new file mode 100644 index 00000000000..6794bfa08ec Binary files /dev/null and b/sound/weapons/gunshot_strong.ogg differ