diff --git a/Content.Server/Explosion/ExplosionHelper.cs b/Content.Server/Explosion/ExplosionHelper.cs index c2b1aa7e32..a2fbfe4244 100644 --- a/Content.Server/Explosion/ExplosionHelper.cs +++ b/Content.Server/Explosion/ExplosionHelper.cs @@ -36,7 +36,7 @@ namespace Content.Server.Explosion /// private static readonly float LightBreakChance = 0.3f; private static readonly float HeavyBreakChance = 0.8f; - private static SoundSpecifier _explosionSound = new SoundPathSpecifier("/Audio/Effects/explosion.ogg"); + private static SoundSpecifier _explosionSound = new SoundCollectionSpecifier("explosion"); private static bool IgnoreExplosivePassable(IEntity e) => e.HasTag("ExplosivePassable"); diff --git a/Content.Server/Light/Components/HandheldLightComponent.cs b/Content.Server/Light/Components/HandheldLightComponent.cs index 32d30bead6..8eb5b4ae27 100644 --- a/Content.Server/Light/Components/HandheldLightComponent.cs +++ b/Content.Server/Light/Components/HandheldLightComponent.cs @@ -46,9 +46,9 @@ namespace Content.Server.Light.Components [ViewVariables] protected override bool HasCell => _cellSlot.HasCell; - [ViewVariables(VVAccess.ReadWrite)] [DataField("turnOnSound")] public SoundSpecifier TurnOnSound = new SoundPathSpecifier("/Audio/Items/flashlight_toggle.ogg"); + [ViewVariables(VVAccess.ReadWrite)] [DataField("turnOnSound")] public SoundSpecifier TurnOnSound = new SoundPathSpecifier("/Audio/Items/flashlight_on.ogg"); [ViewVariables(VVAccess.ReadWrite)] [DataField("turnOnFailSound")] public SoundSpecifier TurnOnFailSound = new SoundPathSpecifier("/Audio/Machines/button.ogg"); - [ViewVariables(VVAccess.ReadWrite)] [DataField("turnOffSound")] public SoundSpecifier TurnOffSound = new SoundPathSpecifier("/Audio/Items/flashlight_toggle.ogg"); + [ViewVariables(VVAccess.ReadWrite)] [DataField("turnOffSound")] public SoundSpecifier TurnOffSound = new SoundPathSpecifier("/Audio/Items/flashlight_off .ogg"); [ComponentDependency] private readonly ItemActionsComponent? _itemActions = null; diff --git a/Content.Server/PDA/PDAComponent.cs b/Content.Server/PDA/PDAComponent.cs index a4bbfe07c1..bc6de84383 100644 --- a/Content.Server/PDA/PDAComponent.cs +++ b/Content.Server/PDA/PDAComponent.cs @@ -60,7 +60,7 @@ namespace Content.Server.PDA [ViewVariables] private BoundUserInterface? UserInterface => Owner.GetUIOrNull(PDAUiKey.Key); [DataField("insertIdSound")] private SoundSpecifier _insertIdSound = new SoundPathSpecifier("/Audio/Weapons/Guns/MagIn/batrifle_magin.ogg"); - [DataField("toggleFlashlightSound")] private SoundSpecifier _toggleFlashlightSound = new SoundPathSpecifier("/Audio/Items/flashlight_toggle.ogg"); + [DataField("toggleFlashlightSound")] private SoundSpecifier _toggleFlashlightSound = new SoundPathSpecifier("/Audio/Items/flashlight_pda.ogg"); [DataField("ejectIdSound")] private SoundSpecifier _ejectIdSound = new SoundPathSpecifier("/Audio/Machines/id_swipe.ogg"); public PDAComponent() diff --git a/Content.Server/Pointing/Components/RoguePointingArrowComponent.cs b/Content.Server/Pointing/Components/RoguePointingArrowComponent.cs index f800134a8a..f6ab0364e1 100644 --- a/Content.Server/Pointing/Components/RoguePointingArrowComponent.cs +++ b/Content.Server/Pointing/Components/RoguePointingArrowComponent.cs @@ -42,7 +42,7 @@ namespace Content.Server.Pointing.Components private float _chasingTime = 1; [DataField("explosionSound")] - private SoundSpecifier _explosionSound = new SoundPathSpecifier("/Audio/Effects/explosion.ogg"); + private SoundSpecifier _explosionSound = new SoundCollectionSpecifier("explosion"); private IEntity? RandomNearbyPlayer() { diff --git a/Content.Server/Singularity/Components/ServerSingularityComponent.cs b/Content.Server/Singularity/Components/ServerSingularityComponent.cs index ff22db994d..54bb893d92 100644 --- a/Content.Server/Singularity/Components/ServerSingularityComponent.cs +++ b/Content.Server/Singularity/Components/ServerSingularityComponent.cs @@ -73,7 +73,6 @@ namespace Content.Server.Singularity.Components private IPlayingAudioStream? _playingSound; [DataField("singularityFormingSound")] private SoundSpecifier _singularityFormingSound = new SoundPathSpecifier("/Audio/Effects/singularity_form.ogg"); - [DataField("singularitySound")] private SoundSpecifier _singularitySound = new SoundPathSpecifier("/Audio/Effects/singularity.ogg"); [DataField("singularityCollapsingSound")] private SoundSpecifier _singularityCollapsingSound = new SoundPathSpecifier("/Audio/Effects/singularity_collapse.ogg"); public override ComponentState GetComponentState(ICommonSession player) @@ -92,7 +91,6 @@ namespace Content.Server.Singularity.Components audioParams.MaxDistance = 20f; audioParams.Volume = 5; SoundSystem.Play(Filter.Pvs(Owner), _singularityFormingSound.GetSound(), Owner); - Timer.Spawn(5200, () => _playingSound = SoundSystem.Play(Filter.Pvs(Owner), _singularitySound.GetSound(), Owner, audioParams)); _singularitySystem.ChangeSingularityLevel(this, 1); } diff --git a/Content.Server/Storage/Components/EntityStorageComponent.cs b/Content.Server/Storage/Components/EntityStorageComponent.cs index 2530deb0c2..542a7dc6db 100644 --- a/Content.Server/Storage/Components/EntityStorageComponent.cs +++ b/Content.Server/Storage/Components/EntityStorageComponent.cs @@ -75,10 +75,10 @@ namespace Content.Server.Storage.Components private bool _isWeldedShut; [DataField("closeSound")] - private SoundSpecifier _closeSound = new SoundPathSpecifier("/Audio/Machines/closetclose.ogg"); + private SoundSpecifier _closeSound = new SoundPathSpecifier("/Audio/Effects/closetclose.ogg"); [DataField("openSound")] - private SoundSpecifier _openSound = new SoundPathSpecifier("/Audio/Machines/closetopen.ogg"); + private SoundSpecifier _openSound = new SoundPathSpecifier("/Audio/Effects/closetopen.ogg"); [ViewVariables] protected Container Contents = default!; diff --git a/Resources/Audio/Machines/closetclose.ogg b/Resources/Audio/Effects/closetclose.ogg similarity index 100% rename from Resources/Audio/Machines/closetclose.ogg rename to Resources/Audio/Effects/closetclose.ogg diff --git a/Resources/Audio/Machines/closetopen.ogg b/Resources/Audio/Effects/closetopen.ogg similarity index 100% rename from Resources/Audio/Machines/closetopen.ogg rename to Resources/Audio/Effects/closetopen.ogg diff --git a/Resources/Audio/Effects/explosion.ogg b/Resources/Audio/Effects/explosion.ogg deleted file mode 100644 index 32962ecb2c..0000000000 Binary files a/Resources/Audio/Effects/explosion.ogg and /dev/null differ diff --git a/Resources/Audio/Effects/explosion1.ogg b/Resources/Audio/Effects/explosion1.ogg new file mode 100644 index 0000000000..14df2c88cc Binary files /dev/null and b/Resources/Audio/Effects/explosion1.ogg differ diff --git a/Resources/Audio/Effects/explosion2.ogg b/Resources/Audio/Effects/explosion2.ogg new file mode 100644 index 0000000000..4c74233720 Binary files /dev/null and b/Resources/Audio/Effects/explosion2.ogg differ diff --git a/Resources/Audio/Effects/explosion3.ogg b/Resources/Audio/Effects/explosion3.ogg new file mode 100644 index 0000000000..9182446665 Binary files /dev/null and b/Resources/Audio/Effects/explosion3.ogg differ diff --git a/Resources/Audio/Effects/explosion4.ogg b/Resources/Audio/Effects/explosion4.ogg new file mode 100644 index 0000000000..c81a9f3979 Binary files /dev/null and b/Resources/Audio/Effects/explosion4.ogg differ diff --git a/Resources/Audio/Effects/explosion5.ogg b/Resources/Audio/Effects/explosion5.ogg new file mode 100644 index 0000000000..c02afed043 Binary files /dev/null and b/Resources/Audio/Effects/explosion5.ogg differ diff --git a/Resources/Audio/Effects/explosion6.ogg b/Resources/Audio/Effects/explosion6.ogg new file mode 100644 index 0000000000..dfe002e49b Binary files /dev/null and b/Resources/Audio/Effects/explosion6.ogg differ diff --git a/Resources/Audio/Effects/woodenclosetclose.ogg b/Resources/Audio/Effects/woodenclosetclose.ogg new file mode 100644 index 0000000000..b315c0d97c Binary files /dev/null and b/Resources/Audio/Effects/woodenclosetclose.ogg differ diff --git a/Resources/Audio/Effects/woodenclosetopen.ogg b/Resources/Audio/Effects/woodenclosetopen.ogg new file mode 100644 index 0000000000..b73e3a2e74 Binary files /dev/null and b/Resources/Audio/Effects/woodenclosetopen.ogg differ diff --git a/Resources/Audio/Items/flashlight_off.ogg b/Resources/Audio/Items/flashlight_off.ogg new file mode 100644 index 0000000000..7b9362ac5e Binary files /dev/null and b/Resources/Audio/Items/flashlight_off.ogg differ diff --git a/Resources/Audio/Items/flashlight_on.ogg b/Resources/Audio/Items/flashlight_on.ogg new file mode 100644 index 0000000000..4158e95248 Binary files /dev/null and b/Resources/Audio/Items/flashlight_on.ogg differ diff --git a/Resources/Audio/Items/flashlight_toggle.ogg b/Resources/Audio/Items/flashlight_pda.ogg similarity index 100% rename from Resources/Audio/Items/flashlight_toggle.ogg rename to Resources/Audio/Items/flashlight_pda.ogg diff --git a/Resources/Audio/Voice/Human/Scientist/science_scream1.ogg b/Resources/Audio/Voice/Human/Scientist/science_scream1.ogg new file mode 100644 index 0000000000..4d49b072e5 Binary files /dev/null and b/Resources/Audio/Voice/Human/Scientist/science_scream1.ogg differ diff --git a/Resources/Audio/Voice/Human/Scientist/science_scream2.ogg b/Resources/Audio/Voice/Human/Scientist/science_scream2.ogg new file mode 100644 index 0000000000..549af91af3 Binary files /dev/null and b/Resources/Audio/Voice/Human/Scientist/science_scream2.ogg differ diff --git a/Resources/Audio/Voice/Human/Scientist/science_scream3.ogg b/Resources/Audio/Voice/Human/Scientist/science_scream3.ogg new file mode 100644 index 0000000000..884230af94 Binary files /dev/null and b/Resources/Audio/Voice/Human/Scientist/science_scream3.ogg differ diff --git a/Resources/Audio/Voice/Human/Scientist/science_scream4.ogg b/Resources/Audio/Voice/Human/Scientist/science_scream4.ogg new file mode 100644 index 0000000000..93eca98a43 Binary files /dev/null and b/Resources/Audio/Voice/Human/Scientist/science_scream4.ogg differ diff --git a/Resources/Audio/Voice/Human/Scientist/science_scream5.ogg b/Resources/Audio/Voice/Human/Scientist/science_scream5.ogg new file mode 100644 index 0000000000..97aef3f85d Binary files /dev/null and b/Resources/Audio/Voice/Human/Scientist/science_scream5.ogg differ diff --git a/Resources/Audio/Voice/Human/Scientist/science_scream6.ogg b/Resources/Audio/Voice/Human/Scientist/science_scream6.ogg new file mode 100644 index 0000000000..2b0ccc98ee Binary files /dev/null and b/Resources/Audio/Voice/Human/Scientist/science_scream6.ogg differ diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index aed5fc1c89..343b11de70 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -7,7 +7,7 @@ components: - type: AmbientOnPowered - type: AmbientSound - volume: -15 + volume: -14 range: 3 sound: path: /Audio/Ambience/Objects/vending_machine_hum.ogg diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/singularity.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/singularity.yml index 9fe45c9e4b..f010b62e26 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/singularity.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/singularity.yml @@ -4,6 +4,11 @@ description: A mesmerizing swirl of darkness that sucks in everything. If it's moving towards you, run. components: - type: Clickable + - type: AmbientSound + volume: -10 + range: 14 + sound: + path: /Audio/Effects/singularity.ogg - type: Physics bodyType: Dynamic fixtures: diff --git a/Resources/Prototypes/Entities/Structures/Power/parts.yml b/Resources/Prototypes/Entities/Structures/Power/parts.yml index ae71a1fba0..601b83cdb7 100644 --- a/Resources/Prototypes/Entities/Structures/Power/parts.yml +++ b/Resources/Prototypes/Entities/Structures/Power/parts.yml @@ -47,6 +47,8 @@ mode: SnapgridCenter components: - type: AmbientSound + volume: -15 + range: 2 sound: path: /Audio/Ambience/Objects/hdd_buzz.ogg - type: Clickable diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml index 7d497e0535..45a28afd0e 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -10,6 +10,11 @@ state: cabinet - type: AccessReader access: [["Bar"]] + - type: EntityStorage + closeSound: + path: /Audio/Effects/woodenclosetclose.ogg + openSound: + path: /Audio/Effects/woodenclosetopen.ogg # Cargo - type: entity @@ -264,13 +269,10 @@ # Detective - type: entity id: LockerDetective - parent: LockerBase + parent: LockerBooze name: detective's cabinet + description: Usually cold and empty... like your heart. components: - - type: Appearance - visuals: - - type: StorageVisualizer - state: cabinet - type: AccessReader access: [["Service"]] # TODO access [["Detective"]] diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/lighting.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/lighting.yml index 26c8481c56..cedc68e419 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/lighting.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/lighting.yml @@ -4,10 +4,6 @@ description: "An unpowered light." suffix: Unpowered components: - - type: AmbientSound - volume: -12 - sound: - path: /Audio/Ambience/Objects/light_hum.ogg - type: Clickable - type: InteractionOutline - type: Construction @@ -97,6 +93,11 @@ suffix: Unpowered parent: WallLight components: + - type: AmbientSound + volume: -15 + range: 2 + sound: + path: /Audio/Ambience/Objects/light_hum.ogg - type: Sprite sprite: Structures/Wallmounts/Lighting/light_small.rsi state: on diff --git a/Resources/Prototypes/SoundCollections/explosion.yml b/Resources/Prototypes/SoundCollections/explosion.yml new file mode 100644 index 0000000000..e208c9d854 --- /dev/null +++ b/Resources/Prototypes/SoundCollections/explosion.yml @@ -0,0 +1,9 @@ +- type: soundCollection + id: explosion + files: + - /Audio/Effects/explosion1.ogg + - /Audio/Effects/explosion2.ogg + - /Audio/Effects/explosion3.ogg + - /Audio/Effects/explosion4.ogg + - /Audio/Effects/explosion5.ogg + - /Audio/Effects/explosion6.ogg diff --git a/Resources/Prototypes/SoundCollections/screams.yml b/Resources/Prototypes/SoundCollections/screams.yml index 5f8b9690ba..5d7fda10a2 100644 --- a/Resources/Prototypes/SoundCollections/screams.yml +++ b/Resources/Prototypes/SoundCollections/screams.yml @@ -16,3 +16,13 @@ - /Audio/Voice/Human/femalescream_3.ogg - /Audio/Voice/Human/femalescream_4.ogg - /Audio/Voice/Human/femalescream_5.ogg + +- type: soundCollection + id: ScientistScreams + files: + - /Audio/Voice/Human/science_scream_1.ogg + - /Audio/Voice/Human/science_scream_2.ogg + - /Audio/Voice/Human/science_scream_3.ogg + - /Audio/Voice/Human/science_scream_4.ogg + - /Audio/Voice/Human/science_scream_5.ogg + - /Audio/Voice/Human/science_scream_6.ogg