use unused filled chemmaster sprite (#2729)

* use unused filled chemmaster sprite * map BeakerInserted layer * Update Resources/Prototypes/Entities/Structures/Machines/chem_master.yml Co-authored-by: Dvir <[email protected]> * Update Resources/Prototypes/Entities/Structures/Machines/chem_master.yml Co-authored-by: Dvir <[email protected]> * Apply suggestions from code review Co-authored-by: Dvir <[email protected]> --------- Co-authored-by: Whatstone <[email protected]> Co-authored-by: Dvir <[email protected]>
new-frontiers-14 · Jan 19, 2025 · 84f6940 · 84f6940
1 parent 86f1fa3
commit 84f6940
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs b/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs
@@ -32,6 +32,7 @@ public sealed class ChemMasterSystem : EntitySystem
     {
         [Dependency] private readonly PopupSystem _popupSystem = default!;
         [Dependency] private readonly AudioSystem _audioSystem = default!;
+        [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!; // Frontier
         [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
         [Dependency] private readonly ItemSlotsSystem _itemSlotsSystem = default!;
         [Dependency] private readonly UserInterfaceSystem _userInterfaceSystem = default!;
@@ -70,6 +71,7 @@ private void UpdateUiState(Entity<ChemMasterComponent> ent, bool updateLabel = f
             if (!_solutionContainerSystem.TryGetSolution(owner, SharedChemMaster.BufferSolutionName, out _, out var bufferSolution))
                 return;
             var inputContainer = _itemSlotsSystem.GetItemOrNull(owner, SharedChemMaster.InputSlotName);
+            _appearanceSystem.SetData(owner, ChemMasterVisualState.BeakerInserted, inputContainer.HasValue); // Frontier
             var outputContainer = _itemSlotsSystem.GetItemOrNull(owner, SharedChemMaster.OutputSlotName);
 
             var bufferReagents = bufferSolution.Contents;

diff --git a/Content.Shared/Chemistry/SharedChemMaster.cs b/Content.Shared/Chemistry/SharedChemMaster.cs
@@ -40,6 +40,12 @@ public ChemMasterSetPillTypeMessage(uint pillType)
         }
     }
 
+    [Serializable, NetSerializable]
+    public enum ChemMasterVisualState : byte // Frontier
+    {
+        BeakerInserted
+    }
+
     [Serializable, NetSerializable]
     public sealed class ChemMasterReagentAmountButtonMessage : BoundUserInterfaceMessage
     {

diff --git a/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml b/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
@@ -11,6 +11,7 @@
     snapCardinals: true
     layers:
     - state: mixer_empty
+      map: ["BeakerInserted"] # Frontier
     - state: mixer_screens
       shader: unshaded
       map: ["enum.PowerDeviceVisualLayers.Powered"]
@@ -61,6 +62,10 @@
         enum.PowerDeviceVisualLayers.Powered:
           True: { visible: true }
           False: { visible: false }
+      enum.ChemMasterVisualState.BeakerInserted: # Frontier
+        BeakerInserted: # Frontier
+          True: {state: "mixer_loaded"} # Frontier
+          False: {state: "mixer_empty"} # Frontier
   # Machine / Construction stuff
   - type: WiresPanel
   - type: Machine