diff --git a/Content.Client/Audio/ContentAudioSystem.AmbientMusic.cs b/Content.Client/Audio/ContentAudioSystem.AmbientMusic.cs index 84b787a4ec..ce2c64c6e5 100644 --- a/Content.Client/Audio/ContentAudioSystem.AmbientMusic.cs +++ b/Content.Client/Audio/ContentAudioSystem.AmbientMusic.cs @@ -31,8 +31,8 @@ public sealed partial class ContentAudioSystem [Dependency] private readonly RulesSystem _rules = default!; [Dependency] private readonly SharedAudioSystem _audio = default!; - private readonly TimeSpan _minAmbienceTime = TimeSpan.FromSeconds(30); - private readonly TimeSpan _maxAmbienceTime = TimeSpan.FromSeconds(60); + private readonly TimeSpan _minAmbienceTime = TimeSpan.FromSeconds(5); + private readonly TimeSpan _maxAmbienceTime = TimeSpan.FromSeconds(10); private const float AmbientMusicFadeTime = 10f; private static float _volumeSlider; diff --git a/Content.Server/Body/Components/BloodstreamComponent.cs b/Content.Server/Body/Components/BloodstreamComponent.cs index ecd30dfc8a..ad591b6500 100644 --- a/Content.Server/Body/Components/BloodstreamComponent.cs +++ b/Content.Server/Body/Components/BloodstreamComponent.cs @@ -104,7 +104,7 @@ namespace Content.Server.Body.Components /// The sound to be played when a weapon instantly deals blood loss damage. /// [DataField] - public SoundSpecifier InstantBloodSound = new SoundCollectionSpecifier("blood"); + public SoundSpecifier InstantBloodSound = new SoundCollectionSpecifier("BloodLossRun"); /// /// The sound to be played when some damage actually heals bleeding rather than starting it. @@ -181,6 +181,12 @@ namespace Content.Server.Body.Components /// public bool IsBleeding => BleedAmount > 0; + public readonly AudioParams DefaultParams = AudioParams.Default.WithVolume(-1f); + + public SoundSpecifier? BloodLossSound = new SoundCollectionSpecifier("BloodLoss"); + + //public SoundSpecifier? BloodLossRunSound = new SoundCollectionSpecifier(""); + //WD-EDIT } } diff --git a/Content.Server/Body/Systems/BloodstreamSystem.cs b/Content.Server/Body/Systems/BloodstreamSystem.cs index b54bc4adcf..083bc29516 100644 --- a/Content.Server/Body/Systems/BloodstreamSystem.cs +++ b/Content.Server/Body/Systems/BloodstreamSystem.cs @@ -13,9 +13,12 @@ using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Chemistry.Reaction; using Content.Shared.Damage; +using Content.Shared.Damage.Components; using Content.Shared.Damage.Prototypes; using Content.Shared.Drunk; using Content.Shared.FixedPoint; +using Content.Shared.Mobs; +using Content.Shared.Mobs.Components; using Content.Shared.Mobs.Systems; using Content.Shared.Movement.Systems; using Content.Shared.Popups; @@ -44,7 +47,7 @@ public sealed class BloodstreamSystem : EntitySystem [Dependency] private readonly AlertsSystem _alertsSystem = default!; [Dependency] private readonly ForensicsSystem _forensicsSystem = default!; [Dependency] private readonly MovementSpeedModifierSystem _speed = default!; // WD - [Dependency] private readonly BloodLossAccent _bloodLossAccent = default!; + [Dependency] private readonly BloodLossAccent _bloodLossAccent = default!; // WD public override void Initialize() { @@ -383,6 +386,13 @@ public sealed class BloodstreamSystem : EntitySystem } tempSolution.RemoveAllSolution(); + + // WD edit start + if (TryComp(uid, out var mobState) && TryComp(uid, out var stamina)) + if (mobState.CurrentState != MobState.Critical && !stamina.Critical) + _audio.PlayPvs(component.BloodLossSound, uid, component.DefaultParams); + + // WD edit end } _solutionContainerSystem.UpdateChemicals(component.TemporarySolution.Value); diff --git a/Resources/Audio/UI/hover.ogg b/Resources/Audio/UI/hover.ogg new file mode 100644 index 0000000000..0ff5e38292 Binary files /dev/null and b/Resources/Audio/UI/hover.ogg differ diff --git a/Resources/Audio/UI/main_menu_ambient.ogg b/Resources/Audio/UI/main_menu_ambient.ogg new file mode 100644 index 0000000000..dc1f70d32d Binary files /dev/null and b/Resources/Audio/UI/main_menu_ambient.ogg differ diff --git a/Resources/Audio/UI/pressed.ogg b/Resources/Audio/UI/pressed.ogg new file mode 100644 index 0000000000..97f7112a0d Binary files /dev/null and b/Resources/Audio/UI/pressed.ogg differ diff --git a/Resources/Audio/White/Ambience/Anomalies/anomaly1.ogg b/Resources/Audio/White/Ambience/Anomalies/anomaly1.ogg new file mode 100644 index 0000000000..a21f37df9d Binary files /dev/null and b/Resources/Audio/White/Ambience/Anomalies/anomaly1.ogg differ diff --git a/Resources/Audio/White/Ambience/Anomalies/anomaly2.ogg b/Resources/Audio/White/Ambience/Anomalies/anomaly2.ogg new file mode 100644 index 0000000000..da6e0d1016 Binary files /dev/null and b/Resources/Audio/White/Ambience/Anomalies/anomaly2.ogg differ diff --git a/Resources/Audio/White/Ambience/Anomalies/anomaly3.ogg b/Resources/Audio/White/Ambience/Anomalies/anomaly3.ogg new file mode 100644 index 0000000000..c9418e49df Binary files /dev/null and b/Resources/Audio/White/Ambience/Anomalies/anomaly3.ogg differ diff --git a/Resources/Audio/White/Ambience/Anomalies/anomaly4.ogg b/Resources/Audio/White/Ambience/Anomalies/anomaly4.ogg new file mode 100644 index 0000000000..266a57586b Binary files /dev/null and b/Resources/Audio/White/Ambience/Anomalies/anomaly4.ogg differ diff --git a/Resources/Audio/White/Ambience/Space/space_1.ogg b/Resources/Audio/White/Ambience/Space/space_1.ogg new file mode 100644 index 0000000000..6486352493 Binary files /dev/null and b/Resources/Audio/White/Ambience/Space/space_1.ogg differ diff --git a/Resources/Audio/White/Ambience/Space/space_10.ogg b/Resources/Audio/White/Ambience/Space/space_10.ogg new file mode 100644 index 0000000000..5c67e03c09 Binary files /dev/null and b/Resources/Audio/White/Ambience/Space/space_10.ogg differ diff --git a/Resources/Audio/White/Ambience/Space/space_11.ogg b/Resources/Audio/White/Ambience/Space/space_11.ogg new file mode 100644 index 0000000000..211c7e76d7 Binary files /dev/null and b/Resources/Audio/White/Ambience/Space/space_11.ogg differ diff --git a/Resources/Audio/White/Ambience/Space/space_12.ogg b/Resources/Audio/White/Ambience/Space/space_12.ogg new file mode 100644 index 0000000000..58af0d577c Binary files /dev/null and b/Resources/Audio/White/Ambience/Space/space_12.ogg differ diff --git a/Resources/Audio/White/Ambience/Space/space_13.ogg b/Resources/Audio/White/Ambience/Space/space_13.ogg new file mode 100644 index 0000000000..bdd2f2ab25 Binary files /dev/null and b/Resources/Audio/White/Ambience/Space/space_13.ogg differ diff --git a/Resources/Audio/White/Ambience/Space/space_14.ogg b/Resources/Audio/White/Ambience/Space/space_14.ogg new file mode 100644 index 0000000000..dd565d6c7d Binary files /dev/null and b/Resources/Audio/White/Ambience/Space/space_14.ogg differ diff --git a/Resources/Audio/White/Ambience/Space/space_15.ogg b/Resources/Audio/White/Ambience/Space/space_15.ogg new file mode 100644 index 0000000000..abe1929c72 Binary files /dev/null and b/Resources/Audio/White/Ambience/Space/space_15.ogg differ diff --git a/Resources/Audio/White/Ambience/Space/space_2.ogg b/Resources/Audio/White/Ambience/Space/space_2.ogg new file mode 100644 index 0000000000..709a843759 Binary files /dev/null and b/Resources/Audio/White/Ambience/Space/space_2.ogg differ diff --git a/Resources/Audio/White/Ambience/Space/space_3.ogg b/Resources/Audio/White/Ambience/Space/space_3.ogg new file mode 100644 index 0000000000..168a28b0f7 Binary files /dev/null and b/Resources/Audio/White/Ambience/Space/space_3.ogg differ diff --git a/Resources/Audio/White/Ambience/Space/space_4.ogg b/Resources/Audio/White/Ambience/Space/space_4.ogg new file mode 100644 index 0000000000..e8deeb8e63 Binary files /dev/null and b/Resources/Audio/White/Ambience/Space/space_4.ogg differ diff --git a/Resources/Audio/White/Ambience/Space/space_5.ogg b/Resources/Audio/White/Ambience/Space/space_5.ogg new file mode 100644 index 0000000000..84d38a9025 Binary files /dev/null and b/Resources/Audio/White/Ambience/Space/space_5.ogg differ diff --git a/Resources/Audio/White/Ambience/Space/space_6.ogg b/Resources/Audio/White/Ambience/Space/space_6.ogg new file mode 100644 index 0000000000..ef5e4e6587 Binary files /dev/null and b/Resources/Audio/White/Ambience/Space/space_6.ogg differ diff --git a/Resources/Audio/White/Ambience/Space/space_7.ogg b/Resources/Audio/White/Ambience/Space/space_7.ogg new file mode 100644 index 0000000000..50fbb515c5 Binary files /dev/null and b/Resources/Audio/White/Ambience/Space/space_7.ogg differ diff --git a/Resources/Audio/White/Ambience/Space/space_8.ogg b/Resources/Audio/White/Ambience/Space/space_8.ogg new file mode 100644 index 0000000000..8b22847e4f Binary files /dev/null and b/Resources/Audio/White/Ambience/Space/space_8.ogg differ diff --git a/Resources/Audio/White/Ambience/Space/space_9.ogg b/Resources/Audio/White/Ambience/Space/space_9.ogg new file mode 100644 index 0000000000..56880965ed Binary files /dev/null and b/Resources/Audio/White/Ambience/Space/space_9.ogg differ diff --git a/Resources/Audio/White/Ambience/Station/station_1.ogg b/Resources/Audio/White/Ambience/Station/station_1.ogg new file mode 100644 index 0000000000..bfefae6995 Binary files /dev/null and b/Resources/Audio/White/Ambience/Station/station_1.ogg differ diff --git a/Resources/Audio/White/Ambience/Station/station_10.ogg b/Resources/Audio/White/Ambience/Station/station_10.ogg new file mode 100644 index 0000000000..e9f3ee577c Binary files /dev/null and b/Resources/Audio/White/Ambience/Station/station_10.ogg differ diff --git a/Resources/Audio/White/Ambience/Station/station_11.ogg b/Resources/Audio/White/Ambience/Station/station_11.ogg new file mode 100644 index 0000000000..607feec1f8 Binary files /dev/null and b/Resources/Audio/White/Ambience/Station/station_11.ogg differ diff --git a/Resources/Audio/White/Ambience/Station/station_12.ogg b/Resources/Audio/White/Ambience/Station/station_12.ogg new file mode 100644 index 0000000000..f0657986bc Binary files /dev/null and b/Resources/Audio/White/Ambience/Station/station_12.ogg differ diff --git a/Resources/Audio/White/Ambience/Station/station_13.ogg b/Resources/Audio/White/Ambience/Station/station_13.ogg new file mode 100644 index 0000000000..64ab85cdc6 Binary files /dev/null and b/Resources/Audio/White/Ambience/Station/station_13.ogg differ diff --git a/Resources/Audio/White/Ambience/Station/station_14.ogg b/Resources/Audio/White/Ambience/Station/station_14.ogg new file mode 100644 index 0000000000..0cba32aa42 Binary files /dev/null and b/Resources/Audio/White/Ambience/Station/station_14.ogg differ diff --git a/Resources/Audio/White/Ambience/Station/station_15.ogg b/Resources/Audio/White/Ambience/Station/station_15.ogg new file mode 100644 index 0000000000..6cd4555698 Binary files /dev/null and b/Resources/Audio/White/Ambience/Station/station_15.ogg differ diff --git a/Resources/Audio/White/Ambience/Station/station_16.ogg b/Resources/Audio/White/Ambience/Station/station_16.ogg new file mode 100644 index 0000000000..61da93cca9 Binary files /dev/null and b/Resources/Audio/White/Ambience/Station/station_16.ogg differ diff --git a/Resources/Audio/White/Ambience/Station/station_17.ogg b/Resources/Audio/White/Ambience/Station/station_17.ogg new file mode 100644 index 0000000000..5def84f1f7 Binary files /dev/null and b/Resources/Audio/White/Ambience/Station/station_17.ogg differ diff --git a/Resources/Audio/White/Ambience/Station/station_18.ogg b/Resources/Audio/White/Ambience/Station/station_18.ogg new file mode 100644 index 0000000000..21aa81dac0 Binary files /dev/null and b/Resources/Audio/White/Ambience/Station/station_18.ogg differ diff --git a/Resources/Audio/White/Ambience/Station/station_19.ogg b/Resources/Audio/White/Ambience/Station/station_19.ogg new file mode 100644 index 0000000000..d82738319b Binary files /dev/null and b/Resources/Audio/White/Ambience/Station/station_19.ogg differ diff --git a/Resources/Audio/White/Ambience/Station/station_2.ogg b/Resources/Audio/White/Ambience/Station/station_2.ogg new file mode 100644 index 0000000000..4f75e07dcb Binary files /dev/null and b/Resources/Audio/White/Ambience/Station/station_2.ogg differ diff --git a/Resources/Audio/White/Ambience/Station/station_20.ogg b/Resources/Audio/White/Ambience/Station/station_20.ogg new file mode 100644 index 0000000000..2a864c2ea6 Binary files /dev/null and b/Resources/Audio/White/Ambience/Station/station_20.ogg differ diff --git a/Resources/Audio/White/Ambience/Station/station_21.ogg b/Resources/Audio/White/Ambience/Station/station_21.ogg new file mode 100644 index 0000000000..b84dbc5b42 Binary files /dev/null and b/Resources/Audio/White/Ambience/Station/station_21.ogg differ diff --git a/Resources/Audio/White/Ambience/Station/station_22.ogg b/Resources/Audio/White/Ambience/Station/station_22.ogg new file mode 100644 index 0000000000..7a976fb7af Binary files /dev/null and b/Resources/Audio/White/Ambience/Station/station_22.ogg differ diff --git a/Resources/Audio/White/Ambience/Station/station_23.ogg b/Resources/Audio/White/Ambience/Station/station_23.ogg new file mode 100644 index 0000000000..276e4cf6ad Binary files /dev/null and b/Resources/Audio/White/Ambience/Station/station_23.ogg differ diff --git a/Resources/Audio/White/Ambience/Station/station_24.ogg b/Resources/Audio/White/Ambience/Station/station_24.ogg new file mode 100644 index 0000000000..6a86b84d3f Binary files /dev/null and b/Resources/Audio/White/Ambience/Station/station_24.ogg differ diff --git a/Resources/Audio/White/Ambience/Station/station_25.ogg b/Resources/Audio/White/Ambience/Station/station_25.ogg new file mode 100644 index 0000000000..3845edf611 Binary files /dev/null and b/Resources/Audio/White/Ambience/Station/station_25.ogg differ diff --git a/Resources/Audio/White/Ambience/Station/station_26.ogg b/Resources/Audio/White/Ambience/Station/station_26.ogg new file mode 100644 index 0000000000..67bd6633c7 Binary files /dev/null and b/Resources/Audio/White/Ambience/Station/station_26.ogg differ diff --git a/Resources/Audio/White/Ambience/Station/station_27.ogg b/Resources/Audio/White/Ambience/Station/station_27.ogg new file mode 100644 index 0000000000..42d8c4a1f4 Binary files /dev/null and b/Resources/Audio/White/Ambience/Station/station_27.ogg differ diff --git a/Resources/Audio/White/Ambience/Station/station_3.ogg b/Resources/Audio/White/Ambience/Station/station_3.ogg new file mode 100644 index 0000000000..cc46d2b1ec Binary files /dev/null and b/Resources/Audio/White/Ambience/Station/station_3.ogg differ diff --git a/Resources/Audio/White/Ambience/Station/station_4.ogg b/Resources/Audio/White/Ambience/Station/station_4.ogg new file mode 100644 index 0000000000..b4f60c659e Binary files /dev/null and b/Resources/Audio/White/Ambience/Station/station_4.ogg differ diff --git a/Resources/Audio/White/Ambience/Station/station_5.ogg b/Resources/Audio/White/Ambience/Station/station_5.ogg new file mode 100644 index 0000000000..8767ad1bf9 Binary files /dev/null and b/Resources/Audio/White/Ambience/Station/station_5.ogg differ diff --git a/Resources/Audio/White/Ambience/Station/station_6.ogg b/Resources/Audio/White/Ambience/Station/station_6.ogg new file mode 100644 index 0000000000..b7a0c7b70c Binary files /dev/null and b/Resources/Audio/White/Ambience/Station/station_6.ogg differ diff --git a/Resources/Audio/White/Ambience/Station/station_7.ogg b/Resources/Audio/White/Ambience/Station/station_7.ogg new file mode 100644 index 0000000000..6975740c69 Binary files /dev/null and b/Resources/Audio/White/Ambience/Station/station_7.ogg differ diff --git a/Resources/Audio/White/Ambience/Station/station_8.ogg b/Resources/Audio/White/Ambience/Station/station_8.ogg new file mode 100644 index 0000000000..5c89263559 Binary files /dev/null and b/Resources/Audio/White/Ambience/Station/station_8.ogg differ diff --git a/Resources/Audio/White/Ambience/Station/station_9.ogg b/Resources/Audio/White/Ambience/Station/station_9.ogg new file mode 100644 index 0000000000..4c80aa264d Binary files /dev/null and b/Resources/Audio/White/Ambience/Station/station_9.ogg differ diff --git a/Resources/Audio/Lobby/Dark/roomishere.ogg b/Resources/Audio/White/Music/Lobby/Dark/roomishere.ogg similarity index 100% rename from Resources/Audio/Lobby/Dark/roomishere.ogg rename to Resources/Audio/White/Music/Lobby/Dark/roomishere.ogg diff --git a/Resources/Audio/Lobby/Dark/saveheaven.ogg b/Resources/Audio/White/Music/Lobby/Dark/saveheaven.ogg similarity index 100% rename from Resources/Audio/Lobby/Dark/saveheaven.ogg rename to Resources/Audio/White/Music/Lobby/Dark/saveheaven.ogg diff --git a/Resources/Audio/Lobby/Meme/Govnovoz1.ogg b/Resources/Audio/White/Music/Lobby/Meme/Govnovoz1.ogg similarity index 100% rename from Resources/Audio/Lobby/Meme/Govnovoz1.ogg rename to Resources/Audio/White/Music/Lobby/Meme/Govnovoz1.ogg diff --git a/Resources/Audio/Lobby/Meme/govnovoz2.ogg b/Resources/Audio/White/Music/Lobby/Meme/govnovoz2.ogg similarity index 100% rename from Resources/Audio/Lobby/Meme/govnovoz2.ogg rename to Resources/Audio/White/Music/Lobby/Meme/govnovoz2.ogg diff --git a/Resources/Audio/Lobby/Meme/govnovoz3.ogg b/Resources/Audio/White/Music/Lobby/Meme/govnovoz3.ogg similarity index 100% rename from Resources/Audio/Lobby/Meme/govnovoz3.ogg rename to Resources/Audio/White/Music/Lobby/Meme/govnovoz3.ogg diff --git a/Resources/Audio/Lobby/Meme/govnovoz4.ogg b/Resources/Audio/White/Music/Lobby/Meme/govnovoz4.ogg similarity index 100% rename from Resources/Audio/Lobby/Meme/govnovoz4.ogg rename to Resources/Audio/White/Music/Lobby/Meme/govnovoz4.ogg diff --git a/Resources/Audio/Lobby/White/Spac_Stac.ogg b/Resources/Audio/White/Music/Lobby/Music/Spac_Stac.ogg similarity index 100% rename from Resources/Audio/Lobby/White/Spac_Stac.ogg rename to Resources/Audio/White/Music/Lobby/Music/Spac_Stac.ogg diff --git a/Resources/Audio/Lobby/White/atomicamnesiammx.ogg b/Resources/Audio/White/Music/Lobby/Music/atomicamnesiammx.ogg similarity index 100% rename from Resources/Audio/Lobby/White/atomicamnesiammx.ogg rename to Resources/Audio/White/Music/Lobby/Music/atomicamnesiammx.ogg diff --git a/Resources/Audio/Lobby/White/comet_haley.ogg b/Resources/Audio/White/Music/Lobby/Music/comet_haley.ogg similarity index 100% rename from Resources/Audio/Lobby/White/comet_haley.ogg rename to Resources/Audio/White/Music/Lobby/Music/comet_haley.ogg diff --git a/Resources/Audio/White/Music/Lobby/Music/delirium.ogg b/Resources/Audio/White/Music/Lobby/Music/delirium.ogg new file mode 100644 index 0000000000..8dde4db7b3 Binary files /dev/null and b/Resources/Audio/White/Music/Lobby/Music/delirium.ogg differ diff --git a/Resources/Audio/Lobby/White/every_light_is_blinking_at_once.ogg b/Resources/Audio/White/Music/Lobby/Music/every_light_is_blinking_at_once.ogg similarity index 100% rename from Resources/Audio/Lobby/White/every_light_is_blinking_at_once.ogg rename to Resources/Audio/White/Music/Lobby/Music/every_light_is_blinking_at_once.ogg diff --git a/Resources/Audio/Lobby/White/lasers_rip_apart_the_bulkhead.ogg b/Resources/Audio/White/Music/Lobby/Music/lasers_rip_apart_the_bulkhead.ogg similarity index 100% rename from Resources/Audio/Lobby/White/lasers_rip_apart_the_bulkhead.ogg rename to Resources/Audio/White/Music/Lobby/Music/lasers_rip_apart_the_bulkhead.ogg diff --git a/Resources/Audio/White/Music/Lobby/Music/magicfly.ogg b/Resources/Audio/White/Music/Lobby/Music/magicfly.ogg new file mode 100644 index 0000000000..632c176add Binary files /dev/null and b/Resources/Audio/White/Music/Lobby/Music/magicfly.ogg differ diff --git a/Resources/Audio/Lobby/White/singuloose.ogg b/Resources/Audio/White/Music/Lobby/Music/singuloose.ogg similarity index 100% rename from Resources/Audio/Lobby/White/singuloose.ogg rename to Resources/Audio/White/Music/Lobby/Music/singuloose.ogg diff --git a/Resources/Audio/Lobby/White/thunderdome.ogg b/Resources/Audio/White/Music/Lobby/Music/thunderdome.ogg similarity index 100% rename from Resources/Audio/Lobby/White/thunderdome.ogg rename to Resources/Audio/White/Music/Lobby/Music/thunderdome.ogg diff --git a/Resources/Audio/Lobby/SS13/absconditus.ogg b/Resources/Audio/White/Music/Lobby/SS13/absconditus.ogg similarity index 100% rename from Resources/Audio/Lobby/SS13/absconditus.ogg rename to Resources/Audio/White/Music/Lobby/SS13/absconditus.ogg diff --git a/Resources/Audio/Lobby/SS13/endless_space.ogg b/Resources/Audio/White/Music/Lobby/SS13/endless_space.ogg similarity index 100% rename from Resources/Audio/Lobby/SS13/endless_space.ogg rename to Resources/Audio/White/Music/Lobby/SS13/endless_space.ogg diff --git a/Resources/Audio/Lobby/SS13/mod.flip-flap.ogg b/Resources/Audio/White/Music/Lobby/SS13/mod.flip-flap.ogg similarity index 100% rename from Resources/Audio/Lobby/SS13/mod.flip-flap.ogg rename to Resources/Audio/White/Music/Lobby/SS13/mod.flip-flap.ogg diff --git a/Resources/Audio/Lobby/SS13/pwmur.ogg b/Resources/Audio/White/Music/Lobby/SS13/pwmur.ogg similarity index 100% rename from Resources/Audio/Lobby/SS13/pwmur.ogg rename to Resources/Audio/White/Music/Lobby/SS13/pwmur.ogg diff --git a/Resources/Audio/White/Music/Lobby/SS13/space.ogg b/Resources/Audio/White/Music/Lobby/SS13/space.ogg new file mode 100644 index 0000000000..d3b934d521 Binary files /dev/null and b/Resources/Audio/White/Music/Lobby/SS13/space.ogg differ diff --git a/Resources/Audio/Lobby/SS13/title2.ogg b/Resources/Audio/White/Music/Lobby/SS13/title2.ogg similarity index 100% rename from Resources/Audio/Lobby/SS13/title2.ogg rename to Resources/Audio/White/Music/Lobby/SS13/title2.ogg diff --git a/Resources/Audio/Lobby/SS13/title3.ogg b/Resources/Audio/White/Music/Lobby/SS13/title3.ogg similarity index 100% rename from Resources/Audio/Lobby/SS13/title3.ogg rename to Resources/Audio/White/Music/Lobby/SS13/title3.ogg diff --git a/Resources/Audio/White/Music/Lobby/Songs/AllThatICanSee.ogg b/Resources/Audio/White/Music/Lobby/Songs/AllThatICanSee.ogg new file mode 100644 index 0000000000..bd7f36ab60 Binary files /dev/null and b/Resources/Audio/White/Music/Lobby/Songs/AllThatICanSee.ogg differ diff --git a/Resources/Audio/Lobby/Songs/CirclesAroundTheSun.ogg b/Resources/Audio/White/Music/Lobby/Songs/CirclesAroundTheSun.ogg similarity index 100% rename from Resources/Audio/Lobby/Songs/CirclesAroundTheSun.ogg rename to Resources/Audio/White/Music/Lobby/Songs/CirclesAroundTheSun.ogg diff --git a/Resources/Audio/Lobby/Songs/RetroFilk.ogg b/Resources/Audio/White/Music/Lobby/Songs/RetroFilk.ogg similarity index 100% rename from Resources/Audio/Lobby/Songs/RetroFilk.ogg rename to Resources/Audio/White/Music/Lobby/Songs/RetroFilk.ogg diff --git a/Resources/Audio/Lobby/Songs/SpaceAsshole.ogg b/Resources/Audio/White/Music/Lobby/Songs/SpaceAsshole.ogg similarity index 100% rename from Resources/Audio/Lobby/Songs/SpaceAsshole.ogg rename to Resources/Audio/White/Music/Lobby/Songs/SpaceAsshole.ogg diff --git a/Resources/Audio/Lobby/Songs/SpaceOddity.ogg b/Resources/Audio/White/Music/Lobby/Songs/SpaceOddity.ogg similarity index 100% rename from Resources/Audio/Lobby/Songs/SpaceOddity.ogg rename to Resources/Audio/White/Music/Lobby/Songs/SpaceOddity.ogg diff --git a/Resources/Audio/Lobby/Songs/SpaceShuttle.ogg b/Resources/Audio/White/Music/Lobby/Songs/SpaceShuttle.ogg similarity index 100% rename from Resources/Audio/Lobby/Songs/SpaceShuttle.ogg rename to Resources/Audio/White/Music/Lobby/Songs/SpaceShuttle.ogg diff --git a/Resources/Audio/Lobby/Songs/TheSettler.ogg b/Resources/Audio/White/Music/Lobby/Songs/TheSettler.ogg similarity index 100% rename from Resources/Audio/Lobby/Songs/TheSettler.ogg rename to Resources/Audio/White/Music/Lobby/Songs/TheSettler.ogg diff --git a/Resources/Audio/Lobby/Songs/TheWizard.ogg b/Resources/Audio/White/Music/Lobby/Songs/TheWizard.ogg similarity index 100% rename from Resources/Audio/Lobby/Songs/TheWizard.ogg rename to Resources/Audio/White/Music/Lobby/Songs/TheWizard.ogg diff --git a/Resources/Audio/Lobby/attributions.yml b/Resources/Audio/White/Music/Lobby/attributions.yml similarity index 100% rename from Resources/Audio/Lobby/attributions.yml rename to Resources/Audio/White/Music/Lobby/attributions.yml diff --git a/Resources/Audio/White/Music/Lobby/end.ogg b/Resources/Audio/White/Music/Lobby/end.ogg new file mode 100644 index 0000000000..b0f822ca6f Binary files /dev/null and b/Resources/Audio/White/Music/Lobby/end.ogg differ diff --git a/Resources/Audio/White/Music/Lobby/fear.ogg b/Resources/Audio/White/Music/Lobby/fear.ogg new file mode 100644 index 0000000000..41c3c21122 Binary files /dev/null and b/Resources/Audio/White/Music/Lobby/fear.ogg differ diff --git a/Resources/Audio/Lobby/flip-flap.txt b/Resources/Audio/White/Music/Lobby/flip-flap.txt similarity index 100% rename from Resources/Audio/Lobby/flip-flap.txt rename to Resources/Audio/White/Music/Lobby/flip-flap.txt diff --git a/Resources/Audio/White/Music/crokett_39_s_theme.ogg b/Resources/Audio/White/Music/crokett_39_s_theme.ogg new file mode 100644 index 0000000000..0d846d7675 Binary files /dev/null and b/Resources/Audio/White/Music/crokett_39_s_theme.ogg differ diff --git a/Resources/Audio/White/Music/guts.ogg b/Resources/Audio/White/Music/guts.ogg new file mode 100644 index 0000000000..9480110039 Binary files /dev/null and b/Resources/Audio/White/Music/guts.ogg differ diff --git a/Resources/Audio/White/Other/BloodLoss/blood1.ogg b/Resources/Audio/White/Other/BloodLoss/blood1.ogg new file mode 100644 index 0000000000..30f0d1dacd Binary files /dev/null and b/Resources/Audio/White/Other/BloodLoss/blood1.ogg differ diff --git a/Resources/Audio/White/Other/BloodLoss/blood2.ogg b/Resources/Audio/White/Other/BloodLoss/blood2.ogg new file mode 100644 index 0000000000..79197cdbd0 Binary files /dev/null and b/Resources/Audio/White/Other/BloodLoss/blood2.ogg differ diff --git a/Resources/Audio/White/Other/BloodLoss/blood3.ogg b/Resources/Audio/White/Other/BloodLoss/blood3.ogg new file mode 100644 index 0000000000..6fcdea185e Binary files /dev/null and b/Resources/Audio/White/Other/BloodLoss/blood3.ogg differ diff --git a/Resources/Audio/White/Other/BloodLoss/blood4.ogg b/Resources/Audio/White/Other/BloodLoss/blood4.ogg new file mode 100644 index 0000000000..d88113542b Binary files /dev/null and b/Resources/Audio/White/Other/BloodLoss/blood4.ogg differ diff --git a/Resources/Audio/White/Other/BloodLoss/blood5.ogg b/Resources/Audio/White/Other/BloodLoss/blood5.ogg new file mode 100644 index 0000000000..2a90c912ef Binary files /dev/null and b/Resources/Audio/White/Other/BloodLoss/blood5.ogg differ diff --git a/Resources/Audio/White/Other/BloodLoss/blood6.ogg b/Resources/Audio/White/Other/BloodLoss/blood6.ogg new file mode 100644 index 0000000000..0f872ffecc Binary files /dev/null and b/Resources/Audio/White/Other/BloodLoss/blood6.ogg differ diff --git a/Resources/Audio/White/Other/BloodLoss/bloodloss_runs1.ogg b/Resources/Audio/White/Other/BloodLoss/bloodloss_runs1.ogg new file mode 100644 index 0000000000..e8f0a5dce4 Binary files /dev/null and b/Resources/Audio/White/Other/BloodLoss/bloodloss_runs1.ogg differ diff --git a/Resources/Audio/White/Other/BloodLoss/bloodloss_runs2.ogg b/Resources/Audio/White/Other/BloodLoss/bloodloss_runs2.ogg new file mode 100644 index 0000000000..06af94bfe2 Binary files /dev/null and b/Resources/Audio/White/Other/BloodLoss/bloodloss_runs2.ogg differ diff --git a/Resources/Audio/White/Other/BloodLoss/bloodloss_runs3.ogg b/Resources/Audio/White/Other/BloodLoss/bloodloss_runs3.ogg new file mode 100644 index 0000000000..bb5acb21ae Binary files /dev/null and b/Resources/Audio/White/Other/BloodLoss/bloodloss_runs3.ogg differ diff --git a/Resources/Audio/White/Other/BloodLoss/bloodloss_runs4.ogg b/Resources/Audio/White/Other/BloodLoss/bloodloss_runs4.ogg new file mode 100644 index 0000000000..1b389af863 Binary files /dev/null and b/Resources/Audio/White/Other/BloodLoss/bloodloss_runs4.ogg differ diff --git a/Resources/Prototypes/Entities/Structures/Machines/anomaly_equipment.yml b/Resources/Prototypes/Entities/Structures/Machines/anomaly_equipment.yml index ab09a03fef..e6afcb467f 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/anomaly_equipment.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/anomaly_equipment.yml @@ -40,9 +40,9 @@ - type: AmbientSound enabled: false range: 3 - volume: -8 + volume: -12 sound: - path: /Audio/Ambience/anomaly_drone.ogg + collection: AnomalySounds - type: GenericVisualizer visuals: enum.PowerDeviceVisuals.Powered: diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml index aedfd262d8..990d948742 100644 --- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml +++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml @@ -14,9 +14,9 @@ Radiation: 10 - type: AmbientSound range: 5 - volume: -5 + volume: -12 sound: - path: /Audio/Ambience/anomaly_drone.ogg + collection: AnomalySounds - type: Transform anchored: false - type: Physics diff --git a/Resources/Prototypes/SoundCollections/lobby.yml b/Resources/Prototypes/SoundCollections/lobby.yml index 145a5004b0..3efd154a00 100644 --- a/Resources/Prototypes/SoundCollections/lobby.yml +++ b/Resources/Prototypes/SoundCollections/lobby.yml @@ -2,57 +2,62 @@ #- /Audio/Lobby/itachi.ogg #- /Audio/Lobby/bobby.ogg -- type: soundCollection - id: LobbyMusicMeme - files: - - /Audio/Lobby/Meme/Govnovoz1.ogg - - /Audio/Lobby/Meme/Govnovoz2.ogg - - /Audio/Lobby/Meme/Govnovoz3.ogg - - /Audio/Lobby/Meme/Govnovoz.ogg +# Для закомментированных прототипов нужно указать правильные пути. +# Они не используются, поэтому мне стало лень их исправлять -- type: soundCollection - id: LobbyMusicSongs - files: - - /Audio/Lobby/Songs/SpaceOddity.ogg - - /Audio/Lobby/Songs/SpaceAsshole.ogg - - /Audio/Lobby/Songs/SpaceShuttle.ogg - - /Audio/Lobby/Songs/TheSettler.ogg - - /Audio/Lobby/Songs/TheWizard.ogg - - /Audio/Lobby/Songs/CirclesAroundTheSun.ogg - - /Audio/Lobby/Songs/RetroFilk.ogg +#- type: soundCollection +# id: LobbyMusicMeme +# files: +# - /Audio/Lobby/Meme/Govnovoz1.ogg +# - /Audio/Lobby/Meme/Govnovoz2.ogg +# - /Audio/Lobby/Meme/Govnovoz3.ogg +# - /Audio/Lobby/Meme/Govnovoz.ogg -- type: soundCollection - id: LobbyMusicWhite - files: - - /Audio/Lobby/White/thunderdome.ogg - - /Audio/Lobby/White/singuloose.ogg - - /Audio/Lobby/White/lasers_rip_apart_the_bulkhead.ogg - - /Audio/Lobby/White/every_light_is_blinking_at_once.ogg - - /Audio/Lobby/White/atomicamnesiammx.ogg - - /Audio/Lobby/White/Spac_Stac.ogg - - /Audio/Lobby/White/comet_haley.ogg +#- type: soundCollection +# id: LobbyMusicSongs +# files: +# - /Audio/Lobby/Songs/SpaceOddity.ogg +# - /Audio/Lobby/Songs/SpaceAsshole.ogg +# - /Audio/Lobby/Songs/SpaceShuttle.ogg +# - /Audio/Lobby/Songs/TheSettler.ogg +# - /Audio/Lobby/Songs/TheWizard.ogg +# - /Audio/Lobby/Songs/CirclesAroundTheSun.ogg +# - /Audio/Lobby/Songs/RetroFilk.ogg + +#- type: soundCollection +# id: LobbyMusicWhite +# files: +# - /Audio/Lobby/White/thunderdome.ogg +# - /Audio/Lobby/White/singuloose.ogg +# - /Audio/Lobby/White/lasers_rip_apart_the_bulkhead.ogg +# - /Audio/Lobby/White/every_light_is_blinking_at_once.ogg +# - /Audio/Lobby/White/atomicamnesiammx.ogg +# - /Audio/Lobby/White/Spac_Stac.ogg +# - /Audio/Lobby/White/comet_haley.ogg - type: soundCollection id: LobbyMusicWhitePack files: - - /Audio/Lobby/White/thunderdome.ogg - - /Audio/Lobby/White/singuloose.ogg - - /Audio/Lobby/White/lasers_rip_apart_the_bulkhead.ogg - - /Audio/Lobby/White/every_light_is_blinking_at_once.ogg - - /Audio/Lobby/White/atomicamnesiammx.ogg - - /Audio/Lobby/White/Spac_Stac.ogg - - /Audio/Lobby/White/comet_haley.ogg - - /Audio/Lobby/Songs/CirclesAroundTheSun.ogg - - /Audio/Lobby/Songs/SpaceOddity.ogg - - /Audio/Lobby/Songs/SpaceAsshole.ogg - - /Audio/Lobby/Songs/SpaceShuttle.ogg + - /Audio/White/Music/Lobby/Music/thunderdome.ogg # Music + - /Audio/White/Music/Lobby/Music/singuloose.ogg + - /Audio/White/Music/Lobby/Music/lasers_rip_apart_the_bulkhead.ogg + - /Audio/White/Music/Lobby/Music/every_light_is_blinking_at_once.ogg + - /Audio/White/Music/Lobby/Music/atomicamnesiammx.ogg + - /Audio/White/Music/Lobby/Music/Spac_Stac.ogg + - /Audio/White/Music/Lobby/Music/comet_haley.ogg + - /Audio/White/Music/Lobby/Music/magicfly.ogg # TODO: Сделать метадату + - /Audio/White/Music/Lobby/Music/delirium.ogg # TODO: Сделать метадату + - /Audio/White/Music/Lobby/Songs/CirclesAroundTheSun.ogg # Songs + - /Audio/White/Music/Lobby/Songs/SpaceOddity.ogg + - /Audio/White/Music/Lobby/Songs/SpaceShuttle.ogg + - /Audio/White/Music/Lobby/Songs/AllThatICanSee.ogg # TODO: Сделать метадату -- type: soundCollection - id: LobbyMusicSS13 - files: - - /Audio/Lobby/SS13/title2.ogg - - /Audio/Lobby/SS13/title3.ogg - - /Audio/Lobby/SS13/absconditus.ogg - - /Audio/Lobby/SS13/endless_space.ogg - - /Audio/Lobby/SS13/mod.flip-flap.ogg - - /Audio/Lobby/SS13/pwmur.ogg +#- type: soundCollection +# id: LobbyMusicSS13 +# files: +# - /Audio/White/Lobby/SS13/title2.ogg +# - /Audio/White/Lobby/SS13/title3.ogg +# - /Audio/White/Lobby/SS13/absconditus.ogg +# - /Audio/White/Lobby/SS13/endless_space.ogg +# - /Audio/White/Lobby/SS13/mod.flip-flap.ogg +# - /Audio/White/Lobby/SS13/pwmur.ogg diff --git a/Resources/Prototypes/White/SoundCollections/bloodloss.yml b/Resources/Prototypes/White/SoundCollections/bloodloss.yml new file mode 100644 index 0000000000..7b7817c38f --- /dev/null +++ b/Resources/Prototypes/White/SoundCollections/bloodloss.yml @@ -0,0 +1,17 @@ +- type: soundCollection + id: BloodLoss + files: + - /Audio/White/Other/BloodLoss/blood1.ogg + - /Audio/White/Other/BloodLoss/blood2.ogg + - /Audio/White/Other/BloodLoss/blood3.ogg + - /Audio/White/Other/BloodLoss/blood4.ogg + - /Audio/White/Other/BloodLoss/blood5.ogg + - /Audio/White/Other/BloodLoss/blood6.ogg + +- type: soundCollection + id: BloodLossRun + files: + - /Audio/White/Other/BloodLoss/bloodloss_runs1.ogg + - /Audio/White/Other/BloodLoss/bloodloss_runs2.ogg + - /Audio/White/Other/BloodLoss/bloodloss_runs3.ogg + - /Audio/White/Other/BloodLoss/bloodloss_runs4.ogg diff --git a/Resources/Prototypes/_White/JukeboxSongs/LobbySongs.yml b/Resources/Prototypes/_White/JukeboxSongs/LobbySongs.yml index 673651bdc2..6c566f72e2 100644 --- a/Resources/Prototypes/_White/JukeboxSongs/LobbySongs.yml +++ b/Resources/Prototypes/_White/JukeboxSongs/LobbySongs.yml @@ -1,85 +1,126 @@ # Music from lobby for stationary jukebox -- type: jukebox +# К недавно добавленной музыке добавлять [NEW] в название, чтобы привлечь внимание игроков + +# Songs +- type: jukebox # WD id: SpaceOddity name: Song - Space Oddity path: - path: /Audio/Lobby/Songs/SpaceOddity.ogg + path: /Audio/White/Music/Lobby/Songs/SpaceOddity.ogg -- type: jukebox +- type: jukebox # WD id: SpaceAsshole name: Song - Space Asshole path: - path: /Audio/Lobby/Songs/SpaceAsshole.ogg + path: /Audio/White/Music/Lobby/Songs/SpaceAsshole.ogg -- type: jukebox +- type: jukebox # WD id: SpaceShuttle name: Song - Space Shuttle path: - path: /Audio/Lobby/Songs/SpaceShuttle.ogg + path: /Audio/White/Music/Lobby/Songs/SpaceShuttle.ogg -- type: jukebox +- type: jukebox # WD id: TheSettler name: Song - The Settler path: - path: /Audio/Lobby/Songs/TheSettler.ogg + path: /Audio/White/Music/Lobby/Songs/TheSettler.ogg -- type: jukebox +- type: jukebox # WD id: TheWizard name: Song - The Wizard path: - path: /Audio/Lobby/Songs/TheWizard.ogg + path: /Audio/White/Music/Lobby/Songs/TheWizard.ogg -- type: jukebox +- type: jukebox # WD id: CirclesAroundTheSun name: Song - Circles Around The Sun path: - path: /Audio/Lobby/Songs/CirclesAroundTheSun.ogg + path: /Audio/White/Music/Lobby/Songs/CirclesAroundTheSun.ogg -- type: jukebox +- type: jukebox # WD id: RetroFilk name: Song - RetroFilk path: - path: /Audio/Lobby/Songs/RetroFilk.ogg + path: /Audio/White/Music/Lobby/Songs/RetroFilk.ogg -- type: jukebox +- type: jukebox # WD + id: AllThatICanSee + name: "[NEW] Song - All That I Can See" + path: + path: /Audio/White/Music/Lobby/Songs/AllThatICanSee.ogg + +# Music + +- type: jukebox # WD id: Thunderdome name: Music - Thunderdome path: - path: /Audio/Lobby/White/thunderdome.ogg + path: /Audio/White/Music/Lobby/Music/thunderdome.ogg -- type: jukebox +- type: jukebox # WD id: Singuloose name: Music - Singuloose path: - path: /Audio/Lobby/White/singuloose.ogg + path: /Audio/White/Music/Lobby/Music/singuloose.ogg -- type: jukebox +- type: jukebox # WD id: LasersRipApartTheBulkhead name: Music - Laser rip apart the bulkhead path: - path: /Audio/Lobby/White/lasers_rip_apart_the_bulkhead.ogg + path: /Audio/White/Music/Lobby/Music/lasers_rip_apart_the_bulkhead.ogg -- type: jukebox +- type: jukebox # WD id: EveryLightIsBlinkingAtOnce name: Music - Every light is blinking at once path: - path: /Audio/Lobby/White/every_light_is_blinking_at_once.ogg + path: /Audio/White/Music/Lobby/Music/every_light_is_blinking_at_once.ogg -- type: jukebox +- type: jukebox # WD id: AtomicAmnesiaMMX name: Music - Atomic amnesia mmx path: - path: /Audio/Lobby/White/atomicamnesiammx.ogg + path: /Audio/White/Music/Lobby/Music/atomicamnesiammx.ogg -- type: jukebox +- type: jukebox # WD id: SpacSpac name: Music - Spac Spac path: - path: /Audio/Lobby/White/Spac_Stac.ogg + path: /Audio/White/Music/Lobby/Music/Spac_Stac.ogg -- type: jukebox +- type: jukebox # WD id: CometHaley name: Music - Comet Haley path: - path: /Audio/Lobby/White/comet_haley.ogg + path: /Audio/White/Music/Lobby/Music/comet_haley.ogg + +- type: jukebox # WD + id: Delirium + name: "[NEW] Music - Delirium" + path: + path: /Audio/White/Music/Lobby/Music/delirium.ogg + +- type: jukebox # WD + id: MagicFly + name: "[NEW] Music - Magic Fly" + path: + path: /Audio/White/Music/Lobby/Music/magicfly.ogg + +- type: jukebox # WD + id: CrokketTheme + name: "[NEW] Music - Crokket theme" + path: + path: /Audio/White/Music/crokett_39_s_theme.ogg + +- type: jukebox # WD + id: Guts + name: "[NEW] Music - Guts" + path: + path: /Audio/White/Music/guts.ogg + +- type: jukebox # WD + id: VoyageNeverEnding + name: "[NEW] Music - Voyage Never Ending" + path: + path: /Audio/Ambience/voyage_neverending.ogg diff --git a/Resources/Prototypes/audio.yml b/Resources/Prototypes/audio.yml index 24df3239b5..ee3c835412 100644 --- a/Resources/Prototypes/audio.yml +++ b/Resources/Prototypes/audio.yml @@ -1,20 +1,24 @@ -- type: ambientMusic - id: Morgue - sound: - params: - volume: -12 - collection: AmbienceSpooky - rules: NearMorgue - priority: 4 +# WD edit - убрал говноамбиенты, у нас лучше. Пусть они играются -- type: ambientMusic - id: SpookyFog - sound: - params: - volume: -12 - collection: AmbienceSpookyFog - rules: NearSpookyFog - priority: 5 + + +#- type: ambientMusic +# id: Morgue +# sound: +# params: +# volume: -12 +# collection: AmbienceSpooky +# rules: NearMorgue +# priority: 4 + +#- type: ambientMusic +# id: SpookyFog +# sound: +# params: +# volume: -12 +# collection: AmbienceSpookyFog +# rules: NearSpookyFog +# priority: 5 - type: ambientMusic id: Holy @@ -35,33 +39,33 @@ priority: 4 # Departments -- type: ambientMusic - id: Medical - sound: - params: - volume: -12 - collection: AmbienceMedical - rules: NearMedical - priority: 3 +#- type: ambientMusic +# id: Medical +# sound: +# params: +# volume: -12 +# collection: AmbienceMedical +# rules: NearMedical +# priority: 3 -- type: ambientMusic - id: Engineering - sound: - params: - volume: -12 - collection: AmbienceEngineering - rules: NearEngineering - priority: 3 +#- type: ambientMusic +# id: Engineering +# sound: +# params: +# volume: -12 +# collection: AmbienceEngineering +# rules: NearEngineering +# priority: 3 # General areas -- type: ambientMusic - id: Maintenance - sound: - params: - volume: -12 - collection: AmbienceMaintenance - rules: NearMaintenance - priority: 2 +#- type: ambientMusic +# id: Maintenance +# sound: +# params: +# volume: -12 +# collection: AmbienceMaintenance +# rules: NearMaintenance +# priority: 2 - type: ambientMusic id: Space @@ -69,7 +73,6 @@ params: volume: -10 collection: AmbienceSpace - fadeIn: true interruptable: true rules: InSpace priority: 1 @@ -79,7 +82,7 @@ sound: params: volume: -12 - collection: AmbienceMining + collection: AmbienceSpace # AmbienceMining говно rules: OnMapGrid fadeIn: true interruptable: true @@ -92,6 +95,7 @@ params: volume: -12 collection: AmbienceGeneral + interruptable: true rules: AlwaysTrue # Sound collections @@ -110,20 +114,34 @@ - type: soundCollection id: AmbienceGeneral - files: - - /Audio/Ambience/ambigen1.ogg - - /Audio/Ambience/ambigen3.ogg - - /Audio/Ambience/ambigen4.ogg - - /Audio/Ambience/ambigen5.ogg - - /Audio/Ambience/ambigen6.ogg - - /Audio/Ambience/ambigen7.ogg - - /Audio/Ambience/ambigen8.ogg - - /Audio/Ambience/ambigen9.ogg - - /Audio/Ambience/ambigen10.ogg - - /Audio/Ambience/ambigen11.ogg - - /Audio/Ambience/ambigen12.ogg - - /Audio/Ambience/ambigen14.ogg - - /Audio/Ambience/ambigen15.ogg + files: # WD + - /Audio/White/Ambience/Station/station_1.ogg + - /Audio/White/Ambience/Station/station_2.ogg + - /Audio/White/Ambience/Station/station_3.ogg + - /Audio/White/Ambience/Station/station_4.ogg + - /Audio/White/Ambience/Station/station_5.ogg + - /Audio/White/Ambience/Station/station_6.ogg + - /Audio/White/Ambience/Station/station_7.ogg + - /Audio/White/Ambience/Station/station_8.ogg + - /Audio/White/Ambience/Station/station_9.ogg + - /Audio/White/Ambience/Station/station_10.ogg + - /Audio/White/Ambience/Station/station_11.ogg + - /Audio/White/Ambience/Station/station_12.ogg + - /Audio/White/Ambience/Station/station_13.ogg + - /Audio/White/Ambience/Station/station_14.ogg + - /Audio/White/Ambience/Station/station_15.ogg + - /Audio/White/Ambience/Station/station_16.ogg + - /Audio/White/Ambience/Station/station_17.ogg + - /Audio/White/Ambience/Station/station_18.ogg + - /Audio/White/Ambience/Station/station_19.ogg + - /Audio/White/Ambience/Station/station_20.ogg + - /Audio/White/Ambience/Station/station_21.ogg + - /Audio/White/Ambience/Station/station_22.ogg + - /Audio/White/Ambience/Station/station_23.ogg + - /Audio/White/Ambience/Station/station_24.ogg + - /Audio/White/Ambience/Station/station_25.ogg + - /Audio/White/Ambience/Station/station_26.ogg + - /Audio/White/Ambience/Station/station_27.ogg - type: soundCollection id: AmbienceHoly @@ -196,14 +214,22 @@ - type: soundCollection id: AmbienceSpace - files: - - /Audio/Ambience/constellations.ogg - - /Audio/Ambience/starlight.ogg - - /Audio/Ambience/drifting.ogg - - /Audio/Ambience/spookyspace1.ogg - - /Audio/Ambience/spookyspace2.ogg - - /Audio/Ambience/ambispace2.ogg - - /Audio/Lobby/title2.ogg + files: # WD + - /Audio/White/Ambience/Space/space_1.ogg + - /Audio/White/Ambience/Space/space_2.ogg + - /Audio/White/Ambience/Space/space_3.ogg + - /Audio/White/Ambience/Space/space_4.ogg + - /Audio/White/Ambience/Space/space_5.ogg + - /Audio/White/Ambience/Space/space_6.ogg + - /Audio/White/Ambience/Space/space_7.ogg + - /Audio/White/Ambience/Space/space_8.ogg + - /Audio/White/Ambience/Space/space_9.ogg + - /Audio/White/Ambience/Space/space_10.ogg + - /Audio/White/Ambience/Space/space_11.ogg + - /Audio/White/Ambience/Space/space_12.ogg + - /Audio/White/Ambience/Space/space_13.ogg + - /Audio/White/Ambience/Space/space_14.ogg + - /Audio/White/Ambience/Space/space_15.ogg - type: soundCollection id: AmbienceSpooky @@ -243,6 +269,14 @@ - /Audio/Ambience/ambidanger2.ogg - /Audio/Ambience/ambimine.ogg +- type: soundCollection # WD + id: AnomalySounds + files: + - /Audio/White/Ambience/Anomalies/anomaly1.ogg + - /Audio/White/Ambience/Anomalies/anomaly2.ogg + - /Audio/White/Ambience/Anomalies/anomaly3.ogg + - /Audio/White/Ambience/Anomalies/anomaly4.ogg + ## Background noise on station, separate to ambient music. - type: soundCollection id: AmbienceStation @@ -259,9 +293,9 @@ id: InSpace rules: - !type:InSpaceRule - - !type:GridInRangeRule - inverted: true - range: 3 +# - !type:GridInRangeRule +# inverted: true +# range: 3 # TODO - type: rules @@ -320,7 +354,7 @@ components: - type: Morgue range: 3 - + - type: rules id: NearSpookyFog rules: