Merge branch 'space-wizards:master' into master

Author: Azrakoth

Content.Client/Atmos/UI/GasPressurePumpBoundUserInterface.cs

@@ -1,8 +1,7 @@
-using Content.Shared.Atmos;
+using Content.Shared.Atmos;
 using Content.Shared.Atmos.Components;
 using Content.Shared.Atmos.Piping.Binary.Components;
 using Content.Shared.IdentityManagement;
-using Content.Shared.Localizations;
 using JetBrains.Annotations;
 using Robust.Client.UserInterface;
 

Content.Client/Cargo/Systems/CargoSystem.Telepad.cs

@@ -67,16 +67,18 @@ private void OnChangeData(EntityUid uid, SpriteComponent? sprite = null)
         if (!Resolve(uid, ref sprite))
             return;
 
+        if (!TryComp<AnimationPlayerComponent>(uid, out var player))
+            return;
+
         _appearance.TryGetData<CargoTelepadState?>(uid, CargoTelepadVisuals.State, out var state);
-        AnimationPlayerComponent? player = null;
 
         switch (state)
         {
             case CargoTelepadState.Teleporting:
                 if (_player.HasRunningAnimation(uid, TelepadBeamKey))
                     return;
                 _player.Stop(uid, player, TelepadIdleKey);
-                _player.Play(uid, player, CargoTelepadBeamAnimation, TelepadBeamKey);
+                _player.Play((uid, player), CargoTelepadBeamAnimation, TelepadBeamKey);
                 break;
             case CargoTelepadState.Unpowered:
                 sprite.LayerSetVisible(CargoTelepadLayers.Beam, false);
@@ -90,7 +92,7 @@ private void OnChangeData(EntityUid uid, SpriteComponent? sprite = null)
                     _player.HasRunningAnimation(uid, player, TelepadBeamKey))
                     return;
 
-                _player.Play(uid, player, CargoTelepadIdleAnimation, TelepadIdleKey);
+                _player.Play((uid, player), CargoTelepadIdleAnimation, TelepadIdleKey);
                 break;
         }
     }

Content.Client/Chat/UI/EmotesMenu.xaml

@@ -6,14 +6,14 @@
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
-using Robust.Client.Utility;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 using System.Linq;
 using System.Numerics;
 using Content.Shared.FixedPoint;
 using Robust.Client.Graphics;
 using static Robust.Client.UserInterface.Controls.BoxContainer;
+using Robust.Client.GameObjects;
 
 namespace Content.Client.Chemistry.UI
 {
@@ -24,6 +24,10 @@ namespace Content.Client.Chemistry.UI
     public sealed partial class ChemMasterWindow : FancyWindow
     {
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+        [Dependency] private readonly IEntityManager _entityManager = default!;
+
+        private readonly SpriteSystem _sprite;
+
         public event Action<BaseButton.ButtonEventArgs, ReagentButton>? OnReagentButtonPressed;
         public readonly Button[] PillTypeButtons;
 
@@ -38,6 +42,8 @@ public ChemMasterWindow()
             RobustXamlLoader.Load(this);
             IoCManager.InjectDependencies(this);
 
+            _sprite = _entityManager.System<SpriteSystem>();
+
             // Pill type selection buttons, in total there are 20 pills.
             // Pill rsi file should have states named as pill1, pill2, and so on.
             var resourcePath = new ResPath(PillsRsiPath);
@@ -69,7 +75,7 @@ public ChemMasterWindow()
                 var specifier = new SpriteSpecifier.Rsi(resourcePath, "pill" + (i + 1));
                 TextureRect pillTypeTexture = new TextureRect
                 {
-                    Texture = specifier.Frame0(),
+                    Texture = _sprite.Frame0(specifier),
                     TextureScale = new Vector2(1.75f, 1.75f),
                     Stretch = TextureRect.StretchMode.KeepCentered,
                 };

Content.Client/Chat/UI/EmotesMenu.xaml.cs

@@ -1,4 +1,4 @@
-using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Components;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
 using Robust.Shared.Timing;
@@ -37,7 +37,7 @@ public override void Update(float frameTime)
             if (TryComp(uid, out AnimationPlayerComponent? animPlayer)
                 && !AnimationSystem.HasRunningAnimation(uid, animPlayer, FoamVisualsComponent.AnimationKey))
             {
-                AnimationSystem.Play(uid, animPlayer, comp.Animation, FoamVisualsComponent.AnimationKey);
+                AnimationSystem.Play((uid, animPlayer), comp.Animation, FoamVisualsComponent.AnimationKey);
             }
         }
     }

Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs

@@ -1,4 +1,4 @@
-using Content.Shared.Vapor;
+using Content.Shared.Vapor;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
 
@@ -41,7 +41,7 @@ private void OnComponentInit(EntityUid uid, VaporVisualsComponent comp, Componen
             TryComp<AnimationPlayerComponent>(uid, out var animPlayer) &&
             !AnimationSystem.HasRunningAnimation(uid, animPlayer, VaporVisualsComponent.AnimationKey))
         {
-            AnimationSystem.Play(uid, animPlayer, comp.VaporFlick, VaporVisualsComponent.AnimationKey);
+            AnimationSystem.Play((uid, animPlayer), comp.VaporFlick, VaporVisualsComponent.AnimationKey);
         }
     }
 

Content.Client/Chemistry/Visualizers/FoamVisualizerSystem.cs

@@ -1,11 +1,7 @@
-using Content.Client.ContextMenu.UI;
-using Content.Client.Stylesheets;
 using Content.Shared.Verbs;
-using Robust.Client.AutoGenerated;
-using Robust.Client.Graphics;
+using Robust.Client.GameObjects;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
-using Robust.Client.UserInterface.XAML;
 using Robust.Client.Utility;
 using Robust.Shared.Utility;
 
@@ -27,14 +23,16 @@ public sealed class ExamineButton : ContainerButton
     public TextureRect Icon;
 
     public ExamineVerb Verb;
+    private SpriteSystem _sprite;
 
-    public ExamineButton(ExamineVerb verb)
+    public ExamineButton(ExamineVerb verb, SpriteSystem spriteSystem)
     {
         Margin = new Thickness(Thickness, Thickness, Thickness, Thickness);
 
         SetOnlyStyleClass(StyleClassExamineButton);
 
         Verb = verb;
+        _sprite = spriteSystem;
 
         if (verb.Disabled)
         {
@@ -61,7 +59,7 @@ public ExamineButton(ExamineVerb verb)
 
         if (verb.Icon != null)
         {
-            Icon.Texture = verb.Icon.Frame0();
+            Icon.Texture = _sprite.Frame0(verb.Icon);
             Icon.Stretch = TextureRect.StretchMode.KeepAspectCentered;
 
             AddChild(Icon);

Content.Client/Chemistry/Visualizers/VaporVisualizerSystem.cs

@@ -30,6 +30,7 @@ public sealed class ExamineSystem : ExamineSystemShared
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IEyeManager _eyeManager = default!;
         [Dependency] private readonly VerbSystem _verbSystem = default!;
+        [Dependency] private readonly SpriteSystem _sprite = default!;
 
         public const string StyleClassEntityTooltip = "entity-tooltip";
 
@@ -332,7 +333,7 @@ private void AddVerbsToTooltip(IEnumerable<Verb> verbs)
                 if (!examine.ShowOnExamineTooltip)
                     continue;
 
-                var button = new ExamineButton(examine);
+                var button = new ExamineButton(examine, _sprite);
 
                 if (examine.HoverVerb)
                 {

Content.Client/Examine/ExamineButton.cs

@@ -85,7 +85,7 @@ public void PlayAnimation(EntityUid uid, RotatingLightComponent? comp = null, An
 
         if (!_animations.HasRunningAnimation(uid, player, AnimKey))
         {
-            _animations.Play(uid, player, GetAnimation(comp.Speed), AnimKey);
+            _animations.Play((uid, player), GetAnimation(comp.Speed), AnimKey);
         }
     }
 }