Update

.github/workflows/build-test.yml

@@ -19,6 +19,10 @@ jobs:
         touch BuildChecker/DISABLE_SUBMODULE_AUTOUPDATE
     - name: Pull engine updates
       uses: ivanbakel/submodule-dependency@v0.1.1
+    - name: Update Engine Submodules
+      run: |
+        cd RobustToolbox/
+        git submodule update --init --recursive
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:

Content.Client/GameObjects/Components/Items/HandsComponent.cs

@@ -14,6 +14,7 @@
 namespace Content.Client.GameObjects.Components.Items
 {
     [RegisterComponent]
+    [ComponentReference(typeof(ISharedHandsComponent))]
     public class HandsComponent : SharedHandsComponent
     {
         private HandsGui? _gui;
@@ -138,13 +139,17 @@ private void UpdateHandSprites(Hand hand)
 
             if (entity == null)
             {
-                _sprite.LayerSetVisible($"hand-{name}", false);
+                if (_sprite.LayerMapTryGet($"hand-{name}", out var layer))
+                {
+                    _sprite.LayerSetVisible(layer, false);
+                }
+
                 return;
             }
 
             if (!entity.TryGetComponent(out ItemComponent item)) return;
 
-            var maybeInHands = item.GetInHandStateInfo(name);
+            var maybeInHands = item.GetInHandStateInfo(hand.Location);
 
             if (!maybeInHands.HasValue)
             {

Content.Client/GameObjects/Components/Items/ItemComponent.cs

@@ -40,15 +40,16 @@ public string EquippedPrefix
             }
         }
 
-        public (RSI rsi, RSI.StateId stateId)? GetInHandStateInfo(string hand)
+        public (RSI rsi, RSI.StateId stateId)? GetInHandStateInfo(HandLocation hand)
         {
             if (RsiPath == null)
             {
                 return null;
             }
 
+            var handName = hand.ToString().ToLowerInvariant();
             var rsi = GetRSI();
-            var stateId = EquippedPrefix != null ? $"{EquippedPrefix}-inhand-{hand}" : $"inhand-{hand}";
+            var stateId = EquippedPrefix != null ? $"{EquippedPrefix}-inhand-{handName}" : $"inhand-{handName}";
             if (rsi.TryGetState(stateId, out _))
             {
                 return (rsi, stateId);

Content.Client/GameObjects/EntitySystems/VerbSystem.cs

@@ -447,7 +447,9 @@ protected override void KeyBindDown(GUIBoundKeyEventArgs args)
                 }
 
                 if (args.Function == EngineKeyFunctions.Use ||
-                    args.Function == ContentKeyFunctions.Point)
+                    args.Function == ContentKeyFunctions.Point ||
+                    args.Function == ContentKeyFunctions.TryPullObject ||
+                    args.Function == ContentKeyFunctions.MovePulledObject)
                 {
                     // TODO: Remove an entity from the menu when it is deleted
                     if (_entity.Deleted)

Content.Client/GlobalVerbs/ExamineVerb.cs

@@ -0,0 +1,25 @@
+using Content.Client.GameObjects.EntitySystems;
+using Content.Shared.GameObjects;
+using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.Localization;
+
+namespace Content.Client.GlobalVerbs
+{
+    [GlobalVerb]
+    public class ExamineVerb : GlobalVerb
+    {
+        public override bool RequireInteractionRange => false;
+
+        public override void GetData(IEntity user, IEntity target, VerbData data)
+        {
+            data.Visibility = VerbVisibility.Visible;
+            data.Text = Loc.GetString("Examine");
+        }
+
+        public override void Activate(IEntity user, IEntity target)
+        {
+            EntitySystem.Get<ExamineSystem>().DoExamine(target);
+        }
+    }
+}

Content.Client/IgnoredComponents.cs

@@ -136,6 +136,10 @@ public static class IgnoredComponents
             "TrashSpawner",
             "Pill",
             "RCD",
+            "Pullable",
+            "CursedEntityStorage",
+            "Listening",
+            "Radio"
         };
     }
 }

Content.Client/Input/ContentContexts.cs

@@ -27,6 +27,8 @@ public static void SetupContexts(IInputContextContainer contexts)
             human.AddFunction(ContentKeyFunctions.OpenCharacterMenu);
             human.AddFunction(ContentKeyFunctions.ActivateItemInWorld);
             human.AddFunction(ContentKeyFunctions.ThrowItemInHand);
+            human.AddFunction(ContentKeyFunctions.TryPullObject);
+            human.AddFunction(ContentKeyFunctions.MovePulledObject);
             human.AddFunction(ContentKeyFunctions.OpenContextMenu);
             human.AddFunction(ContentKeyFunctions.OpenCraftingMenu);
             human.AddFunction(ContentKeyFunctions.OpenInventoryMenu);
@@ -36,6 +38,8 @@ public static void SetupContexts(IInputContextContainer contexts)
             human.AddFunction(ContentKeyFunctions.ToggleCombatMode);
             human.AddFunction(ContentKeyFunctions.WideAttack);
             human.AddFunction(ContentKeyFunctions.Point);
+            human.AddFunction(ContentKeyFunctions.TryPullObject);
+            human.AddFunction(ContentKeyFunctions.MovePulledObject);
 
             var ghost = contexts.New("ghost", "common");
             ghost.AddFunction(EngineKeyFunctions.MoveUp);

Content.Client/UserInterface/ItemSlotButton.cs

@@ -12,14 +12,15 @@ public class ItemSlotButton : MarginContainer
     {
         public TextureRect Button { get; }
         public SpriteView SpriteView { get; }
+        public SpriteView HoverSpriteView { get; }
         public BaseButton StorageButton { get; }
         public CooldownGraphic CooldownDisplay { get; }
 
         public Action<GUIBoundKeyEventArgs> OnPressed { get; set; }
         public Action<GUIBoundKeyEventArgs> OnStoragePressed { get; set; }
         public Action<GUIMouseHoverEventArgs> OnHover { get; set; }
 
-        public bool EntityHover { get; set; } = false;
+        public bool EntityHover => HoverSpriteView.Sprite != null;
         public bool MouseIsHovering = false;
 
         public ItemSlotButton(Texture texture, Texture storageTexture)
@@ -41,6 +42,12 @@ public ItemSlotButton(Texture texture, Texture storageTexture)
                 OverrideDirection = Direction.South
             });
 
+            AddChild(HoverSpriteView = new SpriteView
+            {
+                Scale = (2, 2),
+                OverrideDirection = Direction.South
+            });
+
             AddChild(StorageButton = new TextureButton
             {
                 TextureNormal = storageTexture,
@@ -69,13 +76,7 @@ public ItemSlotButton(Texture texture, Texture storageTexture)
             Button.OnMouseExited += _ =>
             {
                 MouseIsHovering = false;
-                if (EntityHover)
-                {
-                    SpriteView.Sprite?.Owner.Delete();
-                    EntityHover = false;
-                    SpriteView.Sprite = null;
-                    StorageButton.Visible = false;
-                }
+                ClearHover();
             };
 
             AddChild(CooldownDisplay = new CooldownGraphic
@@ -86,6 +87,15 @@ public ItemSlotButton(Texture texture, Texture storageTexture)
             });
         }
 
+        public void ClearHover()
+        {
+            if (EntityHover)
+            {
+                HoverSpriteView.Sprite?.Owner.Delete();
+                HoverSpriteView.Sprite = null;
+            }
+        }
+
         private void OnButtonPressed(GUIBoundKeyEventArgs args)
         {
             OnPressed?.Invoke(args);

Content.Client/UserInterface/ItemSlotManager.cs

@@ -47,7 +47,8 @@ public bool SetItemSlot(ItemSlotButton button, IEntity entity)
             {
                 if (!entity.TryGetComponent(out ISpriteComponent sprite))
                     return false;
-                button.EntityHover = false;
+
+                button.ClearHover();
                 button.SpriteView.Sprite = sprite;
                 button.StorageButton.Visible = entity.HasComponent<ClientStorageComponent>();
             }
@@ -132,9 +133,7 @@ public void HoverInSlot(ItemSlotButton button, IEntity entity, bool fits)
         {
             if (entity == null || !button.MouseIsHovering)
             {
-                button.SpriteView.Sprite?.Owner.Delete();
-                button.SpriteView.Sprite = null;
-                button.StorageButton.Visible = false;
+                button.ClearHover();
                 return;
             }
 
@@ -149,9 +148,7 @@ public void HoverInSlot(ItemSlotButton button, IEntity entity, bool fits)
             hoverSprite.CopyFrom(entity.GetComponent<SpriteComponent>());
             hoverSprite.Color = fits ? new Color(0, 255, 0, 127) : new Color(255, 0, 0, 127);
 
-            button.EntityHover = true;
-            button.SpriteView.Sprite = hoverSprite;
-            button.StorageButton.Visible = entity.HasComponent<ClientStorageComponent>();
+            button.HoverSpriteView.Sprite = hoverSprite;
         }
     }
 }

Content.Client/UserInterface/TutorialWindow.cs

@@ -81,6 +81,8 @@ string Key(BoundKeyFunction func)
 Do wide attack: [color=#a4885c]{23}[/color]
 Use targeted entity: [color=#a4885c]{11}[/color]
 Throw held item: [color=#a4885c]{12}[/color]
+Pull entity: [color=#a4885c]{30}[/color]
+Move pulled entity: [color=#a4885c]{29}[/color]
 Examine entity: [color=#a4885c]{13}[/color]
 Point somewhere: [color=#a4885c]{28}[/color]
 Open entity context menu: [color=#a4885c]{14}[/color]
@@ -116,7 +118,9 @@ string Key(BoundKeyFunction func)
                 Key(SmartEquipBelt),
                 Key(FocusOOC),
                 Key(FocusAdminChat),
-                Key(Point)));
+                Key(Point),
+                Key(TryPullObject),
+                Key(MovePulledObject)));
 
             //Gameplay
             VBox.AddChild(new Label { FontOverride = headerFont, Text = "\nGameplay" });

Content.IntegrationTests/Tests/BuckleTest.cs

@@ -146,6 +146,22 @@ public async Task Test()
                 Assert.True(ActionBlockerSystem.CanMove(human));
                 Assert.True(ActionBlockerSystem.CanChangeDirection(human));
                 Assert.True(EffectBlockerSystem.CanFall(human));
+
+                // Re-buckle
+                Assert.True(buckle.TryBuckle(human, chair));
+
+                // Move away from the chair
+                human.Transform.WorldPosition += (1, 0);
+            });
+
+            server.RunTicks(1);
+
+            server.Assert(() =>
+            {
+                // No longer buckled
+                Assert.False(buckle.Buckled);
+                Assert.Null(buckle.BuckledTo);
+                Assert.IsEmpty(strap.BuckledEntities);
             });
 
             await server.WaitIdleAsync();

Content.IntegrationTests/Tests/ContainerOcclusionTest.cs

@@ -1,6 +1,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Content.Server.GameObjects.Components;
+using Content.Server.GameObjects.Components.Items.Storage;
 using NUnit.Framework;
 using Robust.Client.GameObjects;
 using Robust.Server.Interfaces.Player;

Content.Server/AI/Operators/Inventory/CloseStorageOperator.cs

@@ -1,6 +1,7 @@
 using Content.Server.AI.Utility;
 using Content.Server.AI.WorldState.States.Inventory;
 using Content.Server.GameObjects.Components;
+using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.Utility;
 using Content.Shared.Interfaces.GameObjects.Components;
 using Robust.Shared.Interfaces.GameObjects;

Content.Server/AI/Operators/Inventory/OpenStorageOperator.cs

@@ -1,6 +1,7 @@
 using Content.Server.AI.Utility;
 using Content.Server.AI.WorldState.States.Inventory;
 using Content.Server.GameObjects.Components;
+using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.Utility;
 using Content.Shared.Interfaces.GameObjects.Components;
 using Robust.Shared.Containers;

Content.Server/AI/Utility/Considerations/Containers/TargetAccessibleCon.cs

@@ -1,6 +1,7 @@
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
 using Content.Server.GameObjects.Components;
+using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.Components.Movement;
 using Content.Server.GameObjects.EntitySystems.AI.Pathfinding;
 using Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible;

Content.Server/AI/WorldState/States/Clothing/NearbyClothingState.cs

@@ -2,6 +2,7 @@
 using Content.Server.AI.Utils;
 using Content.Server.GameObjects;
 using Content.Server.GameObjects.Components;
+using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.Components.Movement;
 using JetBrains.Annotations;
 using Robust.Shared.Containers;

Content.Server/Chat/ChatManager.cs

@@ -10,6 +10,15 @@
 using Robust.Shared.Interfaces.Network;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
+using Robust.Shared.Log;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using System;
+using Content.Server.GameObjects.Components;
+using System.Collections.Generic;
+using Content.Server.GameObjects.Components.Interactable;
+using Content.Server.GameObjects.EntitySystems;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Robust.Shared.Interfaces.Map;
 
 namespace Content.Server.Chat
 {
@@ -21,6 +30,7 @@ internal sealed class ChatManager : IChatManager
         private const int VoiceRange = 7; // how far voice goes in world units
 
 #pragma warning disable 649
+        [Dependency] private readonly IEntitySystemManager _entitySystemManager;
         [Dependency] private readonly IServerNetManager _netManager;
         [Dependency] private readonly IPlayerManager _playerManager;
         [Dependency] private readonly ILocalizationManager _localizationManager;
@@ -67,6 +77,9 @@ public void EntitySay(IEntity source, string message)
             msg.MessageWrap = $"{source.Name} says, \"{{0}}\"";
             msg.SenderEntity = source.Uid;
             _netManager.ServerSendToMany(msg, clients.ToList());
+
+            var listeners = _entitySystemManager.GetEntitySystem<ListeningSystem>();
+            listeners.PingListeners(source, pos, message);
         }
 
         public void EntityMe(IEntity source, string action)