diff --git a/Content.Client/GameObjects/Components/Mobs/ICharacterUI.cs b/Content.Client/GameObjects/Components/Mobs/ICharacterUI.cs index ef9c3a6821..80968a7c07 100644 --- a/Content.Client/GameObjects/Components/Mobs/ICharacterUI.cs +++ b/Content.Client/GameObjects/Components/Mobs/ICharacterUI.cs @@ -9,7 +9,7 @@ namespace Content.Client.GameObjects.Components.Mobs public interface ICharacterUI { /// - /// The godot control which holds the character user interface to be included in the window + /// The control which holds the character user interface to be included in the window /// Control Scene { get; } diff --git a/Content.Client/GameObjects/EntitySystems/BackgroundAudioSystem.cs b/Content.Client/GameObjects/EntitySystems/BackgroundAudioSystem.cs index f61dbe7214..80b826bb10 100644 --- a/Content.Client/GameObjects/EntitySystems/BackgroundAudioSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/BackgroundAudioSystem.cs @@ -25,11 +25,11 @@ namespace Content.Client.GameObjects.EntitySystems [Dependency] private readonly IStateManager _stateManager = default!; [Dependency] private readonly IBaseClient _client = default!; [Dependency] private readonly IClientGameTicker _clientGameTicker = default!; - + private SoundCollectionPrototype _ambientCollection = default!; - private AudioParams _ambientParams = new(-10f, 1, "Master", 0, 0, AudioMixTarget.Stereo, true, 0f); - private AudioParams _lobbyParams = new(-5f, 1, "Master", 0, 0, AudioMixTarget.Stereo, true, 0f); + private AudioParams _ambientParams = new(-10f, 1, "Master", 0, 0, true, 0f); + private AudioParams _lobbyParams = new(-5f, 1, "Master", 0, 0, true, 0f); private IPlayingAudioStream? _ambientStream; private IPlayingAudioStream? _lobbyStream; diff --git a/Content.Server/GameObjects/Components/Interactable/ExpendableLightComponent.cs b/Content.Server/GameObjects/Components/Interactable/ExpendableLightComponent.cs index 79ac6d990b..4fb51b2adb 100644 --- a/Content.Server/GameObjects/Components/Interactable/ExpendableLightComponent.cs +++ b/Content.Server/GameObjects/Components/Interactable/ExpendableLightComponent.cs @@ -20,7 +20,7 @@ namespace Content.Server.GameObjects.Components.Interactable [RegisterComponent] public class ExpendableLightComponent : SharedExpendableLightComponent, IUse { - private static readonly AudioParams LoopedSoundParams = new(0, 1, "Master", 62.5f, 1, AudioMixTarget.Stereo, true, 0.3f); + private static readonly AudioParams LoopedSoundParams = new(0, 1, "Master", 62.5f, 1, true, 0.3f); /// /// Status of light, whether or not it is emitting light. diff --git a/RobustToolbox b/RobustToolbox index 8edd44086b..3ec9e7a734 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 8edd44086b56d443c29d4814fb0f3f51543b6374 +Subproject commit 3ec9e7a7342f62fd30dd3c41bd7083424058110c