Item Offer Bind

Content.Client/Input/ContentContexts.cs

@@ -57,6 +57,7 @@ public static void SetupContexts(IInputContextContainer contexts)
             human.AddFunction(EngineKeyFunctions.Walk);
             human.AddFunction(ContentKeyFunctions.SwapHands);
             human.AddFunction(ContentKeyFunctions.Drop);
+            human.AddFunction(ContentKeyFunctions.ItemOffer); // SS220 ItemOffer bind
             human.AddFunction(ContentKeyFunctions.UseItemInHand);
             human.AddFunction(ContentKeyFunctions.AltUseItemInHand);
             human.AddFunction(ContentKeyFunctions.OpenCharacterMenu);

Content.Client/Inventory/ClientInventorySystem.cs

@@ -163,24 +163,18 @@ public void SetSlotHighlight(EntityUid owner, InventorySlotsComponent component,
         }
 
         public void UpdateSlot(EntityUid owner, InventorySlotsComponent component, string slotName,
-            bool? blocked = null, bool? highlight = null, bool? stuckOnEquip = null)//ss220 StuckOnEquip
+            bool? blocked = null, bool? highlight = null)
         {
             var oldData = component.SlotData[slotName];
             var newHighlight = oldData.Highlighted;
             var newBlocked = oldData.Blocked;
-            var newStuckOnEquip = oldData.StuckOnEquip;//ss220 StuckOnEquip
 
             if (blocked != null)
                 newBlocked = blocked.Value;
 
             if (highlight != null)
                 newHighlight = highlight.Value;
 
-            //ss220 StuckOnEquip begin
-            if (stuckOnEquip != null)
-                newStuckOnEquip = stuckOnEquip.Value;
-            //ss220 StuckOnEquip end
-
             var newData = component.SlotData[slotName] =
                 new SlotData(component.SlotData[slotName], newHighlight, newBlocked);
             if (owner == _playerManager.LocalEntity)
@@ -261,7 +255,6 @@ public sealed class SlotData
             public EntityUid? HeldEntity => Container?.ContainedEntity;
             public bool Blocked;
             public bool Highlighted;
-            public bool StuckOnEquip; //ss220 StuckOnEquip
 
             [ViewVariables]
             public ContainerSlot? Container;
@@ -275,22 +268,20 @@ public sealed class SlotData
             public string FullTextureName => SlotDef.FullTextureName;
 
             public SlotData(SlotDefinition slotDef, ContainerSlot? container = null, bool highlighted = false,
-                bool blocked = false, bool stuckOnEquip = false)//ss220 StuckOnEquip
+                bool blocked = false)
             {
                 SlotDef = slotDef;
                 Highlighted = highlighted;
                 Blocked = blocked;
                 Container = container;
-                StuckOnEquip = stuckOnEquip; //ss220 StuckOnEquip
             }
 
-            public SlotData(SlotData oldData, bool highlighted = false, bool blocked = false, bool stuckOnEquip = false)//ss220 StuckOnEquip
+            public SlotData(SlotData oldData, bool highlighted = false, bool blocked = false)
             {
                 SlotDef = oldData.SlotDef;
                 Highlighted = highlighted;
                 Container = oldData.Container;
                 Blocked = blocked;
-                StuckOnEquip = stuckOnEquip; //ss220 StuckOnEquip
             }
 
             public static implicit operator SlotData(SlotDefinition s)

Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs

@@ -179,6 +179,7 @@ void AddCheckBox(string checkBoxName, bool currentState, Action<BaseButton.Butto
             AddButton(ContentKeyFunctions.ActivateItemInWorld);
             AddButton(ContentKeyFunctions.AltActivateItemInWorld);
             AddButton(ContentKeyFunctions.Drop);
+            AddButton(ContentKeyFunctions.ItemOffer); // SS220 ItemOffer bind
             AddButton(ContentKeyFunctions.ExamineEntity);
             AddButton(ContentKeyFunctions.SwapHands);
             AddButton(ContentKeyFunctions.MoveStoredItem);