Toggleable Hardsuit Helmets (#7559)

Content.Client/Actions/ActionsSystem.cs

@@ -118,7 +118,7 @@ namespace Content.Client.Actions
             SubscribeLocalEvent<ActionsComponent, ComponentHandleState>(HandleState);
         }
 
-        protected override void Dirty(ActionType action)
+        public override void Dirty(ActionType action)
         {
             // Should only ever receive component states for attached player's component.
             // --> lets not bother unnecessarily dirtying and prediction-resetting actions for other players.

Content.Client/Actions/UI/ActionMenuItem.cs

@@ -129,7 +129,7 @@ namespace Content.Client.Actions.UI
                 _smallActionIcon.Texture = null;
                 _smallActionIcon.Visible = false;
             }
-            else if (Action.Provider != null && Action.ItemIconStyle == ItemActionIconStyle.BigItem)
+            else if (Action.EntityIcon != null && Action.ItemIconStyle == ItemActionIconStyle.BigItem)
             {
                 _smallActionIcon.Texture = texture;
                 _smallActionIcon.Modulate = Action.IconColor;
@@ -149,7 +149,7 @@ namespace Content.Client.Actions.UI
 
         private void UpdateItemIcon()
         {
-            if (Action?.Provider == null || !IoCManager.Resolve<IEntityManager>().TryGetComponent(Action.Provider.Value, out SpriteComponent sprite))
+            if (Action?.EntityIcon == null || !IoCManager.Resolve<IEntityManager>().TryGetComponent(Action.EntityIcon.Value, out SpriteComponent sprite))
             {
                 _bigItemSpriteView.Visible = false;
                 _bigItemSpriteView.Sprite = null;

Content.Client/Actions/UI/ActionSlot.cs

@@ -402,7 +402,7 @@ namespace Content.Client.Actions.UI
                 _smallActionIcon.Texture = null;
                 _smallActionIcon.Visible = false;
             }
-            else if (Action.Provider != null && Action.ItemIconStyle == ItemActionIconStyle.BigItem)
+            else if (Action.EntityIcon != null && Action.ItemIconStyle == ItemActionIconStyle.BigItem)
             {
                 _smallActionIcon.Texture = texture;
                 _smallActionIcon.Modulate = Action.IconColor;
@@ -422,7 +422,7 @@ namespace Content.Client.Actions.UI
 
         private void UpdateItemIcon()
         {
-            if (Action?.Provider == null || !IoCManager.Resolve<IEntityManager>().TryGetComponent(Action.Provider.Value, out SpriteComponent sprite))
+            if (Action?.EntityIcon == null || !IoCManager.Resolve<IEntityManager>().TryGetComponent(Action.EntityIcon.Value, out SpriteComponent sprite))
             {
                 _bigItemSpriteView.Visible = false;
                 _bigItemSpriteView.Sprite = null;

Content.Client/Clothing/ClothingComponent.cs

@@ -14,9 +14,6 @@ namespace Content.Client.Clothing
         [DataField("femaleMask")]
         public FemaleClothingMask FemaleMask { get; } = FemaleClothingMask.UniformFull;
 
-        [DataField("quickEquip")]
-        public bool QuickEquip = true;
-
         public string? InSlot;
     }
 

Content.Server/Administration/Commands/SetOutfitCommand.cs

@@ -92,7 +92,7 @@ namespace Content.Server.Administration.Commands
             {
                 foreach (var slot in slotDefinitions)
                 {
-                    invSystem.TryUnequip(target, slot.Name, true, true, inventoryComponent);
+                    invSystem.TryUnequip(target, slot.Name, true, true, false, inventoryComponent);
                     var gearStr = startingGear.GetGear(slot.Name, profile);
                     if (gearStr == string.Empty)
                     {

Content.Server/Clothing/Components/ClothingComponent.cs

@@ -16,9 +16,6 @@ namespace Content.Server.Clothing.Components
         [DataField("HeatResistance")]
         private int _heatResistance = 323;
 
-        [DataField("quickEquip")]
-        public bool QuickEquip = true;
-
         [ViewVariables(VVAccess.ReadWrite)]
         public int HeatResistance => _heatResistance;
     }

Content.Server/Disease/Zombie/DiseaseZombieSystem.cs

@@ -98,7 +98,7 @@ namespace Content.Server.Disease.Zombie
             }
 
             if (TryComp<ServerInventoryComponent>(uid, out var servInvComp))
-                _serverInventory.TryUnequip(uid, "gloves", true, true, servInvComp);
+                _serverInventory.TryUnequip(uid, "gloves", true, true, predicted: false, servInvComp);
 
             _popupSystem.PopupEntity(Loc.GetString("zombie-transform", ("target", uid)), uid, Filter.Pvs(uid));
 

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;

Content.Shared/Clothing/Components/AttachedClothingComponent.cs

@@ -0,0 +1,20 @@
+using Content.Shared.Clothing.EntitySystems;
+
+namespace Content.Shared.Clothing.Components;
+
+/// <summary>
+///     This component indicates that this clothing is attached to some other entity with a <see
+///     cref="ToggleableClothingComponent"/>. When unequipped, this entity should be returned to the entity that it is
+///     attached to, rather than being dumped on the floor or something like that. Intended for use with hardsuits and
+///     hardsuit helmets.
+/// </summary>
+[Friend(typeof(ToggleableClothingSystem))]
+[RegisterComponent]
+public sealed class AttachedClothingComponent : Component
+{
+    /// <summary>
+    ///     The Id of the piece of clothing that this entity belongs to.
+    /// </summary>
+    [DataField("AttachedUid")]
+    public EntityUid AttachedUid = default!;
+}

Content.Shared/Clothing/Components/ToggleableClothingComponent.cs

@@ -0,0 +1,59 @@
+using Content.Shared.Actions.ActionTypes;
+using Content.Shared.Clothing.EntitySystems;
+using Content.Shared.Inventory;
+using Robust.Shared.Containers;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
+namespace Content.Shared.Clothing.Components;
+
+/// <summary>
+///     This component gives an item an action that will equip or un-equip some clothing. Intended for use with
+///     hardsuits and hardsuit helmets.
+/// </summary>
+[Friend(typeof(ToggleableClothingSystem))]
+[RegisterComponent]
+public sealed class ToggleableClothingComponent : Component
+{
+    public const string DefaultClothingContainerId = "toggleable-clothing";
+
+    /// <summary>
+    ///     Action used to toggle the clothing on or off.
+    /// </summary>
+    [DataField("actionId", customTypeSerializer: typeof(PrototypeIdSerializer<InstantActionPrototype>))]
+    public string ActionId = "ToggleSuitHelmet";
+    public InstantAction? ToggleAction = null;
+
+    /// <summary>
+    ///     Default clothing entity prototype to spawn into the clothing container.
+    /// </summary>
+    [DataField("clothingPrototype", required: true, customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
+    public readonly string ClothingPrototype = default!;
+
+    /// <summary>
+    ///     The inventory slot that the clothing is equipped to.
+    /// </summary>
+    [DataField("slot")]
+    public string Slot = "head";
+
+    /// <summary>
+    ///     The inventory slot flags required for this component to function.
+    /// </summary>
+    [DataField("requiredSlot")]
+    public SlotFlags RequiredFlags = SlotFlags.OUTERCLOTHING;
+
+    /// <summary>
+    ///     The container that the clothing is stored in when not equipped.
+    /// </summary>
+    [DataField("containerId")]
+    public string ContainerId = DefaultClothingContainerId;
+
+    public ContainerSlot? Container;
+
+    /// <summary>
+    ///     The Id of the piece of clothing that belongs to this component. Required for map-saving if the clothing is
+    ///     currently not inside of the container.
+    /// </summary>
+    [DataField("clothingUid")]
+    public EntityUid? ClothingUid;
+}

Content.Shared/Clothing/EntitySystems/ToggleableClothingSystem.cs

@@ -0,0 +1,208 @@
+using Content.Shared.Actions;
+using Content.Shared.Actions.ActionTypes;
+using Content.Shared.Clothing.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Inventory;
+using Content.Shared.Inventory.Events;
+using Content.Shared.Popups;
+using Robust.Shared.Containers;
+using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Clothing.EntitySystems;
+
+public sealed class ToggleableClothingSystem : EntitySystem
+{
+    [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
+    [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
+    [Dependency] private readonly InventorySystem _inventorySystem = default!;
+    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
+    [Dependency] private readonly IPrototypeManager _proto = default!;
+
+    private Queue<EntityUid> _toInsert = new();
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ToggleableClothingComponent, ComponentAdd>(OnAdd);
+        SubscribeLocalEvent<ToggleableClothingComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<ToggleableClothingComponent, ToggleClothingEvent>(OnToggleClothing);
+        SubscribeLocalEvent<ToggleableClothingComponent, GetItemActionsEvent>(OnGetActions);
+        SubscribeLocalEvent<ToggleableClothingComponent, ComponentRemove>(OnRemoveToggleable);
+        SubscribeLocalEvent<ToggleableClothingComponent, GotUnequippedEvent>(OnToggleableUnequip);
+
+        SubscribeLocalEvent<AttachedClothingComponent, InteractHandEvent>(OnInteractHand);
+        SubscribeLocalEvent<AttachedClothingComponent, GotUnequippedEvent>(OnAttachedUnequip);
+        SubscribeLocalEvent<AttachedClothingComponent, ComponentRemove>(OnRemoveAttached);
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        // process delayed insertions. Avoids doing a container insert during a container removal.
+        while (_toInsert.TryDequeue(out var uid))
+        {
+            if (TryComp(uid, out ToggleableClothingComponent? component) && component.ClothingUid != null)
+                component.Container?.Insert(component.ClothingUid.Value);
+        }
+    }
+
+    private void OnInteractHand(EntityUid uid, AttachedClothingComponent component, InteractHandEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        if (!TryComp(component.AttachedUid, out ToggleableClothingComponent? toggleCom)
+            || toggleCom.Container == null)
+            return;
+
+        if (!_inventorySystem.TryUnequip(Transform(uid).ParentUid, toggleCom.Slot, force: true))
+            return;
+
+        toggleCom.Container.Insert(uid, EntityManager);
+        args.Handled = true;
+    }
+
+    /// <summary>
+    ///     Called when the suit is unequipped, to ensure that the helmet also gets unequipped.
+    /// </summary>
+    private void OnToggleableUnequip(EntityUid uid, ToggleableClothingComponent component, GotUnequippedEvent args)
+    {
+        if (component.Container != null && component.Container.ContainedEntity != null && component.ClothingUid != null)
+            _inventorySystem.TryUnequip(args.Equipee, component.Slot, force: true);
+    }
+
+    private void OnRemoveToggleable(EntityUid uid, ToggleableClothingComponent component, ComponentRemove args)
+    {
+        // If the parent/owner component of the attached clothing is being removed (entity getting deleted?) we will
+        // delete the attached entity. We do this regardless of whether or not the attached entity is currently
+        // "outside" of the container or not. This means that if a hardsuit takes too much damage, the helmet will also
+        // automatically be deleted.
+
+        // remove action.
+        if (component.ToggleAction?.AttachedEntity != null)
+            _actionsSystem.RemoveAction(component.ToggleAction.AttachedEntity.Value, component.ToggleAction);
+
+        if (component.ClothingUid != null)
+            QueueDel(component.ClothingUid.Value);
+    }
+
+    private void OnRemoveAttached(EntityUid uid, AttachedClothingComponent component, ComponentRemove args)
+    {
+        // if the attached component is being removed (maybe entity is being deleted?) we will just remove the
+        // toggleable clothing component. This means if you had a hard-suit helmet that took too much damage, you would
+        // still be left with a suit that was simply missing a helmet. There is currently no way to fix a partially
+        // broken suit like this.
+
+        if (!TryComp(component.AttachedUid, out ToggleableClothingComponent? toggleComp))
+            return;
+
+        if (toggleComp.LifeStage > ComponentLifeStage.Running)
+            return;
+
+        // remove action.
+        if (toggleComp.ToggleAction?.AttachedEntity != null)
+            _actionsSystem.RemoveAction(toggleComp.ToggleAction.AttachedEntity.Value, toggleComp.ToggleAction);
+
+        RemComp(component.AttachedUid, toggleComp);
+    }
+
+    /// <summary>
+    ///     Called if the helmet was unequipped, to ensure that it gets moved into the suit's container.
+    /// </summary>
+    private void OnAttachedUnequip(EntityUid uid, AttachedClothingComponent component, GotUnequippedEvent args)
+    {
+        if (component.LifeStage > ComponentLifeStage.Running)
+            return;
+
+        if (!TryComp(component.AttachedUid, out ToggleableClothingComponent? toggleComp))
+            return;
+
+        if (toggleComp.LifeStage > ComponentLifeStage.Running)
+            return;
+
+        // As unequipped gets called in the middle of container removal, we cannot call a container-insert without causing issues.
+        // So we delay it and process it during a system update:
+        _toInsert.Enqueue(component.AttachedUid);
+    }
+
+    /// <summary>
+    ///     Equip or unequip the toggleable clothing.
+    /// </summary>
+    private void OnToggleClothing(EntityUid uid, ToggleableClothingComponent component, ToggleClothingEvent args)
+    {
+        if (args.Handled || component.Container == null || component.ClothingUid == null)
+            return;
+
+        var parent = Transform(uid).ParentUid;
+        if (component.Container.ContainedEntity == null)
+            _inventorySystem.TryUnequip(parent, component.Slot);
+        else if (_inventorySystem.TryGetSlotEntity(parent, component.Slot, out var existing))
+        {
+            _popupSystem.PopupEntity(Loc.GetString("toggleable-clothing-remove-first", ("entity", existing)),
+                args.Performer, Filter.Entities(args.Performer));
+        }
+        else
+            _inventorySystem.TryEquip(parent, component.ClothingUid.Value, component.Slot);
+
+        args.Handled = true;
+    }
+
+    private void OnGetActions(EntityUid uid, ToggleableClothingComponent component, GetItemActionsEvent args)
+    {
+        if (component.ClothingUid == null || (args.SlotFlags & component.RequiredFlags) != component.RequiredFlags)
+            return;
+
+        if (component.ToggleAction != null)
+            args.Actions.Add(component.ToggleAction);
+    }
+
+    private void OnAdd(EntityUid uid, ToggleableClothingComponent component, ComponentAdd args)
+    {
+        component.Container = _containerSystem.EnsureContainer<ContainerSlot>(uid, component.ContainerId);
+    }
+
+    /// <summary>
+    ///     On map init, either spawn the appropriate entity into the suit slot, or if it already exists, perform some
+    ///     sanity checks. Also updates the action icon to show the toggled-entity.
+    /// </summary>
+    private void OnMapInit(EntityUid uid, ToggleableClothingComponent component, MapInitEvent args)
+    {
+        if (component.Container!.ContainedEntity is EntityUid ent)
+        {
+            DebugTools.Assert(component.ClothingUid == ent, "Unexpected entity present inside of a toggleable clothing container.");
+            return;
+        }
+
+        if (component.ToggleAction == null
+            && _proto.TryIndex(component.ActionId, out InstantActionPrototype? act))
+        {
+            component.ToggleAction = new(act);
+        }
+
+        if (component.ClothingUid != null && component.ToggleAction != null)
+        {
+            DebugTools.Assert(Exists(component.ClothingUid), "Toggleable clothing is missing expected entity.");
+            DebugTools.Assert(TryComp(component.ClothingUid, out AttachedClothingComponent? comp), "Toggleable clothing is missing an attached component");
+            DebugTools.Assert(comp?.AttachedUid == uid, "Toggleable clothing uid mismatch");
+        }
+        else
+        {
+            var xform = Transform(uid);
+            component.ClothingUid = Spawn(component.ClothingPrototype, xform.Coordinates);
+            EnsureComp<AttachedClothingComponent>(component.ClothingUid.Value).AttachedUid = uid;
+            component.Container.Insert(component.ClothingUid.Value, EntityManager, ownerTransform: xform);
+        }
+
+        if (component.ToggleAction != null)
+        {
+            component.ToggleAction.EntityIcon = component.ClothingUid;
+            _actionsSystem.Dirty(component.ToggleAction);
+        }
+    }
+}
+
+public sealed class ToggleClothingEvent : InstantActionEvent { }

Content.Shared/Hands/EntitySystems/SharedHandsSystem.Pickup.cs

@@ -90,7 +90,7 @@ public abstract partial class SharedHandsSystem : EntitySystem
         if (handContainer == null || handContainer.ContainedEntity != null)
             return false;
 
-        if (!Resolve(entity, ref item, false))
+        if (!Resolve(entity, ref item, false) || !item.CanPickup)
             return false;
 
         if (TryComp(entity, out PhysicsComponent? physics) && physics.BodyType == BodyType.Static)

Content.Shared/Inventory/InventorySystem.Equip.cs

@@ -1,4 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
+using Content.Shared.Clothing.Components;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Interaction;
@@ -11,6 +12,7 @@ using Content.Shared.Strip.Components;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
 using Robust.Shared.Map;
+using Robust.Shared.Network;
 using Robust.Shared.Player;
 using Robust.Shared.Timing;
 
@@ -24,6 +26,7 @@ public abstract partial class InventorySystem
     [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
     [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
     [Dependency] private readonly IGameTiming _gameTiming = default!;
+    [Dependency] private readonly INetManager _netMan = default!;
 
     private void InitializeEquip()
     {
@@ -48,6 +51,10 @@ public abstract partial class InventorySystem
 
             if (TryGetSlotEntity(args.User, slotDef.Name, out var slotEntity, inv))
             {
+                // Item in slot has to be quick equipable as well
+                if (TryComp(slotEntity, out SharedItemComponent? item) && !item.QuickEquip)
+                    continue;
+
                 if (!TryUnequip(args.User, slotDef.Name, true, inventory: inv))
                     continue;
 
@@ -175,11 +182,18 @@ public abstract partial class InventorySystem
 
         if(!silent && item.EquipSound != null && _gameTiming.IsFirstTimePredicted)
         {
-            var filter = Filter.Pvs(target);
+            Filter filter;
 
-            // don't play double audio for predicted interactions
+            if (_netMan.IsClient)
-            if (predicted)
+                filter = Filter.Local();
-                filter.RemoveWhereAttachedEntity(entity => entity == actor);
+            else
+            {
+                filter = Filter.Pvs(target);
+
+                // don't play double audio for predicted interactions
+                if (predicted)
+                    filter.RemoveWhereAttachedEntity(entity => entity == actor);
+            }
 
             SoundSystem.Play(filter, item.EquipSound.GetSound(), target, AudioParams.Default.WithVolume(-2f));
         }
@@ -193,6 +207,11 @@ public abstract partial class InventorySystem
 
     public bool CanAccess(EntityUid actor, EntityUid target, EntityUid itemUid)
     {
+        // if the item is something like a hardsuit helmet, it may be contained within the hardsuit.
+        // in that case, we check accesibility for the owner-entity instead.
+        if (TryComp(itemUid, out AttachedClothingComponent? attachedComp))
+            itemUid = attachedComp.AttachedUid;
+
         // Can the actor reach the target?
         if (actor != target && !(_interactionSystem.InRangeUnobstructed(actor, target) && _containerSystem.IsInSameOrParentContainer(actor, target)))
             return false;
@@ -273,18 +292,18 @@ public abstract partial class InventorySystem
         return true;
     }
 
-    public bool TryUnequip(EntityUid uid, string slot, bool silent = false, bool force = false,
+    public bool TryUnequip(EntityUid uid, string slot, bool silent = false, bool force = false, bool predicted = false,
-        InventoryComponent? inventory = null) => TryUnequip(uid, uid, slot, silent, force, inventory);
+        InventoryComponent? inventory = null, SharedItemComponent? item = null) => TryUnequip(uid, uid, slot, silent, force, predicted, inventory, item);
 
     public bool TryUnequip(EntityUid actor, EntityUid target, string slot, bool silent = false,
-        bool force = false, InventoryComponent? inventory = null) =>
+        bool force = false, bool predicted = false, InventoryComponent? inventory = null, SharedItemComponent? item = null) =>
-        TryUnequip(actor, target, slot, out _, silent, force, inventory);
+        TryUnequip(actor, target, slot, out _, silent, force, predicted, inventory, item);
 
-    public bool TryUnequip(EntityUid uid, string slot, [NotNullWhen(true)] out EntityUid? removedItem, bool silent = false, bool force = false,
+    public bool TryUnequip(EntityUid uid, string slot, [NotNullWhen(true)] out EntityUid? removedItem, bool silent = false, bool force = false, bool predicted = false,
-        InventoryComponent? inventory = null) => TryUnequip(uid, uid, slot, out removedItem, silent, force, inventory);
+        InventoryComponent? inventory = null, SharedItemComponent? item = null) => TryUnequip(uid, uid, slot, out removedItem, silent, force, predicted, inventory, item);
 
     public bool TryUnequip(EntityUid actor, EntityUid target, string slot, [NotNullWhen(true)] out EntityUid? removedItem, bool silent = false,
-        bool force = false, InventoryComponent? inventory = null)
+        bool force = false, bool predicted = false, InventoryComponent? inventory = null, SharedItemComponent? item = null)
     {
         removedItem = null;
         if (!Resolve(target, ref inventory, false))
@@ -321,7 +340,7 @@ public abstract partial class InventorySystem
             if (slotDef != slotDefinition && slotDef.DependsOn == slotDefinition.Name)
             {
                 //this recursive call might be risky
-                TryUnequip(actor, target, slotDef.Name, true, true, inventory);
+                TryUnequip(actor, target, slotDef.Name, true, true, predicted, inventory);
             }
         }
 
@@ -340,6 +359,24 @@ public abstract partial class InventorySystem
 
         Transform(removedItem.Value).Coordinates = Transform(target).Coordinates;
 
+        if (!silent && Resolve(removedItem.Value, ref item) && item.UnequipSound != null && _gameTiming.IsFirstTimePredicted)
+        {
+            Filter filter;
+
+            if (_netMan.IsClient)
+                filter = Filter.Local();
+            else
+            {
+                filter = Filter.Pvs(target);
+
+                // don't play double audio for predicted interactions
+                if (predicted)
+                    filter.RemoveWhereAttachedEntity(entity => entity == actor);
+            }
+
+            SoundSystem.Play(filter, item.UnequipSound.GetSound(), target, AudioParams.Default.WithVolume(-2f));
+        }
+
         inventory.Dirty();
 
         _movementSpeed.RefreshMovementSpeedModifiers(target);

Content.Shared/Item/SharedItemComponent.cs

@@ -37,6 +37,20 @@ namespace Content.Shared.Item
         [DataField("clothingVisuals")]
         public Dictionary<string, List<PrototypeLayerData>> ClothingVisuals = new();
 
+        /// <summary>
+        ///     Whether or not this item can be picked up.
+        /// </summary>
+        /// <remarks>
+        ///     This should almost always be true for items. But in some special cases, an item can be equipped but not
+        ///     picked up. E.g., hardsuit helmets are attached to the suit, so we want to disable things like the pickup
+        ///     verb.
+        /// </remarks>
+        [DataField("canPickup")]
+        public bool CanPickup = true;
+
+        [DataField("quickEquip")]
+        public bool QuickEquip = true;
+
         /// <summary>
         ///     Part of the state of the sprite shown on the player when this item is in their hands or inventory.
         /// </summary>
@@ -61,9 +75,12 @@ namespace Content.Shared.Item
         [DataField("Slots")]
         public SlotFlags SlotFlags = SlotFlags.PREVENTEQUIP; //Different from None, NONE allows equips if no slot flags are required
 
-        [DataField("EquipSound")]
+        [DataField("equipSound")]
         public SoundSpecifier? EquipSound { get; set; } = default!;
 
+        [DataField("unequipSound")]
+        public SoundSpecifier? UnequipSound = default!;
+        
         /// <summary>
         ///     Rsi of the sprite shown on the player when this item is in their hands. Used to generate a default entry for <see cref="InhandVisuals"/>
         /// </summary>

Content.Shared/Item/SharedItemSystem.cs

@@ -1,4 +1,3 @@
-using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Interaction;
 using Content.Shared.Inventory.Events;
@@ -27,7 +26,7 @@ namespace Content.Shared.Item
 
         private void OnHandInteract(EntityUid uid, SharedItemComponent component, InteractHandEvent args)
         {
-            if (args.Handled)
+            if (args.Handled || !component.CanPickup)
                 return;
 
             args.Handled = _handsSystem.TryPickup(args.User, uid, animateUser: false);
@@ -68,6 +67,7 @@ namespace Content.Shared.Item
                 args.Using != null ||
                 !args.CanAccess ||
                 !args.CanInteract ||
+                !component.CanPickup ||
                 !_handsSystem.CanPickupAnyHand(args.User, args.Target, handsComp: args.Hands, item: component))
                 return;
 

Resources/Audio/Mecha/license.txt

@@ -0,0 +1 @@
+mechmove03.ogg taken from TG station at commit https://github.com/tgstation/tgstation/commit/d4f678a1772007ff8d7eddd21cf7218c8e07bfc0

Resources/Locale/en-US/actions/actions/hardsuit.ftl

@@ -0,0 +1,2 @@
+action-name-hardsuit = Toggle Helmet
+action-description-hardsuit = Remember to equip the helmet before flinging yourself into space.

Resources/Locale/en-US/clothing/components/toggleable-clothing-component.ftl

@@ -0,0 +1,2 @@
+
+toggleable-clothing-remove-first = You have to unequip {$entity} first.

Resources/Prototypes/Actions/types.yml

@@ -15,6 +15,14 @@
   iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
   event: !type:ToggleActionEvent
 
+- type: instantAction
+  id: ToggleSuitHelmet
+  name: action-name-hardsuit
+  description: action-description-hardsuit
+  itemIconStyle: BigItem
+  useDelay: 1 # equip noise spam.
+  event: !type:ToggleClothingEvent
+
 - type: entityTargetAction
   id: Disarm
   name: action-name-disarm

Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml

@@ -189,4 +189,3 @@
   - type: StorageFill
     contents:
       - id: ClothingOuterHardsuitSyndie
-      - id: ClothingHeadHelmetHardsuitSyndie

Resources/Prototypes/Catalog/Fills/Crates/salvage.yml

@@ -7,7 +7,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingHeadHelmetHardsuitSalvage
       - id: ClothingOuterHardsuitSalvage
       - id: ClothingMaskBreath
       - id: OxygenTankFilled

Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml

@@ -9,7 +9,6 @@
       - id: ClothingOuterHardsuitSalvage
       - id: YellowOxygenTank
       - id: ClothingShoesBootsMag
-      - id: ClothingHeadHelmetHardsuitSalvage
       - id: ClothingMaskGasExplorer
 # Currently do not function as 'true' mesons, so they're useless for salvagers.
 #      - id: ClothingEyesGlassesMeson
@@ -17,6 +16,5 @@
       - id: FlashlightSeclite
       - id: SurvivalKnife
       - id: ClothingOuterHardsuitSpatio
-      - id: ClothingHeadHelmetHardsuitSpatio
 
 

Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml

@@ -78,7 +78,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingHeadHelmetHardsuitAtmos
       - id: ClothingOuterHardsuitAtmos
       - id: ClothingMaskGasAtmos
       - id: OxygenTankFilled

Resources/Prototypes/Catalog/Fills/Lockers/heads.yml

@@ -40,7 +40,6 @@
       - id: ClothingOuterHardsuitCap
       - id: ClothingMaskGasCaptain
       - id: TaserGun
-      - id: ClothingHeadHelmetHardsuitCap
       - id: CommsComputerCircuitboard
       - id: ClothingHeadsetAltCommand
       - id: SpaceCash1000
@@ -91,7 +90,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingHeadHelmetHardsuitEngineeringWhite
       - id: ClothingOuterHardsuitEngineeringWhite
       - id: ClothingMaskBreath
       - id: OxygenTankFilled
@@ -120,7 +118,6 @@
       - id: ClothingBackpackDuffelSurgeryFilled
       - id: ClothingOuterCoatLabCmo
       - id: ClothingMaskSterile
-      - id: ClothingHeadHelmetHardsuitMedical
       - id: ClothingOuterHardsuitMedical
       - id: DiagnoserMachineCircuitboard
       - id: VaccinatorMachineCircuitboard
@@ -142,7 +139,6 @@
       - id: CircuitImprinterMachineCircuitboard
       - id: ClothingNeckCloakRd
       - id: ClothingHeadsetMedicalScience
-      - id: ClothingHeadHelmetHardsuitRd
       - id: ClothingOuterHardsuitRd
       - id: PlushieSlime
         prob: 0.1
@@ -171,7 +167,6 @@
         prob: 0.1
       - id: ClothingUniformJumpskirtHoSParadeMale
         prob: 0.1
-      - id: ClothingHeadHelmetHardsuitSecurityRed
       - id: ClothingOuterHardsuitSecurityRed
       - id: ClothingMaskGasSecurity
       - id: ClothingShoeSlippersDuck

Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml

@@ -9,5 +9,5 @@
     Slots: [belt]
     size: 50
     quickEquip: false
-    EquipSound:
+    equipSound:
       path: /Audio/Items/belt_equip.ogg

Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml

@@ -48,9 +48,15 @@
   parent: ClothingHeadBase
   id: ClothingHeadHardsuitBase
   name: base hardsuit helmet
+  noSpawn: true
   components:
   - type: Clothing
+    #Apparently the hardsuit helmet equip sound is from a walking mech?
+    equipSound: /Audio/Mecha/mechmove03.ogg
+    unequipSound: /Audio/Mecha/mechmove03.ogg
     size: 15
+    canPickup: false # attached to suit.
+    quickEquip: false
   - type: PressureProtection
     highPressureMultiplier: 0.3
     lowPressureMultiplier: 1000
@@ -76,6 +82,7 @@
   parent: ClothingHeadHardsuitBase
   id: ClothingHeadHardsuitWithLightBase
   name: base hardsuit helmet with light
+  noSpawn: true
   components:
   - type: Sprite
     netsync: false

Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml

@@ -1,6 +1,7 @@
 - type: entity
   parent: ClothingHeadHardsuitWithLightBase
   id: ClothingHeadHelmetHardsuitAtmos
+  noSpawn: true
   name: atmos hardsuit helmet
   description: A special hardsuit helmet designed for working in low-pressure, high thermal environments.
   components:
@@ -62,6 +63,7 @@
 - type: entity
   parent: ClothingHeadHardsuitBase
   id: ClothingHeadHelmetHardsuitCap
+  noSpawn: true
   name: captain's hardsuit helmet
   description: Special hardsuit helmet, made for the captain of the station.
   components:
@@ -76,6 +78,7 @@
 - type: entity
   parent: HatBase
   id: ClothingHeadHelmetHardsuitDeathsquad
+  noSpawn: true
   name: deathsquad hardsuit helmet
   description: A robust helmet for special operations.
   components:
@@ -90,6 +93,7 @@
 - type: entity
   parent: ClothingHeadHardsuitWithLightBase
   id: ClothingHeadHelmetHardsuitEngineering
+  noSpawn: true
   name: engineering hardsuit helmet
   description: An engineering hardsuit helmet designed for working in low-pressure, high radioactive environments.
   components:
@@ -104,6 +108,7 @@
 - type: entity
   parent: ClothingHeadHardsuitWithLightBase
   id: ClothingHeadHelmetHardsuitEngineeringWhite
+  noSpawn: true
   name: chief engineer's hardsuit helmet
   description: Special hardsuit helmet, made for the chief engineer of the station.
   components:
@@ -118,6 +123,7 @@
 - type: entity
   parent: HatBase
   id: ClothingHeadHelmetIHSVoidHelm
+  noSpawn: true
   name: IHS voidhelm
   description: A robust, tactical IHS helmet.
   components:
@@ -132,6 +138,7 @@
 - type: entity
   parent: ClothingHeadHardsuitWithLightBase
   id: ClothingHeadHelmetHardsuitMedical
+  noSpawn: true
   name: chief medical officer's hardsuit helmet
   description: Lightweight medical hardsuit helmet that doesn't restrict your head movements.
   components:
@@ -148,6 +155,7 @@
 - type: entity
   parent: ClothingHeadHardsuitWithLightBase
   id: ClothingHeadHelmetHardsuitRd
+  noSpawn: true
   name: experimental research hardsuit helmet
   description: Lightweight hardsuit helmet that doesn't restrict your head movements.
   components:
@@ -162,6 +170,7 @@
 - type: entity
   parent: ClothingHeadHardsuitWithLightBase
   id: ClothingHeadHelmetHardsuitSalvage
+  noSpawn: true
   name: salvage hardsuit helmet
   description: A special helmet designed for work in a hazardous, low pressure environment. Has reinforced plating for wildlife encounters and dual floodlights.
   components:
@@ -176,6 +185,7 @@
 - type: entity
   parent: ClothingHeadHardsuitWithLightBase
   id: ClothingHeadHelmetHardsuitSecurity
+  noSpawn: true
   name: security hardsuit helmet
   description: Armored hardsuit helmet for security needs.
   components:
@@ -190,6 +200,7 @@
 - type: entity
   parent: ClothingHeadHardsuitWithLightBase
   id: ClothingHeadHelmetHardsuitSecurityRed
+  noSpawn: true
   name: head of security's hardsuit helmet
   description: Security hardsuit helmet with the latest top secret NT-HUD software. Belongs to the HoS.
   components:
@@ -204,6 +215,7 @@
 - type: entity
   parent: ClothingHeadHardsuitWithLightBase
   id: ClothingHeadHelmetHardsuitSyndie
+  noSpawn: true
   name: blood red hardsuit helmet
   description: An advanced red hardsuit helmet designed for work in special operations.
   components:
@@ -220,6 +232,7 @@
 - type: entity
   parent: ClothingHeadHardsuitWithLightBase
   id: ClothingHeadHelmetHardsuitWizard
+  noSpawn: true
   name: wizard hardsuit helmet
   description: A bizarre gem-encrusted helmet that radiates magical energies.
   components:
@@ -234,6 +247,7 @@
 - type: entity
   parent: ClothingHeadHardsuitBase
   id: ClothingHeadHelmetHardsuitLing
+  noSpawn: true
   name: organic space helmet
   description: A spaceworthy biomass of pressure and temperature resistant tissue.
   components:
@@ -248,6 +262,7 @@
 - type: entity
   parent: ClothingHeadHardsuitWithLightBase
   id: ClothingHeadHelmetHardsuitSpatio
+  noSpawn: true
   name: spationaut hardsuit helmet
   description: A sturdy helmet designed for complex industrial operations in space. 
   components:

Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml

@@ -35,6 +35,7 @@
         Radiation: 0.25
   - type: DiseaseProtection
     protection: 0.05
+  - type: ToggleableClothing
 
 - type: entity
   abstract: true

Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml

@@ -26,7 +26,9 @@
     coefficient: 0.01
   - type: ExplosionResistance
     resistance: 0.8
-    
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetHardsuitAtmos
+
 - type: entity
   parent: ClothingOuterHardsuitBase
   id: ClothingOuterHardsuitCap
@@ -53,6 +55,8 @@
         Radiation: 0.1
   - type: ExplosionResistance
     resistance: 0.5
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetHardsuitCap
 
 - type: entity
   parent: ClothingOuterHardsuitBase
@@ -80,6 +84,8 @@
         Radiation: 0.2
   - type: ExplosionResistance
     resistance: 0.3
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetHardsuitDeathsquad
 
 - type: entity
   parent: ClothingOuterHardsuitBase
@@ -107,7 +113,9 @@
         Radiation: 0.35
   - type: ExplosionResistance
     resistance: 0.8
-    
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetHardsuitEngineering
+
 - type: entity
   parent: ClothingOuterHardsuitBase
   id: ClothingOuterHardsuitEngineeringWhite
@@ -134,6 +142,8 @@
         Radiation: 0.25
   - type: ExplosionResistance
     resistance: 0.8
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetHardsuitEngineeringWhite
 
 #The voidsuit and eva suit are not techically 'hardsuits' but this seems to be the place for all EVA-capable outer clothing. This may be worth reevaluating when we have a lot more items.
 - type: entity
@@ -152,6 +162,8 @@
   - type: PressureProtection
     highPressureMultiplier: 0.3
     lowPressureMultiplier: 10000
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetIHSVoidHelm
 
 - type: entity
   parent: ClothingOuterEVASuitBase
@@ -210,7 +222,9 @@
     modifiers:
       coefficients:
         Heat: 0.90
-        Radiation: 0.25 
+        Radiation: 0.25
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetHardsuitMedical
 
 - type: entity
   parent: ClothingOuterHardsuitBase
@@ -238,6 +252,8 @@
     sprintModifier: 0.75
   - type: ExplosionResistance
     resistance: 0.7
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetHardsuitRd
 
 - type: entity
   parent: ClothingOuterHardsuitBase
@@ -265,6 +281,8 @@
         Radiation: 0.5
   - type: ExplosionResistance
     resistance: 0.8
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetHardsuitSalvage
 
 - type: entity
   parent: ClothingOuterHardsuitBase
@@ -289,6 +307,8 @@
         Radiation: 0.25
   - type: ExplosionResistance
     resistance: 0.6
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetHardsuitSecurity
 
 - type: entity
   parent: ClothingOuterHardsuitSecurity 
@@ -316,6 +336,8 @@
         Radiation: 0.25
   - type: ExplosionResistance
     resistance: 0.6
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetHardsuitSecurityRed
 
 - type: entity
   parent: ClothingOuterHardsuitBase
@@ -343,6 +365,8 @@
         Radiation: 0.20
   - type: ExplosionResistance
     resistance: 0.5
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetHardsuitSyndie
 
 - type: entity
   parent: ClothingOuterHardsuitBase
@@ -370,6 +394,8 @@
         Radiation: 0.20
   - type: ExplosionResistance
     resistance: 0.5
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetHardsuitWizard
 
 - type: entity
   parent: ClothingOuterHardsuitBase
@@ -397,6 +423,8 @@
         Radiation: 0.3
   - type: ExplosionResistance
     resistance: 0.8 
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetHardsuitLing
    
 - type: entity
   parent: ClothingOuterHardsuitBase
@@ -422,6 +450,8 @@
         Piercing: 0.95
         Heat: 0.9
         Radiation: 0.5 #low physical but gave some rad protection in case of rad artifacts/rad storms
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetHardsuitSpatio
 
 - type: entity
   parent: ClothingOuterEVASuitBase
@@ -449,4 +479,3 @@
         Slash: 0.95
         Heat: 0.90
         Radiation: 0.75
-        

Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml

@@ -19,7 +19,7 @@
     state: icon
   - type: Clothing
     Slots: [innerclothing]
-    EquipSound:
+    equipSound:
       path: /Audio/Items/jumpsuit_equip.ogg
   - type: Butcherable
     butcheringType: Knife
@@ -37,7 +37,7 @@
   - type: Clothing
     Slots: [innerclothing]
     femaleMask: UniformTop
-    EquipSound:
+    equipSound:
       path: /Audio/Items/jumpsuit_equip.ogg
   - type: Butcherable
     butcheringType: Knife

Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml

@@ -52,7 +52,6 @@
   equipment:
     jumpsuit: ClothingUniformJumpsuitColorBlack
     back: ClothingBackpackDuffelSyndicateAmmo
-    head: ClothingHeadHelmetHardsuitDeathsquad
     mask: ClothingMaskBreath
     eyes: ClothingEyesGlassesSecurity
     ears: ClothingHeadsetCentCom

Resources/Prototypes/Roles/Jobs/Fun/wizard_startinggear.yml

@@ -46,7 +46,6 @@
   equipment:
     jumpsuit: ClothingUniformJumpsuitColorPurple
     back: ClothingBackpackFilled
-    head: ClothingHeadHelmetHardsuitWizard
     outerClothing: ClothingOuterHardsuitWizard
     shoes: ClothingShoesWizard
     id: AssistantPDA