diff --git a/Content.Server/_White/WeaponModules/WeaponModulesSystem.cs b/Content.Server/_White/WeaponModules/WeaponModulesSystem.cs index dc2739b7fe..159777e58f 100644 --- a/Content.Server/_White/WeaponModules/WeaponModulesSystem.cs +++ b/Content.Server/_White/WeaponModules/WeaponModulesSystem.cs @@ -2,7 +2,6 @@ using Content.Shared.Weapons.Ranged.Components; using Content.Shared.Weapons.Ranged.Systems; using Robust.Server.GameObjects; -using Robust.Shared.Audio; using Robust.Shared.Containers; namespace Content.Server._White.WeaponModules; @@ -112,7 +111,7 @@ public sealed class WeaponModulesSystem : EntitySystem _appearanceSystem.SetData(weapon, ModuleVisualState.Module, "silencer", appearanceComponent); weaponModulesComponent.UseEffect = true; - _gunSystem.setSound(weapon, new SoundPathSpecifier("/Audio/White/Weapons/Modules/silence.ogg")); + _gunSystem.setSound(weapon, component.NewSoundGunshot); Dirty(module, weaponModulesComponent); } diff --git a/Content.Shared/_White/WeaponModules/SilencerModuleComponent.cs b/Content.Shared/_White/WeaponModules/SilencerModuleComponent.cs index d16d3104e7..074a21ae77 100644 --- a/Content.Shared/_White/WeaponModules/SilencerModuleComponent.cs +++ b/Content.Shared/_White/WeaponModules/SilencerModuleComponent.cs @@ -10,4 +10,7 @@ public sealed partial class SilencerModuleComponent : BaseModuleComponent { [ViewVariables(VVAccess.ReadWrite), DataField] public SoundSpecifier? OldSoundGunshot; + + [ViewVariables(VVAccess.ReadWrite), DataField] + public SoundSpecifier NewSoundGunshot = new SoundPathSpecifier("/Audio/White/Weapons/Modules/silence.ogg"); } diff --git a/Resources/Audio/White/Gun/Modules/ejectmodule.ogg b/Resources/Audio/White/Gun/Modules/ejectmodule.ogg new file mode 100644 index 0000000000..77ef768ab7 Binary files /dev/null and b/Resources/Audio/White/Gun/Modules/ejectmodule.ogg differ diff --git a/Resources/Audio/White/Gun/Modules/insertmodule.ogg b/Resources/Audio/White/Gun/Modules/insertmodule.ogg new file mode 100644 index 0000000000..c7e1884c80 Binary files /dev/null and b/Resources/Audio/White/Gun/Modules/insertmodule.ogg differ diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index d6b388b86e..b1847572a8 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -46,6 +46,8 @@ - CartridgeLightRifle gun_modules: name: Modules + insertSound: /Audio/White/Gun/Modules/insertmodule.ogg + ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg priority: 2 whitelist: tags: @@ -101,6 +103,8 @@ - CartridgeLightRifle gun_modules: name: Modules + insertSound: /Audio/White/Gun/Modules/insertmodule.ogg + ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg priority: 2 whitelist: tags: @@ -204,6 +208,8 @@ - CartridgeRifle gun_modules: name: Modules + insertSound: /Audio/White/Gun/Modules/insertmodule.ogg + ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg priority: 2 whitelist: tags: @@ -249,6 +255,8 @@ - CartridgeRifle gun_modules: name: Modules + insertSound: /Audio/White/Gun/Modules/insertmodule.ogg + ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg priority: 2 whitelist: tags: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index 9dcbddb50d..fb064d3960 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -150,6 +150,8 @@ - CartridgePistol gun_modules: name: Modules + insertSound: /Audio/White/Gun/Modules/insertmodule.ogg + ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg priority: 2 whitelist: tags: @@ -268,6 +270,8 @@ - CartridgePistol gun_modules: name: Modules + insertSound: /Audio/White/Gun/Modules/insertmodule.ogg + ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg priority: 2 whitelist: tags: @@ -313,6 +317,8 @@ - CartridgePistol gun_modules: name: Modules + insertSound: /Audio/White/Gun/Modules/insertmodule.ogg + ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg priority: 2 whitelist: tags: