Toggleable Hardsuit Helmets (#7559)

Content.Shared/Actions/ActionTypes/ActionType.cs

@@ -89,6 +89,17 @@ public abstract class ActionType : IEquatable<ActionType>, IComparable, ICloneab
     /// </summary>
     public EntityUid? Provider;
 
+    /// <summary>
+    ///     Entity to use for the action icon. Defaults to using <see cref="Provider"/>. 
+    /// </summary>
+    public EntityUid? EntityIcon
+    {
+        get => _entityIcon ?? Provider;
+        set => _entityIcon = value;
+    }
+
+    private EntityUid? _entityIcon;
+
     /// <summary>
     ///     Whether the action system should block this action if the user cannot currently interact. Some spells or
     ///     abilities may want to disable this and implement their own checks.
@@ -255,6 +266,7 @@ public abstract class ActionType : IEquatable<ActionType>, IComparable, ICloneab
         Popup = toClone.Popup;
         PopupToggleSuffix = toClone.PopupToggleSuffix;
         ItemIconStyle = toClone.ItemIconStyle;
+        _entityIcon = toClone._entityIcon;
     }
 
     public bool Equals(ActionType? other)

Content.Shared/Actions/SharedActionsSystem.cs

@@ -43,7 +43,7 @@ public abstract class SharedActionsSystem : EntitySystem
     }
 
     #region ComponentStateManagement
-    protected virtual void Dirty(ActionType action)
+    public virtual void Dirty(ActionType action)
     {
         if (action.AttachedEntity == null)
             return;