Add ability to show stack visuals on closed containers

Content.Client/Storage/Systems/ItemCounterSystem.cs

@@ -1,5 +1,6 @@
 using Content.Shared.Rounding;
 using Content.Shared.Stacks;
+using Content.Shared.Storage;
 using Content.Shared.Storage.Components;
 using Content.Shared.Storage.EntitySystems;
 using Robust.Client.GameObjects;
@@ -31,7 +32,11 @@ private void OnAppearanceChange(EntityUid uid, ItemCounterComponent comp, ref Ap
 
         if (!_appearanceSystem.TryGetData<bool>(uid, StackVisuals.Hide, out var hidden, args.Component))
             hidden = false;
-
+
+        // try and use the container state if there is one
+        if (_appearanceSystem.TryGetData<bool>(uid, StorageVisuals.Open, out var openContainer, args.Component))
+            hidden = !openContainer && comp.OpenContainerOnly;
+
         if (comp.IsComposite)
             ProcessCompositeSprite(uid, actual, maxCount, comp.LayerStates, hidden, sprite: args.Sprite);
         else

Content.Shared/Storage/Components/ItemCounterComponent.cs

@@ -1,4 +1,4 @@
-using Content.Shared.Storage.EntitySystems;
+using Content.Shared.Storage.EntitySystems;
 using Content.Shared.Whitelist;
 
 namespace Content.Shared.Storage.Components
@@ -14,6 +14,7 @@ namespace Content.Shared.Storage.Components
     ///    amount: 6 # Note: this field can be omitted.
     ///    count:
     ///      tags: [Cigarette]
+    ///    openContainerOnly: true
     /// </code>
     [RegisterComponent]
     [Access(typeof(SharedItemCounterSystem))]
@@ -56,5 +57,13 @@ public sealed partial class ItemCounterComponent : Component
         [DataField("layerStates")]
         [ViewVariables(VVAccess.ReadWrite)]
         public List<string> LayerStates = new();
+
+        /// <summary>
+        /// If the component has a storage component, show sprite layers for counting on open storage only, 
+        /// Defaults to true
+        /// </summary>
+        [DataField("openContainerOnly")]
+        [ViewVariables(VVAccess.ReadWrite)]
+        public bool OpenContainerOnly = true;
     }
 }

Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs

@@ -800,7 +800,6 @@ public void UpdateAppearance(Entity<StorageComponent?, AppearanceComponent?> ent
         _appearance.SetData(uid, StorageVisuals.Capacity, capacity, appearance);
         _appearance.SetData(uid, StorageVisuals.Open, isOpen, appearance);
         _appearance.SetData(uid, SharedBagOpenVisuals.BagState, isOpen ? SharedBagState.Open : SharedBagState.Closed, appearance);
-        _appearance.SetData(uid, StackVisuals.Hide, !isOpen, appearance);
     }
 
     /// <summary>

Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml

@@ -440,6 +440,7 @@
     count:
       tags: [Cola]
     composite: true
+    openContainerOnly: false
     layerStates:
     - 6pack1
     - 6pack2