diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm index 870ad82c8e..fa742733a2 100644 --- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm +++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm @@ -108,7 +108,7 @@ icon_state = "syndicateranged" icon_living = "syndicateranged" casingtype = /obj/item/ammo_casing/a12mm - projectilesound = 'sound/weapons/Gunshot_smg.ogg' + projectilesound = 'sound/weapons/Gunshot_light.ogg' projectiletype = /obj/item/projectile/bullet/pistol/medium weapon1 = /obj/item/weapon/gun/projectile/automatic/c20r diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index 2ad17537c2..106f8a0ea4 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -38,7 +38,7 @@ caliber = "12mm" origin_tech = "combat=5;materials=2;syndicate=8" slot_flags = SLOT_BELT|SLOT_BACK - fire_sound = 'sound/weapons/Gunshot_smg.ogg' + fire_sound = 'sound/weapons/Gunshot_light.ogg' load_method = MAGAZINE magazine_type = /obj/item/ammo_magazine/a12mm auto_eject = 1 @@ -86,7 +86,7 @@ origin_tech = "combat=5;materials=2" slot_flags = SLOT_BELT ammo_type = "/obj/item/ammo_casing/c9mmr" - fire_sound = 'sound/weapons/Gunshot_smg.ogg' + fire_sound = 'sound/weapons/Gunshot_light.ogg' load_method = MAGAZINE magazine_type = /obj/item/ammo_magazine/mc9mmt/rubber @@ -182,7 +182,7 @@ origin_tech = "combat=6;materials=1;syndicate=2" slot_flags = SLOT_BACK ammo_type = "/obj/item/ammo_casing/a762" - fire_sound = 'sound/weapons/Gunshot_smg.ogg' + fire_sound = 'sound/weapons/Gunshot_light.ogg' load_method = MAGAZINE magazine_type = /obj/item/ammo_magazine/a762 diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm index 2c116901ec..d054f4eff8 100644 --- a/code/modules/projectiles/guns/projectile/pistol.dm +++ b/code/modules/projectiles/guns/projectile/pistol.dm @@ -5,6 +5,7 @@ icon_state = "colt" caliber = ".45" origin_tech = "combat=2;materials=2" + fire_sound = 'sound/weapons/Gunshot_light.ogg' load_method = MAGAZINE /obj/item/weapon/gun/projectile/colt/detective @@ -36,6 +37,7 @@ magazine_type = /obj/item/ammo_magazine/c45m/rubber caliber = ".45" origin_tech = "combat=2;materials=2" + fire_sound = 'sound/weapons/Gunshot_light.ogg' load_method = MAGAZINE /obj/item/weapon/gun/projectile/sec/flash @@ -112,6 +114,7 @@ caliber = "9mm" silenced = 0 origin_tech = "combat=2;materials=2;syndicate=2" + fire_sound = 'sound/weapons/Gunshot_light.ogg' load_method = MAGAZINE magazine_type = /obj/item/ammo_magazine/mc9mm diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index cb17710773..1f83533ce8 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -22,6 +22,7 @@ max_shells = 6 caliber = "38" origin_tech = "combat=2;materials=2" + fire_sound = 'sound/weapons/Gunshot_light.ogg' ammo_type = /obj/item/ammo_casing/c38 /obj/item/weapon/gun/projectile/revolver/detective/verb/rename_gun() diff --git a/sound/weapons/Gunshot_smg.ogg b/sound/weapons/Gunshot_light.ogg similarity index 100% rename from sound/weapons/Gunshot_smg.ogg rename to sound/weapons/Gunshot_light.ogg diff --git a/sound/weapons/gunshot_smg2.ogg b/sound/weapons/gunshot_smg2.ogg deleted file mode 100644 index faba955f52..0000000000 Binary files a/sound/weapons/gunshot_smg2.ogg and /dev/null differ