Merge pull request Rxup#694 from Rxup/upstream-sync

Upstream sync

Content.Client/Access/UI/AccessLevelControl.xaml.cs

@@ -12,11 +12,18 @@ namespace Content.Client.Access.UI;
 [GenerateTypedNameReferences]
 public sealed partial class AccessLevelControl : GridContainer
 {
+    [Dependency] private readonly ILogManager _logManager = default!;
+
+    private ISawmill _sawmill = default!;
+
     public readonly Dictionary<ProtoId<AccessLevelPrototype>, Button> ButtonsList = new();
 
     public AccessLevelControl()
     {
         RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+
+        _sawmill = _logManager.GetSawmill("accesslevelcontrol");
     }
 
     public void Populate(List<ProtoId<AccessLevelPrototype>> accessLevels, IPrototypeManager prototypeManager)
@@ -25,7 +32,7 @@ public void Populate(List<ProtoId<AccessLevelPrototype>> accessLevels, IPrototyp
         {
             if (!prototypeManager.TryIndex(access, out var accessLevel))
             {
-                Logger.Error($"Unable to find accesslevel for {access}");
+                _sawmill.Error($"Unable to find accesslevel for {access}");
                 continue;
             }
 

Content.Client/Audio/AudioUIController.cs

@@ -54,7 +54,7 @@ private void SetClickSound(string value)
     {
         if (!string.IsNullOrEmpty(value))
         {
-            var resource = _cache.GetResource<AudioResource>(value);
+            var resource = GetSoundOrFallback(value, CCVars.UIClickSound.DefaultValue);
             var source =
                 _audioManager.CreateAudioSource(resource);
 
@@ -77,7 +77,7 @@ private void SetHoverSound(string value)
     {
         if (!string.IsNullOrEmpty(value))
         {
-            var hoverResource = _cache.GetResource<AudioResource>(value);
+            var hoverResource = GetSoundOrFallback(value, CCVars.UIHoverSound.DefaultValue);
             var hoverSource =
                 _audioManager.CreateAudioSource(hoverResource);
 
@@ -95,4 +95,12 @@ private void SetHoverSound(string value)
             UIManager.SetHoverSound(null);
         }
     }
+
+    private AudioResource GetSoundOrFallback(string path, string fallback)
+    {
+        if (!_cache.TryGetResource(path, out AudioResource? resource))
+            return _cache.GetResource<AudioResource>(fallback);
+
+        return resource;
+    }
 }

Content.Client/Audio/ContentAudioSystem.AmbientMusic.cs

@@ -4,6 +4,7 @@
 using Content.Shared.CCVar;
 using Content.Shared.GameTicking;
 using Content.Shared.Random;
+using Content.Shared.Random.Rules;
 using Robust.Client.GameObjects;
 using Robust.Client.Player;
 using Robust.Client.ResourceManagement;

Content.Client/Content.Client.csproj

@@ -45,9 +45,6 @@
     <Compile Update="Backmen\Economy\WageConsole\UI\BonusWageWindow.cs">
       <DependentUpon>BonusWageWindow.xaml</DependentUpon>
     </Compile>
-    <Compile Update="Backmen\Ghost\Roles\UI\RollerRow.cs">
-      <DependentUpon>RollerRow.xaml</DependentUpon>
-    </Compile>
   </ItemGroup>
   <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
   <Import Project="..\RobustToolbox\MSBuild\XamlIL.targets" />

Content.Client/Research/UI/DiskConsoleBoundUserInterface.cs

@@ -1,6 +1,5 @@
 using Content.Shared.Research;
 using Content.Shared.Research.Components;
-using Robust.Client.GameObjects;
 
 namespace Content.Client.Research.UI
 {

Content.Client/Research/UI/ResearchClientBoundUserInterface.cs

@@ -1,5 +1,4 @@
 using Content.Shared.Research.Components;
-using Robust.Client.GameObjects;
 
 namespace Content.Client.Research.UI
 {

Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs

@@ -1,6 +1,5 @@
 using Content.Shared.Research.Components;
 using JetBrains.Annotations;
-using Robust.Client.GameObjects;
 
 namespace Content.Client.Research.UI;
 

Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs

@@ -81,7 +81,7 @@ public void  UpdatePanels(ResearchConsoleBoundInterfaceState state)
     public void UpdateInformationPanel(ResearchConsoleBoundInterfaceState state)
     {
         var amountMsg = new FormattedMessage();
-        amountMsg.AddMarkup(Loc.GetString("research-console-menu-research-points-text",
+        amountMsg.AddMarkupOrThrow(Loc.GetString("research-console-menu-research-points-text",
             ("points", state.Points)));
         ResearchAmountLabel.SetMessage(amountMsg);
 
@@ -98,7 +98,7 @@ public void UpdateInformationPanel(ResearchConsoleBoundInterfaceState state)
         }
 
         var msg = new FormattedMessage();
-        msg.AddMarkup(Loc.GetString("research-console-menu-main-discipline",
+        msg.AddMarkupOrThrow(Loc.GetString("research-console-menu-main-discipline",
             ("name", disciplineText), ("color", disciplineColor)));
         MainDisciplineLabel.SetMessage(msg);
 

Content.Client/Research/UI/TechnologyCardControl.xaml.cs

@@ -23,7 +23,7 @@ public TechnologyCardControl(TechnologyPrototype technology, IPrototypeManager p
         DisciplineTexture.Texture = spriteSys.Frame0(discipline.Icon);
         TechnologyNameLabel.Text = Loc.GetString(technology.Name);
         var message = new FormattedMessage();
-        message.AddMarkup(Loc.GetString("research-console-tier-discipline-info",
+        message.AddMarkupOrThrow(Loc.GetString("research-console-tier-discipline-info",
             ("tier", technology.Tier), ("color", discipline.Color), ("discipline", Loc.GetString(discipline.Name))));
         TierLabel.SetMessage(message);
         UnlocksLabel.SetMessage(description);