diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/CrimeAssistUi.cs b/Content.Client/DeltaV/CartridgeLoader/Cartridges/CrimeAssistUi.cs
index ea5aa3cf25..2dbe923b2a 100644
--- a/Content.Client/DeltaV/CartridgeLoader/Cartridges/CrimeAssistUi.cs
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/CrimeAssistUi.cs
@@ -18,15 +18,6 @@ public override Control GetUIFragmentRoot()
     public override void Setup(BoundUserInterface userInterface, EntityUid? fragmentOwner)
     {
         _fragment = new CrimeAssistUiFragment();
-
-        _fragment.OnSync += _ => SendSyncMessage(userInterface);
-    }
-
-    private void SendSyncMessage(BoundUserInterface userInterface)
-    {
-        var syncMessage = new CrimeAssistSyncMessageEvent();
-        var message = new CartridgeUiMessage(syncMessage);
-        userInterface.SendMessage(message);
     }
 
     public override void UpdateState(BoundUserInterfaceState state)
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/CrimeAssistUiFragment.xaml.cs b/Content.Client/DeltaV/CartridgeLoader/Cartridges/CrimeAssistUiFragment.xaml.cs
index e3163975d1..fb085a8a79 100644
--- a/Content.Client/DeltaV/CartridgeLoader/Cartridges/CrimeAssistUiFragment.xaml.cs
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/CrimeAssistUiFragment.xaml.cs
@@ -1,7 +1,6 @@
 using Content.Client.Message;
 using Content.Shared.DeltaV.CartridgeLoader.Cartridges;
 using Robust.Client.AutoGenerated;
-using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Prototypes;
@@ -13,9 +12,7 @@ namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
 public sealed partial class CrimeAssistUiFragment : BoxContainer
 {
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-    [Dependency] private readonly IResourceCache _resourceCache = default!;
 
-    public event Action<bool>? OnSync;
     private CrimeAssistPage _currentPage;
     private List<CrimeAssistPage>? _pages;
 
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/SecWatchEntryControl.xaml b/Content.Client/DeltaV/CartridgeLoader/Cartridges/SecWatchEntryControl.xaml
new file mode 100644
index 0000000000..2de8a37ff7
--- /dev/null
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/SecWatchEntryControl.xaml
@@ -0,0 +1,19 @@
+<BoxContainer xmlns="https://spacestation14.io"
+        xmlns:cartridges="clr-namespace:Content.Client.DeltaV.CartridgeLoader.Cartridges"
+        xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
+        HorizontalExpand="True"
+        VerticalExpand="True"
+        Margin="5">
+    <!-- All labels populated in constructor -->
+    <BoxContainer Orientation="Horizontal" HorizontalAlignment="Left">
+        <BoxContainer Orientation="Vertical">
+            <Label Name="Status"/>
+            <Label Text="{Loc 'criminal-records-console-reason'}"/>
+        </BoxContainer>
+        <customControls:VSeparator StyleClasses="LowDivider" Margin="8 0"/>
+        <BoxContainer Orientation="Vertical">
+            <Label Name="Title"/>
+	        <Label Name="Reason"/>
+        </BoxContainer>
+    </BoxContainer>
+</BoxContainer>
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/SecWatchEntryControl.xaml.cs b/Content.Client/DeltaV/CartridgeLoader/Cartridges/SecWatchEntryControl.xaml.cs
new file mode 100644
index 0000000000..e8dd4eea44
--- /dev/null
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/SecWatchEntryControl.xaml.cs
@@ -0,0 +1,21 @@
+using Content.Shared.CartridgeLoader.Cartridges;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
+
+[GenerateTypedNameReferences]
+public sealed partial class SecWatchEntryControl : BoxContainer
+{
+    public SecWatchEntryControl(SecWatchEntry entry)
+    {
+        RobustXamlLoader.Load(this);
+
+        Status.Text = Loc.GetString($"criminal-records-status-{entry.Status.ToString().ToLower()}");
+        Title.Text = Loc.GetString("sec-watch-entry", ("name", entry.Name), ("job", entry.Job));
+
+        Reason.Text = entry.Reason ?? Loc.GetString("sec-watch-no-reason");
+    }
+}
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/SecWatchUi.cs b/Content.Client/DeltaV/CartridgeLoader/Cartridges/SecWatchUi.cs
new file mode 100644
index 0000000000..da5ff825b9
--- /dev/null
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/SecWatchUi.cs
@@ -0,0 +1,27 @@
+using Content.Client.UserInterface.Fragments;
+using Content.Shared.CartridgeLoader;
+using Content.Shared.CartridgeLoader.Cartridges;
+using Robust.Client.UserInterface;
+
+namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
+
+public sealed partial class SecWatchUi : UIFragment
+{
+    private SecWatchUiFragment? _fragment;
+
+    public override Control GetUIFragmentRoot()
+    {
+        return _fragment!;
+    }
+
+    public override void Setup(BoundUserInterface ui, EntityUid? owner)
+    {
+        _fragment = new SecWatchUiFragment();
+    }
+
+    public override void UpdateState(BoundUserInterfaceState state)
+    {
+        if (state is SecWatchUiState cast)
+            _fragment?.UpdateState(cast);
+    }
+}
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/SecWatchUiFragment.xaml b/Content.Client/DeltaV/CartridgeLoader/Cartridges/SecWatchUiFragment.xaml
new file mode 100644
index 0000000000..7fb2c42deb
--- /dev/null
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/SecWatchUiFragment.xaml
@@ -0,0 +1,13 @@
+<cartridges:SecWatchUiFragment xmlns="https://spacestation14.io"
+        xmlns:cartridges="clr-namespace:Content.Client.DeltaV.CartridgeLoader.Cartridges"
+        Margin="5"
+        VerticalExpand="True">
+    <BoxContainer Orientation="Vertical" HorizontalExpand="True" VerticalExpand="True">
+        <Label Text="{Loc 'sec-watch-title'}" HorizontalExpand="True" HorizontalAlignment="Center"/>
+        <Label Name="NoEntries" Text="{Loc 'sec-watch-no-entries'}" HorizontalExpand="True" HorizontalAlignment="Center" Visible="False"/>
+        <ScrollContainer HorizontalExpand="True" VerticalExpand="True">
+            <!-- Populated when state received -->
+            <BoxContainer Name="Entries" Orientation="Vertical" VerticalAlignment="Top"/>
+        </ScrollContainer>
+    </BoxContainer>
+</cartridges:SecWatchUiFragment>
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/SecWatchUiFragment.xaml.cs b/Content.Client/DeltaV/CartridgeLoader/Cartridges/SecWatchUiFragment.xaml.cs
new file mode 100644
index 0000000000..ad15284052
--- /dev/null
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/SecWatchUiFragment.xaml.cs
@@ -0,0 +1,25 @@
+using Content.Shared.CartridgeLoader.Cartridges;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
+
+[GenerateTypedNameReferences]
+public sealed partial class SecWatchUiFragment : BoxContainer
+{
+    public SecWatchUiFragment()
+    {
+        RobustXamlLoader.Load(this);
+    }
+
+    public void UpdateState(SecWatchUiState state)
+    {
+        NoEntries.Visible = state.Entries.Count == 0;
+        Entries.RemoveAllChildren();
+        foreach (var entry in state.Entries)
+        {
+            Entries.AddChild(new SecWatchEntryControl(entry));
+        }
+    }
+}
diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs
index a1fc68bbd2..8636e0eb6a 100644
--- a/Content.Client/Entry/EntryPoint.cs
+++ b/Content.Client/Entry/EntryPoint.cs
@@ -125,6 +125,7 @@ public override void Init()
             _prototypeManager.RegisterIgnore("alertLevels");
             _prototypeManager.RegisterIgnore("nukeopsRole");
             _prototypeManager.RegisterIgnore("stationGoal");
+            _prototypeManager.RegisterIgnore("npcConversationTree");
 
             _componentFactory.GenerateNetIds();
             _adminManager.Initialize();
diff --git a/Content.Client/Input/ContentContexts.cs b/Content.Client/Input/ContentContexts.cs
index fa63193810..ca22ab095d 100644
--- a/Content.Client/Input/ContentContexts.cs
+++ b/Content.Client/Input/ContentContexts.cs
@@ -68,6 +68,7 @@ public static void SetupContexts(IInputContextContainer contexts)
             human.AddFunction(ContentKeyFunctions.SmartEquipBelt);
             human.AddFunction(ContentKeyFunctions.OpenBackpack);
             human.AddFunction(ContentKeyFunctions.OpenBelt);
+            human.AddFunction(ContentKeyFunctions.OfferItem);
             human.AddFunction(ContentKeyFunctions.MouseMiddle);
             human.AddFunction(ContentKeyFunctions.ArcadeUp);
             human.AddFunction(ContentKeyFunctions.ArcadeDown);
diff --git a/Content.Client/Inventory/StrippableBoundUserInterface.cs b/Content.Client/Inventory/StrippableBoundUserInterface.cs
index f8eb12df91..4bb49fecc1 100644
--- a/Content.Client/Inventory/StrippableBoundUserInterface.cs
+++ b/Content.Client/Inventory/StrippableBoundUserInterface.cs
@@ -19,6 +19,7 @@
 using Robust.Client.GameObjects;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
+using Robust.Client.Player;
 using Robust.Shared.Input;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
@@ -31,6 +32,7 @@ namespace Content.Client.Inventory
     public sealed class StrippableBoundUserInterface : BoundUserInterface
     {
         [Dependency] private readonly IUserInterfaceManager _ui = default!;
+        [Dependency] private readonly IPlayerManager _playerManager = default!;
         private readonly ExamineSystem _examine;
         private readonly InventorySystem _inv;
         private readonly SharedCuffableSystem _cuffable;
@@ -198,7 +200,8 @@ private void AddInventoryButton(EntityUid invUid, string slotId, InventoryCompon
             var entity = container.ContainedEntity;
 
             // If this is a full pocket, obscure the real entity
-            if (entity != null && slotDef.StripHidden)
+            if (entity != null && slotDef.StripHidden
+                && !(EntMan.TryGetComponent<ThievingComponent>(_playerManager.LocalEntity, out var thiefcomponent) && thiefcomponent.IgnoreStripHidden))
                 entity = _virtualHiddenEntity;
 
             var button = new SlotButton(new SlotData(slotDef, container));
diff --git a/Content.Client/OfferItem/OfferItemIndicatorsOverlay.cs b/Content.Client/OfferItem/OfferItemIndicatorsOverlay.cs
new file mode 100644
index 0000000000..16a314a2cf
--- /dev/null
+++ b/Content.Client/OfferItem/OfferItemIndicatorsOverlay.cs
@@ -0,0 +1,72 @@
+using System.Numerics;
+using Robust.Client.GameObjects;
+using Robust.Client.Graphics;
+using Robust.Client.Input;
+using Robust.Client.UserInterface;
+using Robust.Shared.Enums;
+using Robust.Shared.Utility;
+
+namespace Content.Client.OfferItem;
+
+public sealed class OfferItemIndicatorsOverlay : Overlay
+{
+    private readonly IInputManager _inputManager;
+    private readonly IEntityManager _entMan;
+    private readonly IEyeManager _eye;
+    private readonly OfferItemSystem _offer;
+
+    private readonly Texture _sight;
+
+    public override OverlaySpace Space => OverlaySpace.ScreenSpace;
+
+    private readonly Color _mainColor = Color.White.WithAlpha(0.3f);
+    private readonly Color _strokeColor = Color.Black.WithAlpha(0.5f);
+    private readonly float _scale = 0.6f;  // 1 is a little big
+
+    public OfferItemIndicatorsOverlay(IInputManager input, IEntityManager entMan,
+            IEyeManager eye, OfferItemSystem offerSys)
+    {
+        _inputManager = input;
+        _entMan = entMan;
+        _eye = eye;
+        _offer = offerSys;
+
+        var spriteSys = _entMan.EntitySysManager.GetEntitySystem<SpriteSystem>();
+        _sight = spriteSys.Frame0(new SpriteSpecifier.Rsi(new ResPath("/Textures/Interface/Misc/give_item.rsi"),
+            "give_item"));
+    }
+
+    protected override bool BeforeDraw(in OverlayDrawArgs args)
+    {
+        if (!_offer.IsInOfferMode())
+            return false;
+
+        return base.BeforeDraw(in args);
+    }
+
+    protected override void Draw(in OverlayDrawArgs args)
+    {
+        var mouseScreenPosition = _inputManager.MouseScreenPosition;
+        var mousePosMap = _eye.PixelToMap(mouseScreenPosition);
+        if (mousePosMap.MapId != args.MapId)
+            return;
+
+
+        var mousePos = mouseScreenPosition.Position;
+        var uiScale = (args.ViewportControl as Control)?.UIScale ?? 1f;
+        var limitedScale = uiScale > 1.25f ? 1.25f : uiScale;
+
+        DrawSight(_sight, args.ScreenHandle, mousePos, limitedScale * _scale);
+    }
+
+    private void DrawSight(Texture sight, DrawingHandleScreen screen, Vector2 centerPos, float scale)
+    {
+        var sightSize = sight.Size * scale;
+        var expandedSize = sightSize + new Vector2(7f, 7f);
+
+        screen.DrawTextureRect(sight,
+            UIBox2.FromDimensions(centerPos - sightSize * 0.5f, sightSize), _strokeColor);
+        screen.DrawTextureRect(sight,
+            UIBox2.FromDimensions(centerPos - expandedSize * 0.5f, expandedSize), _mainColor);
+    }
+}
diff --git a/Content.Client/OfferItem/OfferItemSystem.cs b/Content.Client/OfferItem/OfferItemSystem.cs
new file mode 100644
index 0000000000..51b8dcbc0b
--- /dev/null
+++ b/Content.Client/OfferItem/OfferItemSystem.cs
@@ -0,0 +1,51 @@
+using Content.Shared.CCVar;
+using Content.Shared.OfferItem;
+using Robust.Client.Graphics;
+using Robust.Client.Input;
+using Robust.Client.Player;
+using Robust.Shared.Configuration;
+
+namespace Content.Client.OfferItem;
+
+public sealed class OfferItemSystem : SharedOfferItemSystem
+{
+    [Dependency] private readonly IOverlayManager _overlayManager = default!;
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
+    [Dependency] private readonly IInputManager _inputManager = default!;
+    [Dependency] private readonly IEyeManager _eye = default!;
+
+    public override void Initialize()
+    {
+        Subs.CVar(_cfg, CCVars.OfferModeIndicatorsPointShow, OnShowOfferIndicatorsChanged, true);
+    }
+    public override void Shutdown()
+    {
+        _overlayManager.RemoveOverlay<OfferItemIndicatorsOverlay>();
+
+        base.Shutdown();
+    }
+
+    public bool IsInOfferMode()
+    {
+        var entity = _playerManager.LocalEntity;
+
+        if (entity == null)
+            return false;
+
+        return IsInOfferMode(entity.Value);
+    }
+    private void OnShowOfferIndicatorsChanged(bool isShow)
+    {
+        if (isShow)
+        {
+            _overlayManager.AddOverlay(new OfferItemIndicatorsOverlay(
+                _inputManager,
+                EntityManager,
+                _eye,
+                this));
+        }
+        else
+            _overlayManager.RemoveOverlay<OfferItemIndicatorsOverlay>();
+    }
+}
diff --git a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
index 49e8099e0f..9daca74dd3 100644
--- a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
@@ -183,6 +183,7 @@ void AddCheckBox(string checkBoxName, bool currentState, Action<BaseButton.Butto
             AddButton(ContentKeyFunctions.SwapHands);
             AddButton(ContentKeyFunctions.MoveStoredItem);
             AddButton(ContentKeyFunctions.RotateStoredItem);
+            AddButton(ContentKeyFunctions.OfferItem);
 
             AddHeader("ui-options-header-interaction-adv");
             AddButton(ContentKeyFunctions.SmartEquipBackpack);
diff --git a/Content.Client/Options/UI/Tabs/MiscTab.xaml b/Content.Client/Options/UI/Tabs/MiscTab.xaml
index 2ee59910f7..e12aa964b0 100644
--- a/Content.Client/Options/UI/Tabs/MiscTab.xaml
+++ b/Content.Client/Options/UI/Tabs/MiscTab.xaml
@@ -49,6 +49,7 @@
                        StyleClasses="LabelKeyText"/>
                 <CheckBox Name="ShowHeldItemCheckBox" Text="{Loc 'ui-options-show-held-item'}" />
                 <CheckBox Name="ShowCombatModeIndicatorsCheckBox" Text="{Loc 'ui-options-show-combat-mode-indicators'}" />
+                <CheckBox Name="ShowOfferModeIndicatorsCheckBox" Text="{Loc 'ui-options-show-offer-mode-indicators'}" />
                 <Label Text="{Loc 'ui-options-general-storage'}"
                        FontColorOverride="{xNamespace:Static s:StyleNano.NanoGold}"
                        StyleClasses="LabelKeyText"/>
diff --git a/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs b/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs
index 3b9c41efdf..95b77e71bb 100644
--- a/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs
@@ -60,6 +60,7 @@ public MiscTab()
             ShowLoocAboveHeadCheckBox.OnToggled += OnCheckBoxToggled;
             ShowHeldItemCheckBox.OnToggled += OnCheckBoxToggled;
             ShowCombatModeIndicatorsCheckBox.OnToggled += OnCheckBoxToggled;
+            ShowOfferModeIndicatorsCheckBox.OnToggled += OnCheckBoxToggled;
             OpaqueStorageWindowCheckBox.OnToggled += OnCheckBoxToggled;
             FancySpeechBubblesCheckBox.OnToggled += OnCheckBoxToggled;
             FancyNameBackgroundsCheckBox.OnToggled += OnCheckBoxToggled;
@@ -75,6 +76,7 @@ public MiscTab()
             ShowLoocAboveHeadCheckBox.Pressed = _cfg.GetCVar(CCVars.LoocAboveHeadShow);
             ShowHeldItemCheckBox.Pressed = _cfg.GetCVar(CCVars.HudHeldItemShow);
             ShowCombatModeIndicatorsCheckBox.Pressed = _cfg.GetCVar(CCVars.CombatModeIndicatorsPointShow);
+            ShowOfferModeIndicatorsCheckBox.Pressed = _cfg.GetCVar(CCVars.OfferModeIndicatorsPointShow);
             OpaqueStorageWindowCheckBox.Pressed = _cfg.GetCVar(CCVars.OpaqueStorageWindow);
             FancySpeechBubblesCheckBox.Pressed = _cfg.GetCVar(CCVars.ChatEnableFancyBubbles);
             FancyNameBackgroundsCheckBox.Pressed = _cfg.GetCVar(CCVars.ChatFancyNameBackground);
@@ -120,6 +122,7 @@ private void OnApplyButtonPressed(BaseButton.ButtonEventArgs args)
             _cfg.SetCVar(CVars.DiscordEnabled, DiscordRich.Pressed);
             _cfg.SetCVar(CCVars.HudHeldItemShow, ShowHeldItemCheckBox.Pressed);
             _cfg.SetCVar(CCVars.CombatModeIndicatorsPointShow, ShowCombatModeIndicatorsCheckBox.Pressed);
+            _cfg.SetCVar(CCVars.OfferModeIndicatorsPointShow, ShowOfferModeIndicatorsCheckBox.Pressed);
             _cfg.SetCVar(CCVars.OpaqueStorageWindow, OpaqueStorageWindowCheckBox.Pressed);
             _cfg.SetCVar(CCVars.LoocAboveHeadShow, ShowLoocAboveHeadCheckBox.Pressed);
             _cfg.SetCVar(CCVars.ChatEnableFancyBubbles, FancySpeechBubblesCheckBox.Pressed);
@@ -147,6 +150,7 @@ private void UpdateApplyButton()
             var isDiscordSame = DiscordRich.Pressed == _cfg.GetCVar(CVars.DiscordEnabled);
             var isShowHeldItemSame = ShowHeldItemCheckBox.Pressed == _cfg.GetCVar(CCVars.HudHeldItemShow);
             var isCombatModeIndicatorsSame = ShowCombatModeIndicatorsCheckBox.Pressed == _cfg.GetCVar(CCVars.CombatModeIndicatorsPointShow);
+            var isOfferModeIndicatorsSame = ShowOfferModeIndicatorsCheckBox.Pressed == _cfg.GetCVar(CCVars.OfferModeIndicatorsPointShow);
             var isOpaqueStorageWindow = OpaqueStorageWindowCheckBox.Pressed == _cfg.GetCVar(CCVars.OpaqueStorageWindow);
             var isLoocShowSame = ShowLoocAboveHeadCheckBox.Pressed == _cfg.GetCVar(CCVars.LoocAboveHeadShow);
             var isFancyChatSame = FancySpeechBubblesCheckBox.Pressed == _cfg.GetCVar(CCVars.ChatEnableFancyBubbles);
@@ -163,6 +167,7 @@ private void UpdateApplyButton()
                                    isDiscordSame &&
                                    isShowHeldItemSame &&
                                    isCombatModeIndicatorsSame &&
+                                   isOfferModeIndicatorsSame &&
                                    isOpaqueStorageWindow &&
                                    isLoocShowSame &&
                                    isFancyChatSame &&
diff --git a/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs b/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
index 7688a3b3aa..ee581186f3 100644
--- a/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
+++ b/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
@@ -96,7 +96,7 @@ public bool IsAllowed(JobPrototype job, [NotNullWhen(false)] out FormattedMessag
         return CheckRoleTime(job.Requirements, out reason);
     }
 
-    public bool CheckRoleTime(HashSet<JobRequirement>? requirements, [NotNullWhen(false)] out FormattedMessage? reason, string? localePrefix = null)
+    public bool CheckRoleTime(HashSet<JobRequirement>? requirements, [NotNullWhen(false)] out FormattedMessage? reason, string? localePrefix = "role-timer-")
     {
         reason = null;
 
diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
index 85b3c2fb32..647b9ac211 100644
--- a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
@@ -2085,7 +2085,7 @@ void AddSelector(LoadoutPreferenceSelector selector, int points, string id)
                 selector.PreferenceChanged += preference =>
                 {
                     // Make sure they have enough loadout points
-                    preference = preference ? CheckPoints(points, preference) : CheckPoints(-points, preference);
+                    preference = preference ? CheckPoints(-points, preference) : CheckPoints(points, preference);
 
                     // Update Preferences
                     Profile = Profile?.WithLoadoutPreference(id, preference);
diff --git a/Content.Server/Alert/Click/AcceptingOffer.cs b/Content.Server/Alert/Click/AcceptingOffer.cs
new file mode 100644
index 0000000000..b6adbf83bd
--- /dev/null
+++ b/Content.Server/Alert/Click/AcceptingOffer.cs
@@ -0,0 +1,24 @@
+using Content.Shared.OfferItem;
+using Content.Server.OfferItem;
+using Content.Shared.Alert;
+using JetBrains.Annotations;
+
+namespace Content.Server.Alert.Click;
+
+/// <summary>
+/// Accepting the offer and receive item
+/// </summary>
+[UsedImplicitly]
+[DataDefinition]
+public sealed partial class AcceptOffer : IAlertClick
+{
+    public void AlertClicked(EntityUid player)
+    {
+        var entManager = IoCManager.Resolve<IEntityManager>();
+
+        if (entManager.TryGetComponent(player, out OfferItemComponent? offerItem))
+        {
+            entManager.System<OfferItemSystem>().Receive(player, offerItem);
+        }
+    }
+}
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs
index ac9b5c2b0a..461435f062 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs
@@ -217,11 +217,11 @@ public void ExperiencePressureDifference(
                     if (throwTarget != EntityCoordinates.Invalid)
                     {
                         var pos = throwTarget.ToMap(EntityManager, _transformSystem).Position - xform.WorldPosition + dirVec;
-                        _throwing.TryThrow(uid, pos.Normalized() * moveForce, moveForce);
+                        _throwing.TryThrow(uid, pos.Normalized() * MathF.Min(moveForce, SpaceWindMaxVelocity), moveForce);
                     }
                     else
                     {
-                        _throwing.TryThrow(uid, dirVec.Normalized() * moveForce, moveForce);
+                        _throwing.TryThrow(uid, dirVec.Normalized() * MathF.Min(moveForce, SpaceWindMaxVelocity), moveForce);
                     }
 
                     component.LastHighPressureMovementAirCycle = cycle;
diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs
index 41ecae2253..f69c95dfcb 100644
--- a/Content.Server/Chat/Systems/ChatSystem.cs
+++ b/Content.Server/Chat/Systems/ChatSystem.cs
@@ -846,7 +846,7 @@ public string WrapPublicMessage(EntityUid source, string name, string message)
             ("verb", verbName),
             ("fontType", speech.FontId),
             ("fontSize", speech.FontSize),
-            ("message", FormattedMessage.EscapeText(message)));
+            ("message", message));
     }
 
     /// <summary>
diff --git a/Content.Server/Chat/TypingIndicator/TypingIndicatorSystem.cs b/Content.Server/Chat/TypingIndicator/TypingIndicatorSystem.cs
index c923738930..443923f675 100644
--- a/Content.Server/Chat/TypingIndicator/TypingIndicatorSystem.cs
+++ b/Content.Server/Chat/TypingIndicator/TypingIndicatorSystem.cs
@@ -54,7 +54,7 @@ private void OnClientTypingChanged(TypingChangedEvent ev, EntitySessionEventArgs
         SetTypingIndicatorEnabled(uid.Value, ev.IsTyping);
     }
 
-    private void SetTypingIndicatorEnabled(EntityUid uid, bool isEnabled, AppearanceComponent? appearance = null)
+    public void SetTypingIndicatorEnabled(EntityUid uid, bool isEnabled, AppearanceComponent? appearance = null)
     {
         if (!Resolve(uid, ref appearance, false))
             return;
diff --git a/Content.Server/DeltaV/CartridgeLoader/Cartridges/SecWatchCartridgeComponent.cs b/Content.Server/DeltaV/CartridgeLoader/Cartridges/SecWatchCartridgeComponent.cs
new file mode 100644
index 0000000000..7ccc90ef79
--- /dev/null
+++ b/Content.Server/DeltaV/CartridgeLoader/Cartridges/SecWatchCartridgeComponent.cs
@@ -0,0 +1,23 @@
+using Content.Shared.Security;
+
+namespace Content.Server.CartridgeLoader.Cartridges;
+
+[RegisterComponent, Access(typeof(SecWatchCartridgeSystem))]
+public sealed partial class SecWatchCartridgeComponent : Component
+{
+    /// <summary>
+    /// Only show people with these statuses.
+    /// </summary>
+    [DataField]
+    public List<SecurityStatus> Statuses = new()
+    {
+        SecurityStatus.Suspected,
+        SecurityStatus.Wanted
+    };
+
+    /// <summary>
+    /// Station entity thats getting its records checked.
+    /// </summary>
+    [DataField]
+    public EntityUid? Station;
+}
diff --git a/Content.Server/DeltaV/CartridgeLoader/Cartridges/SecWatchCartridgeSystem.cs b/Content.Server/DeltaV/CartridgeLoader/Cartridges/SecWatchCartridgeSystem.cs
new file mode 100644
index 0000000000..16da24514c
--- /dev/null
+++ b/Content.Server/DeltaV/CartridgeLoader/Cartridges/SecWatchCartridgeSystem.cs
@@ -0,0 +1,73 @@
+using Content.Server.Station.Systems;
+using Content.Server.StationRecords;
+using Content.Server.StationRecords.Systems;
+using Content.Shared.CartridgeLoader;
+using Content.Shared.CartridgeLoader.Cartridges;
+using Content.Shared.CriminalRecords;
+using Content.Shared.StationRecords;
+
+namespace Content.Server.CartridgeLoader.Cartridges;
+
+public sealed class SecWatchCartridgeSystem : EntitySystem
+{
+    [Dependency] private readonly CartridgeLoaderSystem _cartridgeLoader = default!;
+    [Dependency] private readonly StationRecordsSystem _records = default!;
+    [Dependency] private readonly StationSystem _station = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<RecordModifiedEvent>(OnRecordModified);
+
+        SubscribeLocalEvent<SecWatchCartridgeComponent, CartridgeUiReadyEvent>(OnUiReady);
+    }
+
+    private void OnRecordModified(RecordModifiedEvent args)
+    {
+        // when a record is modified update the ui of every loaded cartridge tuned to the same station
+        var query = EntityQueryEnumerator<SecWatchCartridgeComponent, CartridgeComponent>();
+        while (query.MoveNext(out var uid, out var comp, out var cartridge))
+        {
+            if (cartridge.LoaderUid is not {} loader || comp.Station != args.Station)
+                continue;
+
+            UpdateUI((uid, comp), loader);
+        }
+    }
+
+    private void OnUiReady(Entity<SecWatchCartridgeComponent> ent, ref CartridgeUiReadyEvent args)
+    {
+        UpdateUI(ent, args.Loader);
+    }
+
+    private void UpdateUI(Entity<SecWatchCartridgeComponent> ent, EntityUid loader)
+    {
+        // if the loader is on a grid, update the station
+        // if it is off grid use the cached station
+        if (_station.GetOwningStation(loader) is {} station)
+            ent.Comp.Station = station;
+
+        if (!TryComp<StationRecordsComponent>(ent.Comp.Station, out var records))
+            return;
+
+        station = ent.Comp.Station.Value;
+
+        var entries = new List<SecWatchEntry>();
+        foreach (var (id, criminal) in _records.GetRecordsOfType<CriminalRecord>(station, records))
+        {
+            if (!ent.Comp.Statuses.Contains(criminal.Status))
+                continue;
+
+            var key = new StationRecordKey(id, station);
+            if (!_records.TryGetRecord<GeneralStationRecord>(key, out var general, records))
+                continue;
+
+            var status = criminal.Status;
+            entries.Add(new SecWatchEntry(general.Name, general.JobTitle, criminal.Status, criminal.Reason));
+        }
+
+        var state = new SecWatchUiState(entries);
+        _cartridgeLoader.UpdateCartridgeUiState(loader, state);
+    }
+}
diff --git a/Content.Server/DeltaV/CartridgeLoader/CrimeAssistCartridgeComponent.cs b/Content.Server/DeltaV/CartridgeLoader/CrimeAssistCartridgeComponent.cs
deleted file mode 100644
index 741a613458..0000000000
--- a/Content.Server/DeltaV/CartridgeLoader/CrimeAssistCartridgeComponent.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace Content.Server.DeltaV.CartridgeLoader.Cartridges;
-
-[RegisterComponent]
-public sealed partial class CrimeAssistCartridgeComponent : Component
-{ }
diff --git a/Content.Server/DeltaV/CartridgeLoader/CrimeAssistCartridgeSystem.cs b/Content.Server/DeltaV/CartridgeLoader/CrimeAssistCartridgeSystem.cs
deleted file mode 100644
index 06732c2c53..0000000000
--- a/Content.Server/DeltaV/CartridgeLoader/CrimeAssistCartridgeSystem.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Content.Shared.CartridgeLoader;
-using Content.Server.DeltaV.CartridgeLoader;
-using Content.Server.CartridgeLoader.Cartridges;
-using Content.Server.CartridgeLoader;
-
-namespace Content.Server.DeltaV.CartridgeLoader.Cartridges;
-
-public sealed class CrimeAssistCartridgeSystem : EntitySystem
-{
-    [Dependency] private readonly CartridgeLoaderSystem? _cartridgeLoaderSystem = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-    }
-}
diff --git a/Content.Server/DeltaV/Paper/SignAttemptEvent.cs b/Content.Server/DeltaV/Paper/SignAttemptEvent.cs
new file mode 100644
index 0000000000..ff2d1b5103
--- /dev/null
+++ b/Content.Server/DeltaV/Paper/SignAttemptEvent.cs
@@ -0,0 +1,8 @@
+namespace Content.Server.DeltaV.Paper;
+
+/// <summary>
+/// 	Raised on the pen when trying to sign a paper.
+/// 	If it's cancelled the signature wasn't made.
+/// </summary>
+[ByRefEvent]
+public record struct SignAttemptEvent(EntityUid Paper, EntityUid User, bool Cancelled = false);
diff --git a/Content.Server/DeltaV/Paper/SignatureSystem.cs b/Content.Server/DeltaV/Paper/SignatureSystem.cs
new file mode 100644
index 0000000000..07a249399b
--- /dev/null
+++ b/Content.Server/DeltaV/Paper/SignatureSystem.cs
@@ -0,0 +1,104 @@
+using Content.Server.Access.Systems;
+using Content.Server.Paper;
+using Content.Server.Popups;
+using Content.Shared.Paper;
+using Content.Shared.Popups;
+using Content.Shared.Tag;
+using Content.Shared.Verbs;
+using Robust.Server.Audio;
+using Robust.Shared.Player;
+
+namespace Content.Server.DeltaV.Paper;
+
+public sealed class SignatureSystem : EntitySystem
+{
+    [Dependency] private readonly AudioSystem _audio = default!;
+    [Dependency] private readonly IdCardSystem _idCard = default!;
+    [Dependency] private readonly PaperSystem _paper = default!;
+    [Dependency] private readonly PopupSystem _popup = default!;
+    [Dependency] private readonly TagSystem _tags = default!;
+
+    // The sprite used to visualize "signatures" on paper entities.
+    private const string SignatureStampState = "paper_stamp-signature";
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<PaperComponent, GetVerbsEvent<AlternativeVerb>>(OnGetAltVerbs);
+    }
+
+    private void OnGetAltVerbs(Entity<PaperComponent> ent, ref GetVerbsEvent<AlternativeVerb> args)
+    {
+        if (!args.CanAccess || !args.CanInteract)
+            return;
+
+        if (args.Using is not {} pen || !_tags.HasTag(pen, "Write"))
+            return;
+
+        var user = args.User;
+        AlternativeVerb verb = new()
+        {
+            Act = () =>
+            {
+                TrySignPaper(ent, user, pen);
+            },
+            Text = Loc.GetString("paper-sign-verb"),
+            DoContactInteraction = true,
+            Priority = 10
+        };
+        args.Verbs.Add(verb);
+    }
+
+    /// <summary>
+    ///     Tries add add a signature to the paper with signer's name.
+    /// </summary>
+    public bool TrySignPaper(Entity<PaperComponent> paper, EntityUid signer, EntityUid pen)
+    {
+        var comp = paper.Comp;
+
+        var ev = new SignAttemptEvent(paper, signer);
+        RaiseLocalEvent(pen, ref ev);
+        if (ev.Cancelled)
+            return false;
+
+        var signatureName = DetermineEntitySignature(signer);
+
+        var stampInfo = new StampDisplayInfo()
+        {
+            StampedName = signatureName,
+            StampedColor = Color.DarkSlateGray, //TODO Make this configurable depending on the pen.
+        };
+
+        if (!comp.StampedBy.Contains(stampInfo) && _paper.TryStamp(paper, stampInfo, SignatureStampState, comp))
+        {
+            // Show popups and play a paper writing sound
+            var signedOtherMessage = Loc.GetString("paper-signed-other", ("user", signer), ("target", paper.Owner));
+            _popup.PopupEntity(signedOtherMessage, signer, Filter.PvsExcept(signer, entityManager: EntityManager), true);
+
+            var signedSelfMessage = Loc.GetString("paper-signed-self", ("target", paper.Owner));
+            _popup.PopupEntity(signedSelfMessage, signer, signer);
+
+            _audio.PlayPvs(comp.Sound, signer);
+
+            _paper.UpdateUserInterface(paper, comp);
+
+            return true;
+        }
+        else
+        {
+            // Show an error popup
+            _popup.PopupEntity(Loc.GetString("paper-signed-failure", ("target", paper.Owner)), signer, signer, PopupType.SmallCaution);
+
+            return false;
+        }
+    }
+
+    private string DetermineEntitySignature(EntityUid uid)
+    {
+        // If the entity has an ID, use the name on it.
+        if (_idCard.TryFindIdCard(uid, out var id) && !string.IsNullOrWhiteSpace(id.Comp.FullName))
+            return id.Comp.FullName;
+
+        // Alternatively, return the entity name
+        return Name(uid);
+    }
+}
diff --git a/Content.Server/NPC/Components/NPCConversationComponent.cs b/Content.Server/NPC/Components/NPCConversationComponent.cs
new file mode 100644
index 0000000000..c2a8ca31d7
--- /dev/null
+++ b/Content.Server/NPC/Components/NPCConversationComponent.cs
@@ -0,0 +1,152 @@
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using Content.Server.NPC.Events;
+using Content.Server.NPC.Prototypes;
+using Content.Server.NPC.Systems;
+
+namespace Content.Server.NPC.Components;
+
+[RegisterComponent]
+[Access(typeof(NPCConversationSystem))]
+public sealed partial class NPCConversationComponent : Component
+{
+    /// <summary>
+    /// Whether or not the listening logic is turned on.
+    /// </summary>
+    /// <remarks>
+    /// Queued responses will still play through, but no new attempts to listen will be made.
+    /// </remarks>
+    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField("enabled")]
+    public bool Enabled = true;
+
+    /* NYI:
+    /// <summary>
+    /// The NPC will pay attention when one of these words are said.
+    /// </summary>
+    [ViewVariables]
+    [DataField("aliases")]
+    public List<string> Aliases = new();
+    */
+
+    [ViewVariables]
+    [DataField("tree", required: true, customTypeSerializer: typeof(PrototypeIdSerializer<NPCConversationTreePrototype>))]
+    public string? ConversationTreeId;
+
+    /// <summary>
+    /// This is the cached prototype.
+    /// </summary>
+    [ViewVariables]
+    public NPCConversationTreePrototype ConversationTree = default!;
+
+    /// <summary>
+    /// Topics that are unlocked in the NPC's conversation tree.
+    /// </summary>
+    [ViewVariables]
+    public HashSet<NPCTopic> UnlockedTopics = new();
+
+    /// <summary>
+    /// How long until we stop paying attention to someone for a prompt.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField("attentionSpan")]
+    public TimeSpan AttentionSpan = TimeSpan.FromSeconds(20);
+
+    /// <summary>
+    /// This is the minimum delay before the NPC makes a response.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField("delayBeforeResponse")]
+    public TimeSpan DelayBeforeResponse = TimeSpan.FromSeconds(0.3);
+
+    /// <summary>
+    /// This is the approximate delay per letter typed in text.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField("typingDelay")]
+    public TimeSpan TypingDelay = TimeSpan.FromSeconds(0.05);
+
+    [ViewVariables]
+    public Stack<NPCResponse> ResponseQueue = new();
+
+    /// <summary>
+    /// This is when the NPC will respond with its top response.
+    /// </summary>
+    [ViewVariables]
+    [DataField("nextResponse", customTypeSerializer: typeof(TimeOffsetSerializer))]
+    public TimeSpan NextResponse;
+
+    /// <summary>
+    /// This is the direction the NPC was facing before looking towards a conversation partner.
+    /// </summary>
+    [ViewVariables]
+    public Angle OriginalFacing;
+
+    /// <summary>
+    /// This is who the NPC is paying attention to for conversation.
+    /// </summary>
+    [ViewVariables]
+    public EntityUid? AttendingTo;
+
+    /// <summary>
+    /// This is when the NPC will stop paying attention to a specific person.
+    /// </summary>
+    [ViewVariables]
+    [DataField("nextAttentionLoss", customTypeSerializer: typeof(TimeOffsetSerializer))]
+    public TimeSpan NextAttentionLoss;
+
+    /// <summary>
+    /// This event is fired the next time the NPC hears something from the
+    /// person they're speaking with and it takes control of the response.
+    /// </summary>
+    [ViewVariables]
+    public NPCConversationListenEvent? ListeningEvent;
+
+#region Idle Chatter
+
+    /// <summary>
+    /// Whether or not the NPC will say things unprompted.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField("idleEnabled")]
+    public bool IdleEnabled = true;
+
+    /// <summary>
+    /// This is the approximate delay between idle chats.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField("idleChatDelay")]
+    public TimeSpan IdleChatDelay = TimeSpan.FromMinutes(3);
+
+    /// <summary>
+    /// This is the order in which idle chat lines are given.
+    /// </summary>
+    /// <remarks>
+    /// This is randomized both on init and when the lines have been exhausted
+    /// to prevent repeating lines twice in a row and to avoid predictable patterns.
+    ///
+    /// It technically reduces randomness, with the benefit of less repetition.
+    /// </remarks>
+    [ViewVariables(VVAccess.ReadWrite)]
+    public List<int> IdleChatOrder = new();
+
+    /// <summary>
+    /// This is the next idle chat line that will be used.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite)]
+    public int IdleChatIndex = 0;
+
+    /// <summary>
+    /// This is when the NPC will say something out of its list of idle lines.
+    /// </summary>
+    /// <remarks>
+    /// This is reset every time the NPC speaks.
+    /// </remarks>
+    [ViewVariables]
+    [DataField("nextIdleChat", customTypeSerializer: typeof(TimeOffsetSerializer))]
+    public TimeSpan NextIdleChat;
+
+#endregion
+
+}
+
diff --git a/Content.Server/NPC/Events/NPCConversationEvents.cs b/Content.Server/NPC/Events/NPCConversationEvents.cs
new file mode 100644
index 0000000000..eb04f59bdd
--- /dev/null
+++ b/Content.Server/NPC/Events/NPCConversationEvents.cs
@@ -0,0 +1,63 @@
+using Robust.Shared.Audio;
+using Content.Server.NPC.Systems;
+
+namespace Content.Server.NPC.Events;
+
+/// <summary>
+/// This is used for dynamic responses and post-response events.
+/// </summary>
+[ImplicitDataDefinitionForInheritors]
+[Access(typeof(NPCConversationSystem))]
+public abstract partial class NPCConversationEvent : EntityEventArgs
+{
+    /// <summary>
+    /// This is the entity that the NPC is speaking to.
+    /// </summary>
+    public EntityUid? TalkingTo;
+}
+
+/// <summary>
+/// This event type is raised when an NPC hears a response when it was set to listen for one.
+/// </summary>
+/// <remarks>
+/// Set Handled to true when you want the NPC to stop listening.
+/// The NPC will otherwise keep listening and block any attempt to find a prompt in the speaker's words.
+/// </remarks>
+[ImplicitDataDefinitionForInheritors]
+[Access(typeof(NPCConversationSystem))]
+public abstract partial class NPCConversationListenEvent : HandledEntityEventArgs
+{
+    /// <summary>
+    /// This is the entity that said the message.
+    /// </summary>
+    public EntityUid? Speaker;
+
+    /// <summary>
+    /// This is the original message that the NPC heard.
+    /// </summary>
+    public string Message = default!;
+
+    /// <summary>
+    /// This is the message, parsed into separate words.
+    /// </summary>
+    public List<string> Words = default!;
+}
+
+public sealed partial class NPCConversationHelpEvent : NPCConversationEvent
+{
+    [DataField("text")]
+    public string? Text;
+
+    [DataField("audio")]
+    public SoundSpecifier? Audio;
+}
+
+/// <summary>
+/// This event can be raised after a response to cause an NPC to stop paying attention to someone.
+/// </summary>
+public sealed partial class NPCConversationByeEvent : NPCConversationEvent { }
+
+// The following classes help demonstrate some of the features of the system.
+// They may be separated out at some point.
+public sealed partial class NPCConversationToldNameEvent : NPCConversationListenEvent { }
+
diff --git a/Content.Server/NPC/Prototypes/NPCConversationTreePrototype.cs b/Content.Server/NPC/Prototypes/NPCConversationTreePrototype.cs
new file mode 100644
index 0000000000..20a616d830
--- /dev/null
+++ b/Content.Server/NPC/Prototypes/NPCConversationTreePrototype.cs
@@ -0,0 +1,154 @@
+using Robust.Shared.Audio;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+using Content.Server.NPC.Events;
+
+namespace Content.Server.NPC.Prototypes;
+
+[Prototype("npcConversationTree")]
+public sealed class NPCConversationTreePrototype : IPrototype, ISerializationHooks
+{
+    [ViewVariables]
+    [IdDataField]
+    public string ID { get; } = default!;
+
+    /// <summary>
+    /// Dialogue contains all the topics to which an NPC can discuss.
+    /// </summary>
+    [ViewVariables]
+    [DataField("dialogue", required: true)]
+    public readonly NPCTopic[] Dialogue = default!;
+
+    /// <summary>
+    /// Attention responses are what the NPC says when they start paying
+    /// attention to you without a specific question or prompt to respond to.
+    /// </summary>
+    [ViewVariables]
+    [DataField("attention", required: true)]
+    public readonly NPCResponse[] Attention = default!;
+
+    /// <summary>
+    /// Idle responses are just things the NPC will say when nothing else is
+    /// going on, after some time.
+    /// </summary>
+    [ViewVariables]
+    [DataField("idle", required: true)]
+    public readonly NPCResponse[] Idle = default!;
+
+    /// <summary>
+    /// Unknown responses are what the NPC says when they can't respond to a
+    /// particular question or prompt.
+    /// </summary>
+    [ViewVariables]
+    [DataField("unknown", required: true)]
+    public readonly NPCResponse[] Unknown = default!;
+
+    /// <summary>
+    /// Custom responses are available to use in extensions to the NPC
+    /// Conversation system.
+    /// </summary>
+    // NOTE: This may be removed in favor of storing NPCResponses on custom
+    // components, i.e. an NPCShopkeeperComponent, but for now, it lives here
+    // to help demonstrate some features.
+    [ViewVariables]
+    [DataField("custom")]
+    public readonly Dictionary<string, NPCResponse[]> Custom = default!;
+
+    /// <summary>
+    /// This exists as a quick way to map a prompt to a topic.
+    /// </summary>
+    public readonly Dictionary<string, NPCTopic> PromptToTopic = new();
+
+    // ISerializationHooks _is_ obsolete, but ConstructionGraphPrototype is using it as of this commit,
+    // and I'm not quite sure how to otherwise do this.
+    //
+    // I will look at that prototype when ISerializationHooks is phased out.
+    void ISerializationHooks.AfterDeserialization()
+    {
+        // Cache the strings mapping to prompts.
+        foreach (var topic in Dialogue)
+        {
+            foreach (var prompt in topic.Prompts)
+            {
+                PromptToTopic[prompt] = topic;
+            }
+        }
+    }
+}
+
+[DataDefinition]
+public sealed partial class NPCTopic
+{
+    [DataField]
+    public string[] Prompts = default!;
+
+    /// <summary>
+    /// This determines the likelihood of this topic being selected over any
+    /// other, given the existence of multiple candidates.
+    /// </summary>
+    [DataField]
+    public float Weight = 1.0f;
+
+    /// <summary>
+    /// Locked topics will not be accessible through dialogue until unlocked.
+    /// </summary>
+    [DataField]
+    public bool Locked;
+
+    /// <summary>
+    /// Hidden topics won't show up in any form of "help" question.
+    /// </summary>
+    [DataField]
+    public bool Hidden;
+
+    [DataField("responses", required: true)]
+    public NPCResponse[] Responses = default!;
+}
+
+[DataDefinition]
+public sealed partial class NPCResponse
+{
+    public NPCResponse() { }
+
+    public NPCResponse(string? text, SoundSpecifier? audio = null, NPCConversationEvent? ev = null)
+    {
+        Text = text;
+        Audio = audio;
+        Event = ev;
+    }
+
+    public override string ToString()
+    {
+        return $"NPCResponse({Text})";
+    }
+
+    [DataField]
+    public string? Text;
+
+    [DataField]
+    public SoundSpecifier? Audio;
+
+    /* [DataField("emote")] */
+    /* public string? Emote; */
+
+    /// <summary>
+    /// This event is raised when the response is queued,
+    /// for the purpose of dynamic responses.
+    /// </summary>
+    [DataField]
+    public NPCConversationEvent? Is;
+
+    /// <summary>
+    /// This event is raised after the response is made.
+    /// </summary>
+    [DataField]
+    public NPCConversationEvent? Event;
+
+    /// <summary>
+    /// This event is raised when the NPC next hears a response,
+    /// allowing the response to be processed by other systems.
+    /// </summary>
+    [DataField]
+    public NPCConversationListenEvent? ListenEvent;
+}
+
diff --git a/Content.Server/NPC/Systems/NPCConversationSystem.cs b/Content.Server/NPC/Systems/NPCConversationSystem.cs
new file mode 100644
index 0000000000..015adb19de
--- /dev/null
+++ b/Content.Server/NPC/Systems/NPCConversationSystem.cs
@@ -0,0 +1,558 @@
+using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Text.RegularExpressions;
+using Robust.Server.GameObjects;
+using Robust.Shared.Audio;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+using Robust.Shared.Timing;
+using Content.Server.Chat.Systems;
+using Content.Server.Chat.TypingIndicator;
+using Content.Server.NPC.HTN;
+using Content.Server.NPC.Components;
+using Content.Server.NPC.Events;
+using Content.Server.NPC.Prototypes;
+using Content.Server.Speech;
+using Content.Shared.Interaction;
+using Content.Server.Radio.Components;
+
+namespace Content.Server.NPC.Systems;
+
+public sealed class NPCConversationSystem : EntitySystem
+{
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
+    [Dependency] private readonly IGameTiming _gameTiming = default!;
+    [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
+    [Dependency] private readonly ChatSystem _chatSystem = default!;
+    [Dependency] private readonly NPCSystem _npcSystem = default!;
+    [Dependency] private readonly RotateToFaceSystem _rotateToFaceSystem = default!;
+    [Dependency] private readonly TransformSystem _transformSystem = default!;
+    [Dependency] private readonly TypingIndicatorSystem _typingIndicatorSystem = default!;
+
+    private ISawmill _sawmill = default!;
+
+    // TODO: attention attenuation. distance, facing, visible
+    // TODO: attending to multiple people, multiple streams of conversation
+    // TODO: multi-word prompts
+    // TODO: nameless prompting (pointing is good)
+    // TODO: aliases
+
+    public static readonly string[] QuestionWords = { "who", "what", "when", "why", "where", "how" };
+    public static readonly string[] Copulae = { "is", "are" };
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        _sawmill = Logger.GetSawmill("npc.conversation");
+
+        SubscribeLocalEvent<NPCConversationComponent, ComponentInit>(OnInit);
+        SubscribeLocalEvent<NPCConversationComponent, EntityUnpausedEvent>(OnUnpaused);
+        SubscribeLocalEvent<NPCConversationComponent, ListenAttemptEvent>(OnListenAttempt);
+        SubscribeLocalEvent<NPCConversationComponent, ListenEvent>(OnListen);
+
+        SubscribeLocalEvent<NPCConversationComponent, NPCConversationByeEvent>(OnBye);
+        SubscribeLocalEvent<NPCConversationComponent, NPCConversationHelpEvent>(OnHelp);
+
+        SubscribeLocalEvent<NPCConversationComponent, NPCConversationToldNameEvent>(OnToldName);
+    }
+
+#region API
+
+    /// <summary>
+    /// Toggle the ability of an NPC to listen for topics.
+    /// </summary>
+    public void EnableConversation(EntityUid uid, bool enable = true, NPCConversationComponent? component = null)
+    {
+        if (!Resolve(uid, ref component))
+            return;
+
+        component.Enabled = enable;
+    }
+
+    /// <summary>
+    /// Toggle the NPC's willingness to make idle comments.
+    /// </summary>
+    public void EnableIdleChat(EntityUid uid, bool enable = true, NPCConversationComponent? component = null)
+    {
+        if (!Resolve(uid, ref component))
+            return;
+
+        component.IdleEnabled = enable;
+    }
+
+    /// <summary>
+    /// Return locked status of a dialogue topic.
+    /// </summary>
+    public bool IsDialogueLocked(EntityUid uid, string option, NPCConversationComponent? component = null)
+    {
+        if (!Resolve(uid, ref component))
+            return true;
+
+        if (!component.ConversationTree.PromptToTopic.TryGetValue(option, out var topic))
+        {
+            _sawmill.Warning($"Tried to check locked status of missing dialogue option `{option}` on {ToPrettyString(uid)}");
+            return true;
+        }
+
+        if (component.UnlockedTopics.Contains(topic))
+            return false;
+
+        return topic.Locked;
+    }
+
+    /// <summary>
+    /// Unlock dialogue options normally locked in an NPC's conversation tree.
+    /// </summary>
+    public void UnlockDialogue(EntityUid uid, string option, NPCConversationComponent? component = null)
+    {
+        if (!Resolve(uid, ref component))
+            return;
+
+        if (component.ConversationTree.PromptToTopic.TryGetValue(option, out var topic))
+            component.UnlockedTopics.Add(topic);
+        else
+            _sawmill.Warning($"Tried to unlock missing dialogue option `{option}` on {ToPrettyString(uid)}");
+    }
+
+    /// <inheritdoc cref="UnlockDialogue(EntityUid, string, NPCConversationComponent?)"/>
+    public void UnlockDialogue(EntityUid uid, HashSet<string> options, NPCConversationComponent? component = null)
+    {
+        if (!Resolve(uid, ref component))
+            return;
+
+        foreach (var option in options)
+            UnlockDialogue(uid, option, component);
+    }
+
+    /// <summary>
+    /// Queue a response for an NPC with a visible typing indicator and delay between messages.
+    /// </summary>
+    /// <remarks>
+    /// This can be used as opposed to the typical <see cref="ChatSystem.TrySendInGameICMessage"/> method.
+    /// </remarks>
+    public void QueueResponse(EntityUid uid, NPCResponse response, NPCConversationComponent? component = null)
+    {
+        if (!Resolve(uid, ref component))
+            return;
+
+        if (response.Is is {} ev)
+        {
+            // This is a dynamic response which will call QueueResponse with static responses of its own.
+            ev.TalkingTo = component.AttendingTo;
+            RaiseLocalEvent(uid, (object) ev);
+            return;
+        }
+
+        if (component.ResponseQueue.Count == 0)
+        {
+            DelayResponse(uid, component, response);
+            _typingIndicatorSystem.SetTypingIndicatorEnabled(uid, true);
+        }
+
+        component.ResponseQueue.Push(response);
+    }
+
+    /// <summary>
+    /// Make an NPC stop paying attention to someone.
+    /// </summary>
+    public void LoseAttention(EntityUid uid, NPCConversationComponent? component = null)
+    {
+        if (!Resolve(uid, ref component))
+            return;
+
+        component.AttendingTo = null;
+        component.ListeningEvent = null;
+        _rotateToFaceSystem.TryFaceAngle(uid, component.OriginalFacing);
+    }
+
+#endregion
+
+    private void DelayResponse(EntityUid uid, NPCConversationComponent component, NPCResponse response)
+    {
+        if (response.Text == null)
+            return;
+
+        component.NextResponse = _gameTiming.CurTime +
+            component.DelayBeforeResponse +
+            component.TypingDelay.TotalSeconds * TimeSpan.FromSeconds(response.Text.Length) *
+            _random.NextDouble(0.9, 1.1);
+    }
+
+    private IEnumerable<NPCTopic> GetAvailableTopics(EntityUid uid, NPCConversationComponent component)
+    {
+        HashSet<NPCTopic> availableTopics = new();
+
+        foreach (var topic in component.ConversationTree.Dialogue)
+        {
+            if (!topic.Locked || component.UnlockedTopics.Contains(topic))
+                availableTopics.Add(topic);
+        }
+
+        return availableTopics;
+    }
+
+    private IEnumerable<NPCTopic> GetVisibleTopics(EntityUid uid, NPCConversationComponent component)
+    {
+        HashSet<NPCTopic> visibleTopics = new();
+
+        foreach (var topic in component.ConversationTree.Dialogue)
+        {
+            if (!topic.Hidden && (!topic.Locked || component.UnlockedTopics.Contains(topic)))
+                visibleTopics.Add(topic);
+        }
+
+        return visibleTopics;
+    }
+
+    private void OnInit(EntityUid uid, NPCConversationComponent component, ComponentInit args)
+    {
+        if (component.ConversationTreeId == null)
+            return;
+
+        component.ConversationTree = _prototype.Index<NPCConversationTreePrototype>(component.ConversationTreeId);
+        component.NextIdleChat = _gameTiming.CurTime + component.IdleChatDelay;
+
+        for (var i = 0; i < component.ConversationTree.Idle.Length; ++i)
+            component.IdleChatOrder.Add(i);
+
+        _random.Shuffle(component.IdleChatOrder);
+    }
+
+    private void OnUnpaused(EntityUid uid, NPCConversationComponent component, ref EntityUnpausedEvent args)
+    {
+        component.NextResponse += args.PausedTime;
+        component.NextAttentionLoss += args.PausedTime;
+        component.NextIdleChat += args.PausedTime;
+    }
+
+    private bool TryGetIdleChatLine(EntityUid uid, NPCConversationComponent component, [NotNullWhen(true)] out NPCResponse? line)
+    {
+        line = null;
+
+        if (component.IdleChatOrder.Count() == 0)
+            return false;
+
+        if (++component.IdleChatIndex == component.IdleChatOrder.Count())
+        {
+            // Exhausted all lines in the pre-shuffled order.
+            // Reset the index and shuffle again.
+            component.IdleChatIndex = 0;
+            _random.Shuffle(component.IdleChatOrder);
+        }
+
+        var index = component.IdleChatOrder[component.IdleChatIndex];
+
+        line = component.ConversationTree.Idle[index];
+
+        return true;
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var query = EntityQueryEnumerator<NPCConversationComponent>();
+        while (query.MoveNext(out var uid, out var component))
+        {
+            var curTime = _gameTiming.CurTime;
+
+            if (curTime >= component.NextResponse && component.ResponseQueue.Count > 0)
+            {
+                // Make a response.
+                Respond(uid, component, component.ResponseQueue.Pop());
+            }
+
+            if (curTime >= component.NextAttentionLoss && component.AttendingTo != null)
+            {
+                // Forget who we were talking to.
+                LoseAttention(uid, component);
+            }
+
+            if (component.IdleEnabled &&
+                curTime >= component.NextIdleChat &&
+                TryGetIdleChatLine(uid, component, out var line))
+            {
+                Respond(uid, component, line);
+            }
+        }
+    }
+
+    private void OnListenAttempt(EntityUid uid, NPCConversationComponent component, ListenAttemptEvent args)
+    {
+        if (!component.Enabled ||
+            // Don't listen to myself...
+            uid == args.Source ||
+            // Don't bother listening to other NPCs. For now.
+            HasComp<HTNComponent>(args.Source) ||
+            // We're already "typing" a response, so do that first.
+            component.ResponseQueue.Count > 0)
+        {
+            args.Cancel();
+        }
+    }
+
+    private void PayAttentionTo(EntityUid uid, NPCConversationComponent component, EntityUid speaker)
+    {
+        component.AttendingTo = speaker;
+        component.NextAttentionLoss = _gameTiming.CurTime + component.AttentionSpan;
+        component.OriginalFacing = _transformSystem.GetWorldRotation(uid);
+    }
+
+    private void Respond(EntityUid uid, NPCConversationComponent component, NPCResponse response)
+    {
+        if (component.ResponseQueue.Count == 0)
+            _typingIndicatorSystem.SetTypingIndicatorEnabled(uid, false);
+        else
+            DelayResponse(uid, component, component.ResponseQueue.Peek());
+
+        if (component.AttendingTo != null)
+        {
+            // TODO: This line is a mouthful. Maybe write a public API that supports EntityCoordinates later?
+            var speakerCoords = Transform(component.AttendingTo.Value).Coordinates.ToMap(EntityManager, _transformSystem).Position;
+            _rotateToFaceSystem.TryFaceCoordinates(uid, speakerCoords);
+        }
+
+        if (response.Event is {} ev)
+        {
+            ev.TalkingTo = component.AttendingTo;
+            RaiseLocalEvent(uid, (object) ev);
+        }
+
+        if (response.ListenEvent != null)
+            component.ListeningEvent = response.ListenEvent;
+
+        if (response.Text != null)
+            _chatSystem.TrySendInGameICMessage(uid, Loc.GetString(response.Text), InGameICChatType.Speak, false);
+
+        if (response.Audio != null)
+            _audioSystem.PlayPvs(response.Audio, uid,
+                // TODO: Allow this to be configured per NPC/response.
+                AudioParams.Default
+                    .WithVolume(8f)
+                    .WithMaxDistance(9f)
+                    .WithRolloffFactor(0.5f));
+
+        // Refresh our attention.
+        component.NextAttentionLoss = _gameTiming.CurTime + component.AttentionSpan;
+        component.NextIdleChat = component.NextAttentionLoss + component.IdleChatDelay;
+    }
+
+    private List<string> ParseMessageIntoWords(string message)
+    {
+        return Regex.Replace(message.Trim().ToLower(), @"(\p{P})", "")
+            .Split()
+            .ToList();
+    }
+
+    private bool FindResponse(EntityUid uid, NPCConversationComponent component, List<string> words, [NotNullWhen(true)] out NPCResponse? response)
+    {
+        response = null;
+
+        var availableTopics = GetAvailableTopics(uid, component);
+
+        // Some topics are more interesting than others.
+        var greatestWeight = 0f;
+        NPCTopic? candidate = null;
+
+        foreach (var word in words)
+        {
+            if (component.ConversationTree.PromptToTopic.TryGetValue(word, out var topic) &&
+                availableTopics.Contains(topic) &&
+                topic.Weight > greatestWeight)
+            {
+                greatestWeight = topic.Weight;
+                candidate = topic;
+            }
+        }
+
+        if (candidate != null)
+        {
+            response = _random.Pick(candidate.Responses);
+            return true;
+        }
+
+        return false;
+    }
+
+    private bool JudgeQuestionLikelihood(EntityUid uid, NPCConversationComponent component, List<string> words, string message)
+    {
+        if (message.Length > 0 && message[^1] == '?')
+            // A question mark is an absolute mark of a question.
+            return true;
+
+        if (words.Count == 1)
+            // The usefulness of this is dubious, but it's definitely a question.
+            return QuestionWords.Contains(words[0]);
+
+        if (words.Count >= 2)
+            return QuestionWords.Contains(words[0]) && Copulae.Contains(words[1]);
+
+        return false;
+    }
+
+    private void OnBye(EntityUid uid, NPCConversationComponent component, NPCConversationByeEvent args)
+    {
+        LoseAttention(uid, component);
+    }
+
+    private void OnHelp(EntityUid uid, NPCConversationComponent component, NPCConversationHelpEvent args)
+    {
+        if (args.Text == null)
+        {
+            _sawmill.Error($"{ToPrettyString(uid)} heard a Help prompt but has no text for it.");
+            return;
+        }
+
+        var availableTopics = GetVisibleTopics(uid, component);
+        var availablePrompts = availableTopics.Select(topic => topic.Prompts.FirstOrDefault()).ToArray();
+
+        string availablePromptsText;
+        if (availablePrompts.Count() <= 2)
+        {
+            availablePromptsText = Loc.GetString(args.Text,
+                ("availablePrompts", string.Join(" or ", availablePrompts))
+            );
+        }
+        else
+        {
+            availablePrompts[^1] = $"or {availablePrompts[^1]}";
+            availablePromptsText = Loc.GetString(args.Text,
+                ("availablePrompts", string.Join(", ", availablePrompts))
+            );
+        }
+
+        // Unlikely we'll be able to do audio that isn't hard-coded,
+        // so best to keep it general.
+        var response = new NPCResponse(availablePromptsText, args.Audio);
+        QueueResponse(uid, response, component);
+    }
+
+    private void OnToldName(EntityUid uid, NPCConversationComponent component, NPCConversationListenEvent args)
+    {
+        if (!component.ConversationTree.Custom.TryGetValue("toldName", out var responses))
+            return;
+
+        var response = _random.Pick(responses);
+        if (response.Text == null)
+        {
+            _sawmill.Error($"{ToPrettyString(uid)} was told a name but had no text response.");
+            return;
+        }
+
+        // The world's simplest heuristic for names:
+        if (args.Words.Count > 3)
+        {
+            // It didn't seem like a name, so wait for something that does.
+            return;
+        }
+
+        var cleanedName = string.Join(" ", args.Words);
+        cleanedName = char.ToUpper(cleanedName[0]) + cleanedName.Remove(0, 1);
+
+        var formattedResponse = new NPCResponse(Loc.GetString(response.Text,
+                ("name", cleanedName)),
+                response.Audio);
+
+        QueueResponse(uid, formattedResponse, component);
+        args.Handled = true;
+    }
+
+    private void OnListen(EntityUid uid, NPCConversationComponent component, ListenEvent args)
+    {
+        if (HasComp<RadioSpeakerComponent>(args.Source))
+            return;
+
+        if (component.AttendingTo != null && component.AttendingTo != args.Source)
+            // Ignore someone speaking to us if we're already paying attention to someone else.
+            return;
+
+        var words = ParseMessageIntoWords(args.Message);
+        if (words.Count == 0)
+            return;
+
+        if (component.AttendingTo == args.Source)
+        {
+            // The person we're talking to said something to us.
+
+            if (component.ListeningEvent is {} ev)
+            {
+                // We were waiting on this person to say something, and they've said something.
+                ev.Handled = false;
+                ev.Speaker = component.AttendingTo;
+                ev.Message = args.Message;
+                ev.Words = words;
+                RaiseLocalEvent(uid, (object) ev);
+
+                if (ev.Handled)
+                    component.ListeningEvent = null;
+
+                return;
+            }
+
+            // We're already paying attention to this person,
+            // so try to figure out if they said something we can talk about.
+            if (FindResponse(uid, component, words, out var response))
+            {
+                // A response was found so go ahead with it.
+                QueueResponse(uid, response,  component);
+            }
+            else if(JudgeQuestionLikelihood(uid, component, words, args.Message))
+            {
+                // The message didn't match any of the prompts, but it seemed like a question.
+                var unknownResponse = _random.Pick(component.ConversationTree.Unknown);
+                QueueResponse(uid, unknownResponse,  component);
+            }
+
+            // If the message didn't seem like a question,
+            // and it didn't raise any of our topics,
+            // then politely ignore who we're talking with.
+            //
+            // It's better than spamming them with "I don't understand."
+            return;
+        }
+
+        // See if someone said our name.
+        var myName = MetaData(uid).EntityName.ToLower();
+
+        // So this is a rough heuristic, but if our name occurs within the first three words,
+        // or is the very last one, someone might be trying to talk to us.
+        var payAttention = words[0] == myName || words[^1] == myName;
+        if (!payAttention)
+        {
+            for (int i = 1; i < Math.Min(2, words.Count); ++i)
+            {
+                if (words[i] == myName)
+                {
+                    payAttention = true;
+                    break;
+                }
+            }
+        }
+
+        if (payAttention)
+        {
+            PayAttentionTo(uid, component, args.Source);
+
+            if (!FindResponse(uid, component, words, out var response))
+            {
+                if(JudgeQuestionLikelihood(uid, component, words, args.Message) &&
+                    // This subcondition exists to block our name being interpreted as a question in its own right.
+                    words.Count > 1)
+                {
+                    response = _random.Pick(component.ConversationTree.Unknown);
+                }
+                else
+                {
+                    response = _random.Pick(component.ConversationTree.Attention);
+                }
+            }
+
+            QueueResponse(uid, response, component);
+        }
+    }
+}
+
diff --git a/Content.Server/Nyanotrasen/Carrying/CarryingSystem.cs b/Content.Server/Nyanotrasen/Carrying/CarryingSystem.cs
index bb071334fa..103731b1b0 100644
--- a/Content.Server/Nyanotrasen/Carrying/CarryingSystem.cs
+++ b/Content.Server/Nyanotrasen/Carrying/CarryingSystem.cs
@@ -1,3 +1,4 @@
+using System.Numerics;
 using System.Threading;
 using Content.Server.DoAfter;
 using Content.Server.Body.Systems;
@@ -5,6 +6,7 @@
 using Content.Server.Resist;
 using Content.Server.Popups;
 using Content.Server.Inventory;
+using Content.Server.Nyanotrasen.Item.PseudoItem;
 using Content.Shared.Climbing; // Shared instead of Server
 using Content.Shared.Mobs;
 using Content.Shared.DoAfter;
@@ -23,9 +25,12 @@
 using Content.Shared.Standing;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Inventory.VirtualItem;
+using Content.Shared.Item;
 using Content.Shared.Throwing;
 using Content.Shared.Physics.Pull;
 using Content.Shared.Mobs.Systems;
+using Content.Shared.Nyanotrasen.Item.PseudoItem;
+using Content.Shared.Storage;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Physics.Components;
 
@@ -44,11 +49,13 @@ public sealed class CarryingSystem : EntitySystem
         [Dependency] private readonly PopupSystem _popupSystem = default!;
         [Dependency] private readonly MovementSpeedModifierSystem _movementSpeed = default!;
         [Dependency] private readonly RespiratorSystem _respirator = default!;
+        [Dependency] private readonly PseudoItemSystem _pseudoItem = default!;
 
         public override void Initialize()
         {
             base.Initialize();
             SubscribeLocalEvent<CarriableComponent, GetVerbsEvent<AlternativeVerb>>(AddCarryVerb);
+            SubscribeLocalEvent<CarryingComponent, GetVerbsEvent<InnateVerb>>(AddInsertCarriedVerb);
             SubscribeLocalEvent<CarryingComponent, VirtualItemDeletedEvent>(OnVirtualItemDeleted);
             SubscribeLocalEvent<CarryingComponent, BeforeThrowEvent>(OnThrow);
             SubscribeLocalEvent<CarryingComponent, EntParentChangedMessage>(OnParentChanged);
@@ -64,7 +71,6 @@ public override void Initialize()
             SubscribeLocalEvent<CarriableComponent, CarryDoAfterEvent>(OnDoAfter);
         }
 
-
         private void AddCarryVerb(EntityUid uid, CarriableComponent component, GetVerbsEvent<AlternativeVerb> args)
         {
             if (!args.CanInteract || !args.CanAccess)
@@ -97,6 +103,33 @@ private void AddCarryVerb(EntityUid uid, CarriableComponent component, GetVerbsE
             args.Verbs.Add(verb);
         }
 
+        private void AddInsertCarriedVerb(EntityUid uid, CarryingComponent component, GetVerbsEvent<InnateVerb> args)
+        {
+            // If the person is carrying someone, and the carried person is a pseudo-item, and the target entity is a storage,
+            // then add an action to insert the carried entity into the target
+            var toInsert = args.Using;
+            if (toInsert is not { Valid: true } || !args.CanAccess || !TryComp<PseudoItemComponent>(toInsert, out var pseudoItem))
+                return;
+
+            if (!TryComp<StorageComponent>(args.Target, out var storageComp))
+                return;
+
+            if (!_pseudoItem.CheckItemFits((toInsert.Value, pseudoItem), (args.Target, storageComp)))
+                return;
+
+            InnateVerb verb = new()
+            {
+                Act = () =>
+                {
+                    DropCarried(uid, toInsert.Value);
+                    _pseudoItem.TryInsert(args.Target, toInsert.Value, pseudoItem, storageComp);
+                },
+                Text = Loc.GetString("action-name-insert-other", ("target", toInsert)),
+                Priority = 2
+            };
+            args.Verbs.Add(verb);
+        }
+
         /// <summary>
         /// Since the carried entity is stored as 2 virtual items, when deleted we want to drop them.
         /// </summary>
@@ -125,7 +158,12 @@ private void OnThrow(EntityUid uid, CarryingComponent component, BeforeThrowEven
 
         private void OnParentChanged(EntityUid uid, CarryingComponent component, ref EntParentChangedMessage args)
         {
-            if (Transform(uid).MapID != args.OldMapId)
+            var xform = Transform(uid);
+            if (xform.MapID != args.OldMapId)
+                return;
+
+            // Do not drop the carried entity if the new parent is a grid
+            if (xform.ParentUid == xform.GridUid)
                 return;
 
             DropCarried(uid, component.Carried);
@@ -158,9 +196,13 @@ private void OnMoveInput(EntityUid uid, BeingCarriedComponent component, ref Mov
             if (!TryComp<CanEscapeInventoryComponent>(uid, out var escape))
                 return;
 
+            if (!args.HasDirectionalMovement)
+                return;
+
             if (_actionBlockerSystem.CanInteract(uid, component.Carrier))
             {
-                _escapeInventorySystem.AttemptEscape(uid, component.Carrier, escape, MassContest(uid, component.Carrier));
+                // Note: the mass contest is inverted because weaker entities are supposed to take longer to escape
+                _escapeInventorySystem.AttemptEscape(uid, component.Carrier, escape, MassContest(component.Carrier, uid));
             }
         }
 
@@ -209,12 +251,7 @@ private void OnDoAfter(EntityUid uid, CarriableComponent component, CarryDoAfter
         }
         private void StartCarryDoAfter(EntityUid carrier, EntityUid carried, CarriableComponent component)
         {
-            TimeSpan length = TimeSpan.FromSeconds(3);
-
-            var mod = MassContest(carrier, carried);
-
-            if (mod != 0)
-                length /= mod;
+            TimeSpan length = GetPickupDuration(carrier, carried);
 
             if (length >= TimeSpan.FromSeconds(9))
             {
@@ -236,6 +273,9 @@ private void StartCarryDoAfter(EntityUid carrier, EntityUid carried, CarriableCo
             };
 
             _doAfterSystem.TryStartDoAfter(args);
+
+            // Show a popup to the person getting picked up
+            _popupSystem.PopupEntity(Loc.GetString("carry-started", ("carrier", carrier)), carried, carried);
         }
 
         private void Carry(EntityUid carrier, EntityUid carried)
@@ -260,6 +300,26 @@ private void Carry(EntityUid carrier, EntityUid carried)
             _actionBlockerSystem.UpdateCanMove(carried);
         }
 
+        public bool TryCarry(EntityUid carrier, EntityUid toCarry, CarriableComponent? carriedComp = null)
+        {
+            if (!Resolve(toCarry, ref carriedComp, false))
+                return false;
+
+            if (!CanCarry(carrier, toCarry, carriedComp))
+                return false;
+
+            // The second one means that carrier is a pseudo-item and is inside a bag.
+            if (HasComp<BeingCarriedComponent>(carrier) || HasComp<ItemComponent>(carrier))
+                return false;
+
+            if (GetPickupDuration(carrier, toCarry) > TimeSpan.FromSeconds(9))
+                return false;
+
+            Carry(carrier, toCarry);
+
+            return true;
+        }
+
         public void DropCarried(EntityUid carrier, EntityUid carried)
         {
             RemComp<CarryingComponent>(carrier); // get rid of this first so we don't recusrively fire that event
@@ -323,5 +383,43 @@ private float MassContest(EntityUid roller, EntityUid target, PhysicsComponent?
 
             return rollerPhysics.FixturesMass / targetPhysics.FixturesMass;
         }
+
+        private TimeSpan GetPickupDuration(EntityUid carrier, EntityUid carried)
+        {
+            var length = TimeSpan.FromSeconds(3);
+
+            var mod = MassContest(carrier, carried);
+            if (mod != 0)
+                length /= mod;
+
+            return length;
+        }
+
+        public override void Update(float frameTime)
+        {
+            var query = EntityQueryEnumerator<BeingCarriedComponent>();
+            while (query.MoveNext(out var carried, out var comp))
+            {
+                var carrier = comp.Carrier;
+                if (carrier is not { Valid: true } || carried is not { Valid: true })
+                    continue;
+
+                // SOMETIMES - when an entity is inserted into disposals, or a cryosleep chamber - it can get re-parented without a proper reparent event
+                // when this happens, it needs to be dropped because it leads to weird behavior
+                if (Transform(carried).ParentUid != carrier)
+                {
+                    DropCarried(carrier, carried);
+                    continue;
+                }
+
+                // Make sure the carried entity is always centered relative to the carrier, as gravity pulls can offset it otherwise
+                var xform = Transform(carried);
+                if (!xform.LocalPosition.Equals(Vector2.Zero))
+                {
+                    xform.LocalPosition = Vector2.Zero;
+                }
+            }
+            query.Dispose();
+        }
     }
 }
diff --git a/Content.Server/Nyanotrasen/Item/PseudoItem/PseudoItemSystem.cs b/Content.Server/Nyanotrasen/Item/PseudoItem/PseudoItemSystem.cs
index 76cfe7d904..6df387e6ba 100644
--- a/Content.Server/Nyanotrasen/Item/PseudoItem/PseudoItemSystem.cs
+++ b/Content.Server/Nyanotrasen/Item/PseudoItem/PseudoItemSystem.cs
@@ -1,6 +1,9 @@
-using Content.Server.DoAfter;
+using Content.Server.Carrying;
+using Content.Server.DoAfter;
 using Content.Server.Item;
+using Content.Server.Popups;
 using Content.Server.Storage.EntitySystems;
+using Content.Shared.Bed.Sleep;
 using Content.Shared.DoAfter;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Item;
@@ -17,12 +20,14 @@ public sealed class PseudoItemSystem : SharedPseudoItemSystem
     [Dependency] private readonly StorageSystem _storage = default!;
     [Dependency] private readonly ItemSystem _item = default!;
     [Dependency] private readonly DoAfterSystem _doAfter = default!;
-
+    [Dependency] private readonly CarryingSystem _carrying = default!;
+    [Dependency] private readonly PopupSystem _popup = default!;
 
     public override void Initialize()
     {
         base.Initialize();
         SubscribeLocalEvent<PseudoItemComponent, GetVerbsEvent<AlternativeVerb>>(AddInsertAltVerb);
+        SubscribeLocalEvent<PseudoItemComponent, TryingToSleepEvent>(OnTrySleeping);
     }
 
     private void AddInsertAltVerb(EntityUid uid, PseudoItemComponent component, GetVerbsEvent<AlternativeVerb> args)
@@ -53,4 +58,25 @@ private void AddInsertAltVerb(EntityUid uid, PseudoItemComponent component, GetV
         };
         args.Verbs.Add(verb);
     }
+
+    protected override void OnGettingPickedUpAttempt(EntityUid uid, PseudoItemComponent component, GettingPickedUpAttemptEvent args)
+    {
+        // Try to pick the entity up instead first
+        if (args.User != args.Item && _carrying.TryCarry(args.User, uid))
+        {
+            args.Cancel();
+            return;
+        }
+
+        // If could not pick up, just take it out onto the ground as per default
+        base.OnGettingPickedUpAttempt(uid, component, args);
+    }
+
+    // Show a popup when a pseudo-item falls asleep inside a bag.
+    private void OnTrySleeping(EntityUid uid, PseudoItemComponent component, TryingToSleepEvent args)
+    {
+        var parent = Transform(uid).ParentUid;
+        if (!HasComp<SleepingComponent>(uid) && parent is { Valid: true } && HasComp<AllowsSleepInsideComponent>(parent))
+            _popup.PopupEntity(Loc.GetString("popup-sleep-in-bag", ("entity", uid)), uid);
+    }
 }
diff --git a/Content.Server/Nyanotrasen/Research/SophicScribe/SophicScribeSystem.cs b/Content.Server/Nyanotrasen/Research/SophicScribe/SophicScribeSystem.cs
index b1a6c1e9de..ba5ff0a056 100644
--- a/Content.Server/Nyanotrasen/Research/SophicScribe/SophicScribeSystem.cs
+++ b/Content.Server/Nyanotrasen/Research/SophicScribe/SophicScribeSystem.cs
@@ -1,5 +1,8 @@
 using Content.Server.Psionics.Abilities;
 using Content.Server.Chat.Systems;
+using Content.Server.NPC.Events;
+using Content.Server.NPC.Systems;
+using Content.Server.NPC.Prototypes;
 using Content.Server.Radio.Components;
 using Content.Server.Radio.EntitySystems;
 using Content.Server.StationEvents.Events;
@@ -18,6 +21,8 @@ public sealed partial class SophicScribeSystem : EntitySystem
     [Dependency] private readonly RadioSystem _radioSystem = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly NPCConversationSystem _conversationSystem = default!;
+    protected ISawmill Sawmill = default!;
 
     public override void Update(float frameTime)
     {
@@ -51,6 +56,32 @@ public override void Initialize()
 
         SubscribeLocalEvent<SophicScribeComponent, InteractHandEvent>(OnInteractHand);
         SubscribeLocalEvent<GlimmerEventEndedEvent>(OnGlimmerEventEnded);
+        SubscribeLocalEvent<SophicScribeComponent, NPCConversationGetGlimmerEvent>(OnGetGlimmer);
+    }
+
+    private void OnGetGlimmer(EntityUid uid, SophicScribeComponent component, NPCConversationGetGlimmerEvent args)
+    {
+        if (args.Text == null)
+        {
+            Sawmill.Error($"{uid} heard a glimmer reading prompt but has no text for it");
+            return;
+        }
+
+        var tier = _glimmerSystem.GetGlimmerTier() switch
+        {
+            GlimmerTier.Minimal => Loc.GetString("glimmer-reading-minimal"),
+            GlimmerTier.Low => Loc.GetString("glimmer-reading-low"),
+            GlimmerTier.Moderate => Loc.GetString("glimmer-reading-moderate"),
+            GlimmerTier.High => Loc.GetString("glimmer-reading-high"),
+            GlimmerTier.Dangerous => Loc.GetString("glimmer-reading-dangerous"),
+            _ => Loc.GetString("glimmer-reading-critical"),
+        };
+
+        var glimmerReadingText = Loc.GetString(args.Text,
+            ("glimmer", (int) Math.Round(_glimmerSystem.GlimmerOutput)), ("tier", tier));
+
+        var response = new NPCResponse(glimmerReadingText);
+        _conversationSystem.QueueResponse(uid, response);
     }
 
     private void OnInteractHand(EntityUid uid, SophicScribeComponent component, InteractHandEvent args)
@@ -83,4 +114,9 @@ private void OnGlimmerEventEnded(GlimmerEventEndedEvent args)
             _radioSystem.SendRadioMessage(speaker, message, channel, speaker);
         }
     }
+    public sealed partial class NPCConversationGetGlimmerEvent : NPCConversationEvent
+    {
+        [DataField]
+        public string? Text;
+    }
 }
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericStormRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericStormRule.cs
index c26ab1481a..021c959102 100644
--- a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericStormRule.cs
+++ b/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericStormRule.cs
@@ -30,7 +30,7 @@ protected override void Started(EntityUid uid, NoosphericStormRuleComponent comp
                 continue;
 
             // Skip over those who are already psionic or those who are insulated, or zombies.
-            if (HasComp<PsionicComponent>(potentialPsionic) || HasComp<PsionicInsulationComponent>(potentialPsionic) || HasComp<ZombieComponent>(potentialPsionic))
+            if (HasComp<PsionicInsulationComponent>(potentialPsionic) || HasComp<ZombieComponent>(potentialPsionic))
                 continue;
 
             validList.Add(potentialPsionic);
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericZapRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericZapRule.cs
index 3672d317d9..a11faa0693 100644
--- a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericZapRule.cs
+++ b/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericZapRule.cs
@@ -35,19 +35,15 @@ protected override void Started(EntityUid uid, NoosphericZapRuleComponent compon
             _stunSystem.TryParalyze(psion, TimeSpan.FromSeconds(5), false);
             _statusEffectsSystem.TryAddStatusEffect(psion, "Stutter", TimeSpan.FromSeconds(10), false, "StutteringAccent");
 
-            if (HasComp<PsionicComponent>(psion))
-                _popupSystem.PopupEntity(Loc.GetString("noospheric-zap-seize"), psion, psion, Shared.Popups.PopupType.LargeCaution);
+            if (potentialPsionicComponent.Rerolled)
+            {
+                potentialPsionicComponent.Rerolled = false;
+                _popupSystem.PopupEntity(Loc.GetString("noospheric-zap-seize-potential-regained"), psion, psion, Shared.Popups.PopupType.LargeCaution);
+            }
             else
             {
-                if (potentialPsionicComponent.Rerolled)
-                {
-                    potentialPsionicComponent.Rerolled = false;
-                    _popupSystem.PopupEntity(Loc.GetString("noospheric-zap-seize-potential-regained"), psion, psion, Shared.Popups.PopupType.LargeCaution);
-                } else
-                {
-                    _psionicsSystem.RollPsionics(psion, potentialPsionicComponent, multiplier: 0.25f);
-                    _popupSystem.PopupEntity(Loc.GetString("noospheric-zap-seize"), psion, psion, Shared.Popups.PopupType.LargeCaution);
-                }
+                _psionicsSystem.RollPsionics(psion, potentialPsionicComponent, multiplier: 0.25f);
+                _popupSystem.PopupEntity(Loc.GetString("noospheric-zap-seize"), psion, psion, Shared.Popups.PopupType.LargeCaution);
             }
         }
     }
diff --git a/Content.Server/OfferItem/OfferItemSystem.cs b/Content.Server/OfferItem/OfferItemSystem.cs
new file mode 100644
index 0000000000..420df71ace
--- /dev/null
+++ b/Content.Server/OfferItem/OfferItemSystem.cs
@@ -0,0 +1,83 @@
+using Content.Server.Popups;
+using Content.Shared.Hands.Components;
+using Content.Shared.Alert;
+using Content.Shared.Hands.EntitySystems;
+using Content.Shared.OfferItem;
+using Content.Shared.IdentityManagement;
+using Robust.Shared.Player;
+
+namespace Content.Server.OfferItem;
+
+public sealed class OfferItemSystem : SharedOfferItemSystem
+{
+    [Dependency] private readonly AlertsSystem _alertsSystem = default!;
+    [Dependency] private readonly SharedHandsSystem _hands = default!;
+    [Dependency] private readonly PopupSystem _popup = default!;
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var query = EntityQueryEnumerator<OfferItemComponent>();
+        while (query.MoveNext(out var uid, out var offerItem))
+        {
+            if (!TryComp<HandsComponent>(uid, out var hands) || hands.ActiveHand == null)
+                continue;
+
+            if (offerItem.Hand != null &&
+                hands.Hands[offerItem.Hand].HeldEntity == null)
+            {
+                if (offerItem.Target != null)
+                {
+                    UnReceive(offerItem.Target.Value, offerItem: offerItem);
+                    offerItem.IsInOfferMode = false;
+                    Dirty(uid, offerItem);
+                }
+                else
+                    UnOffer(uid, offerItem);
+            }
+
+            if (!offerItem.IsInReceiveMode)
+            {
+                _alertsSystem.ClearAlert(uid, AlertType.Offer);
+                continue;
+            }
+
+            _alertsSystem.ShowAlert(uid, AlertType.Offer);
+        }
+    }
+
+    /// <summary>
+    /// Accepting the offer and receive item
+    /// </summary>
+    public void Receive(EntityUid uid, OfferItemComponent? component = null)
+    {
+        if (!Resolve(uid, ref component) ||
+            !TryComp<OfferItemComponent>(component.Target, out var offerItem) ||
+            offerItem.Hand == null ||
+            component.Target == null ||
+            !TryComp<HandsComponent>(uid, out var hands))
+            return;
+
+        if (offerItem.Item != null)
+        {
+            if (!_hands.TryPickup(uid, offerItem.Item.Value, handsComp: hands))
+            {
+                _popup.PopupEntity(Loc.GetString("offer-item-full-hand"), uid, uid);
+                return;
+            }
+
+            _popup.PopupEntity(Loc.GetString("offer-item-give",
+                ("item", Identity.Entity(offerItem.Item.Value, EntityManager)),
+                ("target", Identity.Entity(uid, EntityManager))), component.Target.Value, component.Target.Value);
+            _popup.PopupEntity(Loc.GetString("offer-item-give-other",
+                    ("user", Identity.Entity(component.Target.Value, EntityManager)),
+                    ("item", Identity.Entity(offerItem.Item.Value, EntityManager)),
+                    ("target", Identity.Entity(uid, EntityManager)))
+                , component.Target.Value, Filter.PvsExcept(component.Target.Value, entityManager: EntityManager), true);
+        }
+
+        offerItem.Item = null;
+        UnReceive(uid, component, offerItem);
+    }
+}
diff --git a/Content.Server/Psionics/Abilities/DispelPowerSystem.cs b/Content.Server/Psionics/Abilities/DispelPowerSystem.cs
index 33c6b5dcae..73c6f5d339 100644
--- a/Content.Server/Psionics/Abilities/DispelPowerSystem.cs
+++ b/Content.Server/Psionics/Abilities/DispelPowerSystem.cs
@@ -84,7 +84,11 @@ private void OnPowerUsed(DispelPowerActionEvent args)
             {
                 args.Handled = true;
                 _psionics.LogPowerUsed(args.Performer, "dispel", psionic, 1, 1, true);
-                _glimmerSystem.DeltaGlimmerInput(-_random.NextFloat(2 * psionic.Dampening - psionic.Amplification, 4 * psionic.Dampening - psionic.Amplification));
+
+                // Redundant check here as well for a small performance optimization
+                // Dispel has its own niche equations for glimmer.
+                if (_glimmerSystem.GetGlimmerEnabled())
+                    _glimmerSystem.DeltaGlimmerOutput(-_random.NextFloat(2 * psionic.Dampening - psionic.Amplification, 4 * psionic.Dampening - psionic.Amplification));
             }
         }
 
diff --git a/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs b/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs
index 9de4e412c8..24e6bbb8d3 100644
--- a/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs
+++ b/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs
@@ -37,10 +37,8 @@ public void AddPsionics(EntityUid uid)
             if (Deleted(uid))
                 return;
 
-            if (HasComp<PsionicComponent>(uid))
-                return;
-
             AddRandomPsionicPower(uid);
+
         }
         public void AddRandomPsionicPower(EntityUid uid)
         {
@@ -52,13 +50,22 @@ public void AddRandomPsionicPower(EntityUid uid)
                 return;
             }
 
-            // uh oh, stinky!
-            var newComponent = (Component) _componentFactory.GetComponent(pool.Pick());
-            newComponent.Owner = uid;
+            var newPool = pool;
+            foreach (var component in pool.Weights.Keys)
+            {
+                var checkedComponent = _componentFactory.GetComponent(component);
+                if (EntityManager.HasComponent(uid, checkedComponent.GetType()))
+                    newPool.Weights.Remove(component);
+            }
 
-            EntityManager.AddComponent(uid, newComponent);
+            if (newPool.Weights.Keys != null)
+            {
+                var newComponent = _componentFactory.GetComponent(newPool.Pick());
 
-            _glimmerSystem.DeltaGlimmerInput(_random.NextFloat(psionic.Amplification * psionic.Dampening, psionic.Amplification * psionic.Dampening * 5));
+                EntityManager.AddComponent(uid, newComponent);
+                _glimmerSystem.DeltaGlimmerInput(_random.NextFloat(psionic.Amplification * psionic.Dampening, psionic.Amplification * psionic.Dampening * 5));
+            }
+            return;
         }
 
         public void RemovePsionics(EntityUid uid)
@@ -96,7 +103,7 @@ public void RemovePsionics(EntityUid uid)
 
             _statusEffectsSystem.TryAddStatusEffect(uid, "Stutter", TimeSpan.FromMinutes(5), false, "StutteringAccent");
 
-            _glimmerSystem.DeltaGlimmerOutput(-_random.NextFloat((int) MathF.Round(psionic.Amplification * psionic.Dampening * 5), (int) MathF.Round(psionic.Amplification * psionic.Dampening * 10)));
+            _glimmerSystem.DeltaGlimmerOutput(-_random.NextFloat(psionic.Amplification * psionic.Dampening * 5, psionic.Amplification * psionic.Dampening * 10));
             RemComp<PsionicComponent>(uid);
             RemComp<PotentialPsionicComponent>(uid);
         }
diff --git a/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs b/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs
index 90a28eb6ae..f3e2cc69fd 100644
--- a/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs
+++ b/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs
@@ -11,6 +11,7 @@
 using Robust.Shared.Timing;
 using Content.Shared.Popups;
 using Content.Shared.Psionics.Events;
+using Content.Shared.Psionics;
 
 namespace Content.Server.Psionics.Abilities
 {
@@ -38,7 +39,7 @@ public override void Initialize()
         private void OnInit(EntityUid uid, PyrokinesisPowerComponent component, ComponentInit args)
         {
             _actions.AddAction(uid, ref component.PyrokinesisPrechargeActionEntity, component.PyrokinesisPrechargeActionId);
-            _actions.TryGetActionData( component.PyrokinesisPrechargeActionEntity, out var actionData);
+            _actions.TryGetActionData(component.PyrokinesisPrechargeActionEntity, out var actionData);
             if (actionData is { UseDelay: not null })
                 _actions.StartUseDelay(component.PyrokinesisPrechargeActionEntity);
             if (TryComp<PsionicComponent>(uid, out var psionic))
@@ -107,13 +108,17 @@ private void OnPowerUsed(PyrokinesisPowerActionEvent args)
 
                 var ent = Spawn("ProjectileAnomalyFireball", spawnCoords);
 
+                if (_glimmerSystem.GlimmerOutput >= 25 * psionic.Dampening)
+                    EnsureComp<PsionicallyInvisibleComponent>(ent);
+
                 if (TryComp<ExplosiveComponent>(ent, out var fireball))
                 {
-                    fireball.MaxIntensity = (int) MathF.Round(2 * psionic.Amplification);
-                    fireball.IntensitySlope = (int) MathF.Round(1 * psionic.Amplification);
-                    fireball.TotalIntensity = (int) MathF.Round(25 * psionic.Amplification);
+                    var psionicFactor = psionic.Amplification * _glimmerSystem.GetGlimmerEquilibriumRatio();
+                    fireball.MaxIntensity = 2 * psionicFactor;
+                    fireball.IntensitySlope = 1 * psionicFactor;
+                    fireball.TotalIntensity = 25 * psionicFactor;
 
-                    if (_glimmerSystem.GlimmerOutput >= 500)
+                    if (_glimmerSystem.GlimmerOutput >= GlimmerSystem.GlimmerEquilibrium)
                         fireball.CanCreateVacuum = true;
                     else fireball.CanCreateVacuum = false;
 
diff --git a/Content.Server/Psionics/Glimmer/Structures/GlimmerStructuresSystem.cs b/Content.Server/Psionics/Glimmer/Structures/GlimmerStructuresSystem.cs
index 09e33dd414..309bd732ef 100644
--- a/Content.Server/Psionics/Glimmer/Structures/GlimmerStructuresSystem.cs
+++ b/Content.Server/Psionics/Glimmer/Structures/GlimmerStructuresSystem.cs
@@ -76,16 +76,20 @@ public override void Update(float frameTime)
 
                 if (source.Accumulator > source.SecondsPerGlimmer)
                 {
+                    var glimmerEquilibrium = GlimmerSystem.GlimmerEquilibrium;
                     source.Accumulator -= source.SecondsPerGlimmer;
+
+                    // Shorthand explanation:
+                    // This makes glimmer far more "Swingy", by making both positive and negative glimmer sources scale quite dramatically with glimmer
                     if (source.AddToGlimmer)
                     {
-                        //If we're above the equilibrium point of 500, increase the output of passive glimmer sources to help fight against linear decay
-                        //Even with this, don't expect probers to ever get to mind swap levels of power without any help
-                        _glimmerSystem.DeltaGlimmerInput(_glimmerSystem.GlimmerOutput > 500 ? MathF.Round(_glimmerSystem.GlimmerOutput / 100) : 1f);
+                        _glimmerSystem.DeltaGlimmerInput((_glimmerSystem.GlimmerOutput > glimmerEquilibrium ? _glimmerSystem.GetGlimmerOutputInteger() : 1f)
+                        * (_glimmerSystem.GlimmerOutput < glimmerEquilibrium ? _glimmerSystem.GetGlimmerEquilibriumRatio() : 1f));
                     }
                     else
                     {
-                        _glimmerSystem.DeltaGlimmerInput(-1);
+                        _glimmerSystem.DeltaGlimmerInput(-(_glimmerSystem.GlimmerOutput > glimmerEquilibrium ? _glimmerSystem.GetGlimmerOutputInteger() : 1f)
+                        * (_glimmerSystem.GlimmerOutput > glimmerEquilibrium ? _glimmerSystem.GetGlimmerEquilibriumRatio() : 1f));
                     }
                 }
             }
diff --git a/Content.Server/Psionics/PsionicsSystem.cs b/Content.Server/Psionics/PsionicsSystem.cs
index 06250f77ba..6799b0bd3f 100644
--- a/Content.Server/Psionics/PsionicsSystem.cs
+++ b/Content.Server/Psionics/PsionicsSystem.cs
@@ -127,9 +127,6 @@ private void OnStamHit(EntityUid uid, AntiPsionicWeaponComponent component, Stam
 
         public void RollPsionics(EntityUid uid, PotentialPsionicComponent component, bool applyGlimmer = true, float multiplier = 1f)
         {
-            if (HasComp<PsionicComponent>(uid))
-                return;
-
             if (!_cfg.GetCVar(CCVars.PsionicRollsEnabled))
                 return;
 
diff --git a/Content.Server/Radio/EntitySystems/RadioSystem.cs b/Content.Server/Radio/EntitySystems/RadioSystem.cs
index 0e4da856ce..7ed7574a9a 100644
--- a/Content.Server/Radio/EntitySystems/RadioSystem.cs
+++ b/Content.Server/Radio/EntitySystems/RadioSystem.cs
@@ -183,7 +183,7 @@ private string WrapRadioMessage(EntityUid source, RadioChannelPrototype channel,
             ("verb", Loc.GetString(_random.Pick(speech.SpeechVerbStrings))),
             ("channel", $"\\[{channel.LocalizedName}\\]"),
             ("name", name),
-            ("message", FormattedMessage.EscapeText(message)));
+            ("message", message));
     }
 
     /// <inheritdoc cref="TelecomServerComponent"/>
diff --git a/Content.Server/Resist/CanEscapeInventoryComponent.cs b/Content.Server/Resist/CanEscapeInventoryComponent.cs
index 19b4abf7d0..978e03d95f 100644
--- a/Content.Server/Resist/CanEscapeInventoryComponent.cs
+++ b/Content.Server/Resist/CanEscapeInventoryComponent.cs
@@ -15,4 +15,10 @@ public sealed partial class CanEscapeInventoryComponent : Component
 
     [DataField("doAfter")]
     public DoAfterId? DoAfter;
+
+    /// <summary>
+    ///     Action to cancel inventory escape.
+    /// </summary>
+    [DataField]
+    public EntityUid? EscapeCancelAction;
 }
diff --git a/Content.Server/Resist/EscapeInventorySystem.cs b/Content.Server/Resist/EscapeInventorySystem.cs
index 127db7d2b3..95a470e909 100644
--- a/Content.Server/Resist/EscapeInventorySystem.cs
+++ b/Content.Server/Resist/EscapeInventorySystem.cs
@@ -5,6 +5,7 @@
 using Content.Shared.Hands.EntitySystems;
 using Content.Server.Storage.Components;
 using Content.Shared.ActionBlocker;
+using Content.Shared.Actions;
 using Content.Shared.DoAfter;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Interaction.Events;
@@ -13,6 +14,7 @@
 using Content.Shared.Resist;
 using Content.Shared.Storage;
 using Robust.Shared.Containers;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Resist;
 
@@ -24,11 +26,17 @@ public sealed class EscapeInventorySystem : EntitySystem
     [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!;
     [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
     [Dependency] private readonly CarryingSystem _carryingSystem = default!; // Carrying system from Nyanotrasen.
+    [Dependency] private readonly SharedActionsSystem _actions = default!;
 
     /// <summary>
     /// You can't escape the hands of an entity this many times more massive than you.
     /// </summary>
     public const float MaximumMassDisadvantage = 6f;
+    /// <summary>
+    /// Action to cancel inventory escape
+    /// </summary>
+    [ValidatePrototypeId<EntityPrototype>]
+    private readonly string _escapeCancelAction = "ActionCancelEscape";
 
     public override void Initialize()
     {
@@ -37,6 +45,7 @@ public override void Initialize()
         SubscribeLocalEvent<CanEscapeInventoryComponent, MoveInputEvent>(OnRelayMovement);
         SubscribeLocalEvent<CanEscapeInventoryComponent, EscapeInventoryEvent>(OnEscape);
         SubscribeLocalEvent<CanEscapeInventoryComponent, DroppedEvent>(OnDropped);
+        SubscribeLocalEvent<CanEscapeInventoryComponent, EscapeInventoryCancelActionEvent>(OnCancelEscape);
     }
 
     private void OnRelayMovement(EntityUid uid, CanEscapeInventoryComponent component, ref MoveInputEvent args)
@@ -84,12 +93,20 @@ private void OnRelayMovement(EntityUid uid, CanEscapeInventoryComponent componen
 
         _popupSystem.PopupEntity(Loc.GetString("escape-inventory-component-start-resisting"), user, user);
         _popupSystem.PopupEntity(Loc.GetString("escape-inventory-component-start-resisting-target"), container, container);
+
+        // Add an escape cancel action
+        if (component.EscapeCancelAction is not { Valid: true })
+            _actions.AddAction(user, ref component.EscapeCancelAction, _escapeCancelAction);
     }
 
     private void OnEscape(EntityUid uid, CanEscapeInventoryComponent component, EscapeInventoryEvent args)
     {
         component.DoAfter = null;
 
+        // Remove the cancel action regardless of do-after result
+        _actions.RemoveAction(uid, component.EscapeCancelAction);
+        component.EscapeCancelAction = null;
+
         if (args.Handled || args.Cancelled)
             return;
 
@@ -109,4 +126,13 @@ private void OnDropped(EntityUid uid, CanEscapeInventoryComponent component, Dro
         if (component.DoAfter != null)
             _doAfterSystem.Cancel(component.DoAfter);
     }
+
+    private void OnCancelEscape(EntityUid uid, CanEscapeInventoryComponent component, EscapeInventoryCancelActionEvent args)
+    {
+        if (component.DoAfter != null)
+            _doAfterSystem.Cancel(component.DoAfter);
+
+        _actions.RemoveAction(uid, component.EscapeCancelAction);
+        component.EscapeCancelAction = null;
+    }
 }
diff --git a/Content.Server/Station/Systems/StationDampeningSystem.cs b/Content.Server/Station/Systems/StationDampeningSystem.cs
new file mode 100644
index 0000000000..f499127031
--- /dev/null
+++ b/Content.Server/Station/Systems/StationDampeningSystem.cs
@@ -0,0 +1,28 @@
+using Content.Server.Station.Events;
+using Content.Shared.Physics;
+
+namespace Content.Server.Station.Systems;
+
+public sealed class StationDampeningSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<StationPostInitEvent>(OnInitStation);
+    }
+
+    private void OnInitStation(ref StationPostInitEvent ev)
+    {
+        foreach (var grid in ev.Station.Comp.Grids)
+        {
+            // If the station grid doesn't have defined dampening, give it a small dampening by default
+            // This will ensure cargo tech pros won't fling the station 1000 megaparsec away from the galaxy
+            if (!TryComp<PassiveDampeningComponent>(grid, out var dampening))
+            {
+                dampening = AddComp<PassiveDampeningComponent>(grid);
+                dampening.Enabled = true;
+                dampening.LinearDampening = 0.01f;
+                dampening.AngularDampening = 0.01f;
+            }
+        }
+    }
+}
diff --git a/Content.Server/Strip/StrippableSystem.cs b/Content.Server/Strip/StrippableSystem.cs
index 96b2ecc00c..686570f7dc 100644
--- a/Content.Server/Strip/StrippableSystem.cs
+++ b/Content.Server/Strip/StrippableSystem.cs
@@ -1,4 +1,3 @@
-using System.Linq;
 using Content.Server.Administration.Logs;
 using Content.Server.Ensnaring;
 using Content.Shared.CombatMode;
@@ -21,19 +20,23 @@
 using Robust.Server.GameObjects;
 using Robust.Shared.Player;
 using Robust.Shared.Utility;
+using System.Linq;
 
 namespace Content.Server.Strip
 {
     public sealed class StrippableSystem : SharedStrippableSystem
     {
-        [Dependency] private readonly SharedCuffableSystem _cuffable = default!;
-        [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
         [Dependency] private readonly InventorySystem _inventorySystem = default!;
-        [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
-        [Dependency] private readonly SharedPopupSystem _popup = default!;
-        [Dependency] private readonly EnsnareableSystem _ensnaring = default!;
+        [Dependency] private readonly EnsnareableSystem _ensnaringSystem = default!;
         [Dependency] private readonly UserInterfaceSystem _userInterfaceSystem = default!;
+
+        [Dependency] private readonly SharedCuffableSystem _cuffableSystem = default!;
+        [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
+        [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
+        [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
+
         [Dependency] private readonly IAdminLogManager _adminLogger = default!;
+        [Dependency] private readonly ThievingSystem _thieving = default!;
 
         // TODO: ECS popups. Not all of these have ECS equivalents yet.
 
@@ -48,64 +51,58 @@ public override void Initialize()
             // BUI
             SubscribeLocalEvent<StrippableComponent, StrippingSlotButtonPressed>(OnStripButtonPressed);
             SubscribeLocalEvent<EnsnareableComponent, StrippingEnsnareButtonPressed>(OnStripEnsnareMessage);
+
+            // DoAfters
+            SubscribeLocalEvent<HandsComponent, DoAfterAttemptEvent<StrippableDoAfterEvent>>(OnStrippableDoAfterRunning);
+            SubscribeLocalEvent<HandsComponent, StrippableDoAfterEvent>(OnStrippableDoAfterFinished);
         }
 
-        private void OnStripEnsnareMessage(EntityUid uid, EnsnareableComponent component, StrippingEnsnareButtonPressed args)
+        private void AddStripVerb(EntityUid uid, StrippableComponent component, GetVerbsEvent<Verb> args)
         {
-            if (args.Session.AttachedEntity is not {Valid: true} user)
+            if (args.Hands == null || !args.CanAccess || !args.CanInteract || args.Target == args.User)
                 return;
 
-            foreach (var entity in component.Container.ContainedEntities)
+            if (!HasComp<ActorComponent>(args.User))
+                return;
+
+            Verb verb = new()
             {
-                if (!TryComp<EnsnaringComponent>(entity, out var ensnaring))
-                    continue;
+                Text = Loc.GetString("strip-verb-get-data-text"),
+                Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/outfit.svg.192dpi.png")),
+                Act = () => StartOpeningStripper(args.User, (uid, component), true),
+            };
 
-                _ensnaring.TryFree(uid, user, entity, ensnaring);
-                return;
-            }
+            args.Verbs.Add(verb);
         }
 
-        private void OnStripButtonPressed(Entity<StrippableComponent> strippable, ref StrippingSlotButtonPressed args)
+        private void AddStripExamineVerb(EntityUid uid, StrippableComponent component, GetVerbsEvent<ExamineVerb> args)
         {
-            if (args.Session.AttachedEntity is not {Valid: true} user ||
-                !TryComp<HandsComponent>(user, out var userHands))
-                return;
-
-            if (args.IsHand)
-            {
-                StripHand(user, args.Slot, strippable, userHands);
+            if (args.Hands == null || !args.CanAccess || !args.CanInteract || args.Target == args.User)
                 return;
-            }
 
-            if (!TryComp<InventoryComponent>(strippable, out var inventory))
+            if (!HasComp<ActorComponent>(args.User))
                 return;
 
-            var hasEnt = _inventorySystem.TryGetSlotEntity(strippable, args.Slot, out var held, inventory);
+            ExamineVerb verb = new()
+            {
+                Text = Loc.GetString("strip-verb-get-data-text"),
+                Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/outfit.svg.192dpi.png")),
+                Act = () => StartOpeningStripper(args.User, (uid, component), true),
+                Category = VerbCategory.Examine,
+            };
 
-            if (userHands.ActiveHandEntity != null && !hasEnt)
-                PlaceActiveHandItemInInventory(user, strippable, userHands.ActiveHandEntity.Value, args.Slot, strippable);
-            else if (userHands.ActiveHandEntity == null && hasEnt)
-                TakeItemFromInventory(user, strippable, held!.Value, args.Slot, strippable);
+            args.Verbs.Add(verb);
         }
 
-        private void StripHand(EntityUid user, string handId, Entity<StrippableComponent> target, HandsComponent userHands)
+        private void OnActivateInWorld(EntityUid uid, StrippableComponent component, ActivateInWorldEvent args)
         {
-            if (!_handsSystem.TryGetHand(target, handId, out var hand))
+            if (args.Target == args.User)
                 return;
 
-            // is the target a handcuff?
-            if (TryComp(hand.HeldEntity, out VirtualItemComponent? virt)
-                && TryComp(target, out CuffableComponent? cuff)
-                && _cuffable.GetAllCuffs(cuff).Contains(virt.BlockingEntity))
-            {
-                _cuffable.TryUncuff(target, user, virt.BlockingEntity, cuffable: cuff);
+            if (!HasComp<ActorComponent>(args.User))
                 return;
-            }
 
-            if (userHands.ActiveHandEntity != null && hand.HeldEntity == null)
-                PlaceActiveHandItemInHands(user, target, userHands.ActiveHandEntity.Value, handId, target);
-            else if (userHands.ActiveHandEntity == null && hand.HeldEntity != null)
-                TakeItemFromHands(user, target, hand.HeldEntity.Value, handId, target);
+            StartOpeningStripper(args.User, (uid, component));
         }
 
         public override void StartOpeningStripper(EntityUid user, Entity<StrippableComponent> strippable, bool openInCombat = false)
@@ -123,352 +120,528 @@ public override void StartOpeningStripper(EntityUid user, Entity<StrippableCompo
             }
         }
 
-        private void AddStripVerb(EntityUid uid, StrippableComponent component, GetVerbsEvent<Verb> args)
+        private void OnStripButtonPressed(Entity<StrippableComponent> strippable, ref StrippingSlotButtonPressed args)
         {
-            if (args.Hands == null || !args.CanAccess || !args.CanInteract || args.Target == args.User)
+            if (args.Session.AttachedEntity is not { Valid: true } user ||
+                !TryComp<HandsComponent>(user, out var userHands))
                 return;
 
-            if (!HasComp<ActorComponent>(args.User))
+            if (args.IsHand)
+            {
+                StripHand((user, userHands), (strippable.Owner, null), args.Slot, strippable);
                 return;
+            }
 
-            Verb verb = new()
-            {
-                Text = Loc.GetString("strip-verb-get-data-text"),
-                Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/VerbIcons/outfit.svg.192dpi.png")),
-                Act = () => StartOpeningStripper(args.User, (uid, component), true),
-            };
-            args.Verbs.Add(verb);
+            if (!TryComp<InventoryComponent>(strippable, out var inventory))
+                return;
+
+            var hasEnt = _inventorySystem.TryGetSlotEntity(strippable, args.Slot, out var held, inventory);
+
+            if (userHands.ActiveHandEntity != null && !hasEnt)
+                StartStripInsertInventory((user, userHands), strippable.Owner, userHands.ActiveHandEntity.Value, args.Slot);
+            else if (userHands.ActiveHandEntity == null && hasEnt)
+                StartStripRemoveInventory(user, strippable.Owner, held!.Value, args.Slot);
         }
 
-        private void AddStripExamineVerb(EntityUid uid, StrippableComponent component, GetVerbsEvent<ExamineVerb> args)
+        private void StripHand(
+            Entity<HandsComponent?> user,
+            Entity<HandsComponent?> target,
+            string handId,
+            StrippableComponent? targetStrippable)
         {
-            if (args.Hands == null || !args.CanAccess || !args.CanInteract || args.Target == args.User)
+            if (!Resolve(user, ref user.Comp) ||
+                !Resolve(target, ref target.Comp) ||
+                !Resolve(target, ref targetStrippable))
                 return;
 
-            if (!HasComp<ActorComponent>(args.User))
+            if (!_handsSystem.TryGetHand(target.Owner, handId, out var handSlot))
                 return;
 
-            ExamineVerb verb = new()
+            // Is the target a handcuff?
+            if (TryComp<VirtualItemComponent>(handSlot.HeldEntity, out var virtualItem) &&
+                TryComp<CuffableComponent>(target.Owner, out var cuffable) &&
+                _cuffableSystem.GetAllCuffs(cuffable).Contains(virtualItem.BlockingEntity))
             {
-                Text = Loc.GetString("strip-verb-get-data-text"),
-                Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/VerbIcons/outfit.svg.192dpi.png")),
-                Act = () => StartOpeningStripper(args.User, (uid, component), true),
-                Category = VerbCategory.Examine,
-            };
+                _cuffableSystem.TryUncuff(target.Owner, user, virtualItem.BlockingEntity, cuffable);
+                return;
+            }
 
-            args.Verbs.Add(verb);
+            if (user.Comp.ActiveHandEntity != null && handSlot.HeldEntity == null)
+                StartStripInsertHand(user, target, user.Comp.ActiveHandEntity.Value, handId, targetStrippable);
+            else if (user.Comp.ActiveHandEntity == null && handSlot.HeldEntity != null)
+                StartStripRemoveHand(user, target, handSlot.HeldEntity.Value, handId, targetStrippable);
         }
 
-        private void OnActivateInWorld(EntityUid uid, StrippableComponent component, ActivateInWorldEvent args)
+        private void OnStripEnsnareMessage(EntityUid uid, EnsnareableComponent component, StrippingEnsnareButtonPressed args)
         {
-            if (args.Target == args.User)
+            if (args.Session.AttachedEntity is not { Valid: true } user)
                 return;
 
-            if (!HasComp<ActorComponent>(args.User))
-                return;
+            foreach (var entity in component.Container.ContainedEntities)
+            {
+                if (!TryComp<EnsnaringComponent>(entity, out var ensnaring))
+                    continue;
 
-            StartOpeningStripper(args.User, (uid, component));
+                _ensnaringSystem.TryFree(uid, user, entity, ensnaring);
+                return;
+            }
         }
 
         /// <summary>
-        ///     Places item in user's active hand to an inventory slot.
+        ///     Checks whether the item is in a user's active hand and whether it can be inserted into the inventory slot.
         /// </summary>
-        private async void PlaceActiveHandItemInInventory(
-            EntityUid user,
+        private bool CanStripInsertInventory(
+            Entity<HandsComponent?> user,
             EntityUid target,
             EntityUid held,
-            string slot,
-            StrippableComponent component)
+            string slot)
         {
-            var userHands = Comp<HandsComponent>(user);
+            if (!Resolve(user, ref user.Comp))
+                return false;
 
-            bool Check()
+            if (user.Comp.ActiveHand == null)
+                return false;
+
+            if (user.Comp.ActiveHandEntity == null)
+                return false;
+
+            if (user.Comp.ActiveHandEntity != held)
+                return false;
+
+            if (!_handsSystem.CanDropHeld(user, user.Comp.ActiveHand))
+            {
+                _popupSystem.PopupCursor(Loc.GetString("strippable-component-cannot-drop"), user);
+                return false;
+            }
+
+            if (_inventorySystem.TryGetSlotEntity(target, slot, out _))
+            {
+                _popupSystem.PopupCursor(Loc.GetString("strippable-component-item-slot-occupied", ("owner", target)), user);
+                return false;
+            }
+
+            if (!_inventorySystem.CanEquip(user, target, held, slot, out _))
             {
-                if (userHands.ActiveHandEntity != held)
-                    return false;
-
-                if (!_handsSystem.CanDropHeld(user, userHands.ActiveHand!))
-                {
-                    _popup.PopupCursor(Loc.GetString("strippable-component-cannot-drop"), user);
-                    return false;
-                }
-
-                if (_inventorySystem.TryGetSlotEntity(target, slot, out _))
-                {
-                    _popup.PopupCursor(Loc.GetString("strippable-component-item-slot-occupied",("owner", target)), user);
-                    return false;
-                }
-
-                if (!_inventorySystem.CanEquip(user, target, held, slot, out _))
-                {
-                    _popup.PopupCursor(Loc.GetString("strippable-component-cannot-equip-message",("owner", target)), user);
-                    return false;
-                }
-
-                return true;
+                _popupSystem.PopupCursor(Loc.GetString("strippable-component-cannot-equip-message", ("owner", target)), user);
+                return false;
             }
 
+            return true;
+        }
+
+        /// <summary>
+        ///     Begins a DoAfter to insert the item in the user's active hand into the inventory slot.
+        /// </summary>
+        private void StartStripInsertInventory(
+            Entity<HandsComponent?> user,
+            EntityUid target,
+            EntityUid held,
+            string slot)
+        {
+            if (!Resolve(user, ref user.Comp))
+                return;
+
+            if (!CanStripInsertInventory(user, target, held, slot))
+                return;
+
             if (!_inventorySystem.TryGetSlot(target, slot, out var slotDef))
             {
                 Log.Error($"{ToPrettyString(user)} attempted to place an item in a non-existent inventory slot ({slot}) on {ToPrettyString(target)}");
                 return;
             }
 
-            var userEv = new BeforeStripEvent(slotDef.StripTime);
-            RaiseLocalEvent(user, userEv);
-            var ev = new BeforeGettingStrippedEvent(userEv.Time, userEv.Stealth);
-            RaiseLocalEvent(target, ev);
+            var (time, stealth) = GetStripTimeModifiers(user, target, slotDef.StripTime);
+
+            bool hidden = stealth == ThievingStealth.Hidden;
+
+            if (!hidden)
+                StripPopup("strippable-component-alert-owner-insert", stealth, target, user: Identity.Entity(user, EntityManager), item: user.Comp.ActiveHandEntity!.Value);
+
+            var prefix = hidden ? "stealthily " : "";
+            _adminLogger.Add(LogType.Stripping, LogImpact.Low, $"{ToPrettyString(user):actor} is trying to {prefix}place the item {ToPrettyString(held):item} in {ToPrettyString(target):target}'s {slot} slot");
 
-            var doAfterArgs = new DoAfterArgs(EntityManager, user, ev.Time, new AwaitedDoAfterEvent(), null, target: target, used: held)
+            var doAfterArgs = new DoAfterArgs(EntityManager, user, time, new StrippableDoAfterEvent(true, true, slot), user, target, held)
             {
-                ExtraCheck = Check,
-                Hidden = ev.Stealth,
+                Hidden = hidden,
                 AttemptFrequency = AttemptFrequency.EveryTick,
                 BreakOnDamage = true,
                 BreakOnTargetMove = true,
                 BreakOnUserMove = true,
                 NeedHand = true,
-                DuplicateCondition = DuplicateConditions.SameTool // Block any other DoAfters featuring this same entity.
+                DuplicateCondition = DuplicateConditions.SameTool
             };
 
-            if (!ev.Stealth && Check() && userHands.ActiveHandEntity != null)
-            {
-                var message = Loc.GetString("strippable-component-alert-owner-insert",
-                    ("user", Identity.Entity(user, EntityManager)), ("item", userHands.ActiveHandEntity));
-                _popup.PopupEntity(message, target, target, PopupType.Large);
-            }
+            _doAfterSystem.TryStartDoAfter(doAfterArgs);
+        }
 
-            var prefix = ev.Stealth ? "stealthily " : "";
-            _adminLogger.Add(LogType.Stripping, LogImpact.Low, $"{ToPrettyString(user):actor} is trying to {prefix}place the item {ToPrettyString(held):item} in {ToPrettyString(target):target}'s {slot} slot");
+        /// <summary>
+        ///     Inserts the item in the user's active hand into the inventory slot.
+        /// </summary>
+        private void StripInsertInventory(
+            Entity<HandsComponent?> user,
+            EntityUid target,
+            EntityUid held,
+            string slot)
+        {
+            if (!Resolve(user, ref user.Comp))
+                return;
+
+            if (!CanStripInsertInventory(user, target, held, slot))
+                return;
 
-            var result = await _doAfter.WaitDoAfter(doAfterArgs);
-            if (result != DoAfterStatus.Finished)
+            if (!_handsSystem.TryDrop(user, handsComp: user.Comp))
                 return;
 
-            DebugTools.Assert(userHands.ActiveHand?.HeldEntity == held);
+            _inventorySystem.TryEquip(user, target, held, slot);
+            _adminLogger.Add(LogType.Stripping, LogImpact.Medium, $"{ToPrettyString(user):actor} has placed the item {ToPrettyString(held):item} in {ToPrettyString(target):target}'s {slot} slot");
+        }
 
-            if (_handsSystem.TryDrop(user, handsComp: userHands))
+        /// <summary>
+        ///     Checks whether the item can be removed from the target's inventory.
+        /// </summary>
+        private bool CanStripRemoveInventory(
+            EntityUid user,
+            EntityUid target,
+            EntityUid item,
+            string slot)
+        {
+            if (!_inventorySystem.TryGetSlotEntity(target, slot, out var slotItem))
             {
-                _inventorySystem.TryEquip(user, target, held, slot);
+                _popupSystem.PopupCursor(Loc.GetString("strippable-component-item-slot-free-message", ("owner", target)), user);
+                return false;
+            }
+
+            if (slotItem != item)
+                return false;
 
-                _adminLogger.Add(LogType.Stripping, LogImpact.Medium, $"{ToPrettyString(user):actor} has placed the item {ToPrettyString(held):item} in {ToPrettyString(target):target}'s {slot} slot");
+            if (!_inventorySystem.CanUnequip(user, target, slot, out var reason))
+            {
+                _popupSystem.PopupCursor(Loc.GetString(reason), user);
+                return false;
             }
+
+            return true;
         }
 
         /// <summary>
-        ///     Places item in user's active hand in one of the entity's hands.
+        ///     Begins a DoAfter to remove the item from the target's inventory and insert it in the user's active hand.
         /// </summary>
-        private async void PlaceActiveHandItemInHands(
+        private void StartStripRemoveInventory(
             EntityUid user,
             EntityUid target,
-            EntityUid held,
-            string handName,
-            StrippableComponent component)
+            EntityUid item,
+            string slot)
         {
-            var hands = Comp<HandsComponent>(target);
-            var userHands = Comp<HandsComponent>(user);
+            if (!CanStripRemoveInventory(user, target, item, slot))
+                return;
+
+            if (!_inventorySystem.TryGetSlot(target, slot, out var slotDef))
+            {
+                Log.Error($"{ToPrettyString(user)} attempted to take an item from a non-existent inventory slot ({slot}) on {ToPrettyString(target)}");
+                return;
+            }
+
+            var (time, stealth) = GetStripTimeModifiers(user, target, slotDef.StripTime);
+
+            bool hidden = stealth == ThievingStealth.Hidden;
 
-            bool Check()
+            if (!hidden)
             {
-                if (userHands.ActiveHandEntity != held)
-                    return false;
-
-                if (!_handsSystem.CanDropHeld(user, userHands.ActiveHand!))
-                {
-                    _popup.PopupCursor(Loc.GetString("strippable-component-cannot-drop"), user);
-                    return false;
-                }
-
-                if (!_handsSystem.TryGetHand(target, handName, out var hand, hands)
-                    || !_handsSystem.CanPickupToHand(target, userHands.ActiveHandEntity.Value, hand, checkActionBlocker: false, hands))
-                {
-                    _popup.PopupCursor(Loc.GetString("strippable-component-cannot-put-message",("owner", target)), user);
-                    return false;
-                }
-
-                return true;
+                if (slotDef.StripHidden)
+                    StripPopup("strippable-component-alert-owner-hidden", stealth, target, slot: slot);
+                else
+                    StripPopup("strippable-component-alert-owner", stealth, target, user: Identity.Entity(user, EntityManager), item: item);
             }
 
-            var userEv = new BeforeStripEvent(component.HandStripDelay);
-            RaiseLocalEvent(user, userEv);
-            var ev = new BeforeGettingStrippedEvent(userEv.Time, userEv.Stealth);
-            RaiseLocalEvent(target, ev);
+            var prefix = hidden ? "stealthily " : "";
+            _adminLogger.Add(LogType.Stripping, LogImpact.Low, $"{ToPrettyString(user):actor} is trying to {prefix}strip the item {ToPrettyString(item):item} from {ToPrettyString(target):target}'s {slot} slot");
 
-            var doAfterArgs = new DoAfterArgs(EntityManager, user, ev.Time, new AwaitedDoAfterEvent(), null, target: target, used: held)
+            var doAfterArgs = new DoAfterArgs(EntityManager, user, time, new StrippableDoAfterEvent(false, true, slot), user, target, item)
             {
-                ExtraCheck = Check,
-                Hidden = ev.Stealth,
+                Hidden = hidden,
                 AttemptFrequency = AttemptFrequency.EveryTick,
                 BreakOnDamage = true,
                 BreakOnTargetMove = true,
                 BreakOnUserMove = true,
                 NeedHand = true,
+                BreakOnHandChange = false, // Allow simultaneously removing multiple items.
                 DuplicateCondition = DuplicateConditions.SameTool
             };
 
-            var prefix = ev.Stealth ? "stealthily " : "";
-                _adminLogger.Add(LogType.Stripping, LogImpact.Low, $"{ToPrettyString(user):actor} is trying to {prefix}place the item {ToPrettyString(held):item} in {ToPrettyString(target):target}'s hands");
-
-            var result = await _doAfter.WaitDoAfter(doAfterArgs);
-            if (result != DoAfterStatus.Finished) return;
-
-            _handsSystem.TryDrop(user, checkActionBlocker: false, handsComp: userHands);
-            _handsSystem.TryPickup(target, held, handName, checkActionBlocker: false, animateUser: !ev.Stealth, animate: !ev.Stealth, handsComp: hands);
-            _adminLogger.Add(LogType.Stripping, LogImpact.Medium, $"{ToPrettyString(user):actor} has placed the item {ToPrettyString(held):item} in {ToPrettyString(target):target}'s hands");
-            // hand update will trigger strippable update
+            _doAfterSystem.TryStartDoAfter(doAfterArgs);
         }
 
         /// <summary>
-        ///     Takes an item from the inventory and places it in the user's active hand.
+        ///     Removes the item from the target's inventory and inserts it in the user's active hand.
         /// </summary>
-        private async void TakeItemFromInventory(
+        private void StripRemoveInventory(
             EntityUid user,
             EntityUid target,
             EntityUid item,
             string slot,
-            Entity<StrippableComponent> strippable)
+            bool hidden)
+        {
+            if (!CanStripRemoveInventory(user, target, item, slot))
+                return;
+
+            if (!_inventorySystem.TryUnequip(user, target, slot))
+                return;
+
+            RaiseLocalEvent(item, new DroppedEvent(user), true); // Gas tank internals etc.
+
+            _handsSystem.PickupOrDrop(user, item, animateUser: hidden, animate: hidden);
+            _adminLogger.Add(LogType.Stripping, LogImpact.Medium, $"{ToPrettyString(user):actor} has stripped the item {ToPrettyString(item):item} from {ToPrettyString(target):target}'s {slot} slot");
+        }
+
+        /// <summary>
+        ///     Checks whether the item in the user's active hand can be inserted into one of the target's hands.
+        /// </summary>
+        private bool CanStripInsertHand(
+            Entity<HandsComponent?> user,
+            Entity<HandsComponent?> target,
+            EntityUid held,
+            string handName)
         {
-            bool Check()
+            if (!Resolve(user, ref user.Comp) ||
+                !Resolve(target, ref target.Comp))
+                return false;
+
+            if (user.Comp.ActiveHand == null)
+                return false;
+
+            if (user.Comp.ActiveHandEntity == null)
+                return false;
+
+            if (user.Comp.ActiveHandEntity != held)
+                return false;
+
+            if (!_handsSystem.CanDropHeld(user, user.Comp.ActiveHand))
             {
-                if (!_inventorySystem.TryGetSlotEntity(target, slot, out var ent) && ent == item)
-                {
-                    _popup.PopupCursor(Loc.GetString("strippable-component-item-slot-free-message", ("owner", target)), user);
-                    return false;
-                }
-
-                if (!_inventorySystem.CanUnequip(user, target, slot, out var reason))
-                {
-                    _popup.PopupCursor(Loc.GetString(reason), user);
-                    return false;
-                }
-
-                return true;
+                _popupSystem.PopupCursor(Loc.GetString("strippable-component-cannot-drop"), user);
+                return false;
             }
 
-            if (!_inventorySystem.TryGetSlot(target, slot, out var slotDef))
+            if (!_handsSystem.TryGetHand(target, handName, out var handSlot, target.Comp) ||
+                !_handsSystem.CanPickupToHand(target, user.Comp.ActiveHandEntity.Value, handSlot, checkActionBlocker: false, target.Comp))
             {
-                Log.Error($"{ToPrettyString(user)} attempted to take an item from a non-existent inventory slot ({slot}) on {ToPrettyString(target)}");
-                return;
+                _popupSystem.PopupCursor(Loc.GetString("strippable-component-cannot-put-message", ("owner", target)), user);
+                return false;
             }
 
-            var userEv = new BeforeStripEvent(slotDef.StripTime);
-            RaiseLocalEvent(user, userEv);
-            var ev = new BeforeGettingStrippedEvent(userEv.Time, userEv.Stealth);
-            RaiseLocalEvent(target, ev);
+            return true;
+        }
+
+        /// <summary>
+        ///     Begins a DoAfter to insert the item in the user's active hand into one of the target's hands.
+        /// </summary>
+        private void StartStripInsertHand(
+            Entity<HandsComponent?> user,
+            Entity<HandsComponent?> target,
+            EntityUid held,
+            string handName,
+            StrippableComponent? targetStrippable = null)
+        {
+            if (!Resolve(user, ref user.Comp) ||
+                !Resolve(target, ref target.Comp) ||
+                !Resolve(target, ref targetStrippable))
+                return;
+
+            if (!CanStripInsertHand(user, target, held, handName))
+                return;
+
+            var (time, stealth) = GetStripTimeModifiers(user, target, targetStrippable.HandStripDelay);
+
+            bool hidden = stealth == ThievingStealth.Hidden;
 
-            var doAfterArgs = new DoAfterArgs(EntityManager, user, ev.Time, new AwaitedDoAfterEvent(), null, target: target, used: item)
+            var prefix = hidden ? "stealthily " : "";
+            _adminLogger.Add(LogType.Stripping, LogImpact.Low, $"{ToPrettyString(user):actor} is trying to {prefix}place the item {ToPrettyString(held):item} in {ToPrettyString(target):target}'s hands");
+
+            var doAfterArgs = new DoAfterArgs(EntityManager, user, time, new StrippableDoAfterEvent(true, false, handName), user, target, held)
             {
-                ExtraCheck = Check,
-                Hidden = ev.Stealth,
+                Hidden = hidden,
                 AttemptFrequency = AttemptFrequency.EveryTick,
                 BreakOnDamage = true,
                 BreakOnTargetMove = true,
                 BreakOnUserMove = true,
                 NeedHand = true,
-                BreakOnHandChange = false, // allow simultaneously removing multiple items.
                 DuplicateCondition = DuplicateConditions.SameTool
             };
 
-            if (!ev.Stealth && Check())
-            {
-                if (slotDef.StripHidden)
-                {
-                    _popup.PopupEntity(Loc.GetString("strippable-component-alert-owner-hidden", ("slot", slot)), target,
-                        target, PopupType.Large);
-                }
-                else if (_inventorySystem.TryGetSlotEntity(strippable, slot, out var slotItem))
-                {
-                    _popup.PopupEntity(Loc.GetString("strippable-component-alert-owner", ("user", Identity.Entity(user, EntityManager)), ("item", slotItem)), target,
-                        target, PopupType.Large);
-                }
-            }
-
-            var prefix = ev.Stealth ? "stealthily " : "";
-            _adminLogger.Add(LogType.Stripping, LogImpact.Low, $"{ToPrettyString(user):actor} is trying to {prefix}strip the item {ToPrettyString(item):item} from {ToPrettyString(target):target}'s {slot} slot");
+            _doAfterSystem.TryStartDoAfter(doAfterArgs);
+        }
 
-            var result = await _doAfter.WaitDoAfter(doAfterArgs);
-            if (result != DoAfterStatus.Finished)
+        /// <summary>
+        ///     Places the item in the user's active hand into one of the target's hands.
+        /// </summary>
+        private void StripInsertHand(
+            Entity<HandsComponent?> user,
+            Entity<HandsComponent?> target,
+            EntityUid held,
+            string handName,
+            bool hidden)
+        {
+            if (!Resolve(user, ref user.Comp) ||
+                !Resolve(target, ref target.Comp))
                 return;
 
-            if (!_inventorySystem.TryUnequip(user, strippable, slot))
+            if (!CanStripInsertHand(user, target, held, handName))
                 return;
 
-            // Raise a dropped event, so that things like gas tank internals properly deactivate when stripping
-            RaiseLocalEvent(item, new DroppedEvent(user), true);
-
-            _handsSystem.PickupOrDrop(user, item, animateUser: !ev.Stealth, animate: !ev.Stealth);
-            _adminLogger.Add(LogType.Stripping, LogImpact.Medium, $"{ToPrettyString(user):actor} has stripped the item {ToPrettyString(item):item} from {ToPrettyString(target):target}'s {slot} slot");
+            _handsSystem.TryDrop(user, checkActionBlocker: false, handsComp: user.Comp);
+            _handsSystem.TryPickup(target, held, handName, checkActionBlocker: false, animateUser: hidden, animate: hidden, handsComp: target.Comp);
+            _adminLogger.Add(LogType.Stripping, LogImpact.Medium, $"{ToPrettyString(user):actor} has placed the item {ToPrettyString(held):item} in {ToPrettyString(target):target}'s hands");
 
+            // Hand update will trigger strippable update.
         }
 
         /// <summary>
-        ///     Takes an item from a hand and places it in the user's active hand.
+        ///     Checks whether the item is in the target's hand and whether it can be dropped.
         /// </summary>
-        private async void TakeItemFromHands(EntityUid user, EntityUid target, EntityUid item, string handName, Entity<StrippableComponent> strippable)
+        private bool CanStripRemoveHand(
+            EntityUid user,
+            Entity<HandsComponent?> target,
+            EntityUid item,
+            string handName)
         {
-            var hands = Comp<HandsComponent>(target);
-            var userHands = Comp<HandsComponent>(user);
+            if (!Resolve(target, ref target.Comp))
+                return false;
+
+            if (!_handsSystem.TryGetHand(target, handName, out var handSlot, target.Comp))
+            {
+                _popupSystem.PopupCursor(Loc.GetString("strippable-component-item-slot-free-message", ("owner", target)), user);
+                return false;
+            }
 
-            bool Check()
+            if (HasComp<VirtualItemComponent>(handSlot.HeldEntity))
+                return false;
+
+            if (handSlot.HeldEntity == null)
+                return false;
+
+            if (handSlot.HeldEntity != item)
+                return false;
+
+            if (!_handsSystem.CanDropHeld(target, handSlot, false))
             {
-                if (!_handsSystem.TryGetHand(target, handName, out var hand, hands) || hand.HeldEntity != item)
-                {
-                    _popup.PopupCursor(Loc.GetString("strippable-component-item-slot-free-message",("owner", target)), user);
-                    return false;
-                }
-
-                if (HasComp<VirtualItemComponent>(hand.HeldEntity))
-                    return false;
-
-                if (!_handsSystem.CanDropHeld(target, hand, false))
-                {
-                    _popup.PopupCursor(Loc.GetString("strippable-component-cannot-drop-message",("owner", target)), user);
-                    return false;
-                }
-
-                return true;
+                _popupSystem.PopupCursor(Loc.GetString("strippable-component-cannot-drop-message", ("owner", target)), user);
+                return false;
             }
 
-            var userEv = new BeforeStripEvent(strippable.Comp.HandStripDelay);
-            RaiseLocalEvent(user, userEv);
-            var ev = new BeforeGettingStrippedEvent(userEv.Time, userEv.Stealth);
-            RaiseLocalEvent(target, ev);
+            return true;
+        }
+
+        /// <summary>
+        ///     Begins a DoAfter to remove the item from the target's hand and insert it in the user's active hand.
+        /// </summary>
+        private void StartStripRemoveHand(
+            Entity<HandsComponent?> user,
+            Entity<HandsComponent?> target,
+            EntityUid item,
+            string handName,
+            StrippableComponent? targetStrippable = null)
+        {
+            if (!Resolve(user, ref user.Comp) ||
+                !Resolve(target, ref target.Comp) ||
+                !Resolve(target, ref targetStrippable))
+                return;
+
+            if (!CanStripRemoveHand(user, target, item, handName))
+                return;
+
+            var (time, stealth) = GetStripTimeModifiers(user, target, targetStrippable.HandStripDelay);
+
+            bool hidden = stealth == ThievingStealth.Hidden;
+
+            if (!hidden)
+                StripPopup("strippable-component-alert-owner", stealth, target, user: Identity.Entity(user, EntityManager), item: item);
 
-            var doAfterArgs = new DoAfterArgs(EntityManager, user, ev.Time, new AwaitedDoAfterEvent(), null, target: target, used: item)
+            var prefix = hidden ? "stealthily " : "";
+            _adminLogger.Add(LogType.Stripping, LogImpact.Low, $"{ToPrettyString(user):actor} is trying to {prefix}strip the item {ToPrettyString(item):item} from {ToPrettyString(target):target}'s hands");
+
+            var doAfterArgs = new DoAfterArgs(EntityManager, user, time, new StrippableDoAfterEvent(false, false, handName), user, target, item)
             {
-                ExtraCheck = Check,
-                Hidden = ev.Stealth,
+                Hidden = hidden,
                 AttemptFrequency = AttemptFrequency.EveryTick,
                 BreakOnDamage = true,
                 BreakOnTargetMove = true,
                 BreakOnUserMove = true,
                 NeedHand = true,
-                BreakOnHandChange = false, // allow simultaneously removing multiple items.
+                BreakOnHandChange = false, // Allow simultaneously removing multiple items.
                 DuplicateCondition = DuplicateConditions.SameTool
             };
 
-            if (!ev.Stealth && Check() && _handsSystem.TryGetHand(target, handName, out var handSlot, hands) && handSlot.HeldEntity != null)
+            _doAfterSystem.TryStartDoAfter(doAfterArgs);
+        }
+
+        /// <summary>
+        ///     Takes the item from the target's hand and inserts it in the user's active hand.
+        /// </summary>
+        private void StripRemoveHand(
+            Entity<HandsComponent?> user,
+            Entity<HandsComponent?> target,
+            EntityUid item,
+            string handName,
+            bool hidden)
+        {
+            if (!Resolve(user, ref user.Comp) ||
+                !Resolve(target, ref target.Comp))
+                return;
+
+            if (!CanStripRemoveHand(user, target, item, handName))
+                return;
+
+            _handsSystem.TryDrop(target, item, checkActionBlocker: false, handsComp: target.Comp);
+            _handsSystem.PickupOrDrop(user, item, animateUser: hidden, animate: hidden, handsComp: user.Comp);
+            _adminLogger.Add(LogType.Stripping, LogImpact.Medium, $"{ToPrettyString(user):actor} has stripped the item {ToPrettyString(item):item} from {ToPrettyString(target):target}'s hands");
+
+            // Hand update will trigger strippable update.
+        }
+
+        private void OnStrippableDoAfterRunning(Entity<HandsComponent> entity, ref DoAfterAttemptEvent<StrippableDoAfterEvent> ev)
+        {
+            var args = ev.DoAfter.Args;
+
+            DebugTools.Assert(entity.Owner == args.User);
+            DebugTools.Assert(args.Target != null);
+            DebugTools.Assert(args.Used != null);
+            DebugTools.Assert(ev.Event.SlotOrHandName != null);
+
+            if (ev.Event.InventoryOrHand)
             {
-                _popup.PopupEntity(
-                    Loc.GetString("strippable-component-alert-owner",
-                    ("user", Identity.Entity(user, EntityManager)), ("item", item)),
-                    strippable.Owner,
-                    strippable.Owner);
+                if ( ev.Event.InsertOrRemove && !CanStripInsertInventory((entity.Owner, entity.Comp), args.Target.Value, args.Used.Value, ev.Event.SlotOrHandName) ||
+                    !ev.Event.InsertOrRemove && !CanStripRemoveInventory(entity.Owner, args.Target.Value, args.Used.Value, ev.Event.SlotOrHandName))
+                        ev.Cancel();
             }
+            else
+            {
+                if ( ev.Event.InsertOrRemove && !CanStripInsertHand((entity.Owner, entity.Comp), args.Target.Value, args.Used.Value, ev.Event.SlotOrHandName) ||
+                    !ev.Event.InsertOrRemove && !CanStripRemoveHand(entity.Owner, args.Target.Value, args.Used.Value, ev.Event.SlotOrHandName))
+                        ev.Cancel();
+            }
+        }
 
-            var prefix = ev.Stealth ? "stealthily " : "";
-            _adminLogger.Add(LogType.Stripping, LogImpact.Low,
-                $"{ToPrettyString(user):actor} is trying to {prefix}strip the item {ToPrettyString(item):item} from {ToPrettyString(target):target}'s hands");
-
-            var result = await _doAfter.WaitDoAfter(doAfterArgs);
-            if (result != DoAfterStatus.Finished)
+        private void OnStrippableDoAfterFinished(Entity<HandsComponent> entity, ref StrippableDoAfterEvent ev)
+        {
+            if (ev.Cancelled)
                 return;
 
-            _handsSystem.TryDrop(target, item, checkActionBlocker: false, handsComp: hands);
-            _handsSystem.PickupOrDrop(user, item, animateUser: !ev.Stealth, animate: !ev.Stealth, handsComp: userHands);
-            // hand update will trigger strippable update
-            _adminLogger.Add(LogType.Stripping, LogImpact.Medium,
-                $"{ToPrettyString(user):actor} has stripped the item {ToPrettyString(item):item} from {ToPrettyString(target):target}'s hands");
+            DebugTools.Assert(entity.Owner == ev.User);
+            DebugTools.Assert(ev.Target != null);
+            DebugTools.Assert(ev.Used != null);
+            DebugTools.Assert(ev.SlotOrHandName != null);
+
+            if (ev.InventoryOrHand)
+            {
+                if (ev.InsertOrRemove)
+                        StripInsertInventory((entity.Owner, entity.Comp), ev.Target.Value, ev.Used.Value, ev.SlotOrHandName);
+                else    StripRemoveInventory(entity.Owner, ev.Target.Value, ev.Used.Value, ev.SlotOrHandName, ev.Args.Hidden);
+            }
+            else
+            {
+                if (ev.InsertOrRemove)
+                        StripInsertHand((entity.Owner, entity.Comp), ev.Target.Value, ev.Used.Value, ev.SlotOrHandName, ev.Args.Hidden);
+                else    StripRemoveHand((entity.Owner, entity.Comp), ev.Target.Value, ev.Used.Value, ev.SlotOrHandName, ev.Args.Hidden);
+            }
         }
     }
 }
diff --git a/Content.Shared/Alert/AlertType.cs b/Content.Shared/Alert/AlertType.cs
index c92dced43a..7fac4ffd8f 100644
--- a/Content.Shared/Alert/AlertType.cs
+++ b/Content.Shared/Alert/AlertType.cs
@@ -53,7 +53,8 @@ public enum AlertType : byte
         BorgHealth,
         BorgCrit,
         BorgDead,
-        Charge
+        Charge,
+        Offer,
     }
 
 }
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index 15f1f14b8d..34f634032f 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -112,14 +112,14 @@ public static readonly CVarDef<bool>
         ///     Close to how long you expect a round to last, so you'll probably have to tweak this on downstreams.
         /// </summary>
         public static readonly CVarDef<float>
-            EventsRampingAverageEndTime = CVarDef.Create("events.ramping_average_end_time", 120f, CVar.ARCHIVE | CVar.SERVERONLY);
+            EventsRampingAverageEndTime = CVarDef.Create("events.ramping_average_end_time", 40f, CVar.ARCHIVE | CVar.SERVERONLY);
 
         /// <summary>
         ///     Average ending chaos modifier for the ramping event scheduler.
         ///     Max chaos chosen for a round will deviate from this
         /// </summary>
         public static readonly CVarDef<float>
-            EventsRampingAverageChaos = CVarDef.Create("events.ramping_average_chaos", 4f, CVar.ARCHIVE | CVar.SERVERONLY);
+            EventsRampingAverageChaos = CVarDef.Create("events.ramping_average_chaos", 6f, CVar.ARCHIVE | CVar.SERVERONLY);
 
         /*
          * Game
@@ -176,26 +176,26 @@ public static readonly CVarDef<bool>
         /// <summary>
         ///     Minimum time between Basic station events in seconds
         /// </summary>
-        public static readonly CVarDef<int> // 15 Minutes
-            GameEventsBasicMinimumTime = CVarDef.Create("game.events_basic_minimum_time", 900, CVar.SERVERONLY);
+        public static readonly CVarDef<int> // 5 Minutes
+            GameEventsBasicMinimumTime = CVarDef.Create("game.events_basic_minimum_time", 300, CVar.SERVERONLY);
 
         /// <summary>
         ///     Maximum time between Basic station events in seconds
         /// </summary>
-        public static readonly CVarDef<int> // 35 Minutes
-            GameEventsBasicMaximumTime = CVarDef.Create("game.events_basic_maximum_time", 2100, CVar.SERVERONLY);
+        public static readonly CVarDef<int> // 25 Minutes
+            GameEventsBasicMaximumTime = CVarDef.Create("game.events_basic_maximum_time", 1500, CVar.SERVERONLY);
 
         /// <summary>
         ///     Minimum time between Ramping station events in seconds
         /// </summary>
-        public static readonly CVarDef<int> // 20 Minutes
-            GameEventsRampingMinimumTime = CVarDef.Create("game.events_ramping_minimum_time", 1200, CVar.SERVERONLY);
+        public static readonly CVarDef<int> // 4 Minutes
+            GameEventsRampingMinimumTime = CVarDef.Create("game.events_ramping_minimum_time", 240, CVar.SERVERONLY);
 
         /// <summary>
         ///     Maximum time between Ramping station events in seconds
         /// </summary>
-        public static readonly CVarDef<int> // 45 Minutes
-            GameEventsRampingMaximumTime = CVarDef.Create("game.events_ramping_maximum_time", 2700, CVar.SERVERONLY);
+        public static readonly CVarDef<int> // 12 Minutes
+            GameEventsRampingMaximumTime = CVarDef.Create("game.events_ramping_maximum_time", 720, CVar.SERVERONLY);
 
         /// <summary>
         ///
@@ -810,6 +810,9 @@ public static readonly CVarDef<bool>
         public static readonly CVarDef<bool> CombatModeIndicatorsPointShow =
             CVarDef.Create("hud.combat_mode_indicators_point_show", true, CVar.ARCHIVE | CVar.CLIENTONLY);
 
+        public static readonly CVarDef<bool> OfferModeIndicatorsPointShow =
+            CVarDef.Create("hud.offer_mode_indicators_point_show", true, CVar.ARCHIVE | CVar.CLIENTONLY);
+
         public static readonly CVarDef<bool> LoocAboveHeadShow =
             CVarDef.Create("hud.show_looc_above_head", true, CVar.ARCHIVE | CVar.CLIENTONLY);
 
diff --git a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
index f189db005b..976682c990 100644
--- a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
+++ b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
@@ -62,6 +62,11 @@ private void QuickEquip(
     {
         foreach (var slotDef in userEnt.Comp1.Slots)
         {
+            // Do not attempt to quick-equip clothing in pocket slots.
+            // We should probably add a special flag to SlotDefinition to skip quick equip if more similar slots get added.
+            if (slotDef.SlotFlags.HasFlag(SlotFlags.POCKET))
+                continue;
+
             if (!_invSystem.CanEquip(userEnt, toEquipEnt, slotDef.Name, out _, slotDef, userEnt, toEquipEnt))
                 continue;
 
diff --git a/Content.Shared/Clothing/EntitySystems/ToggleableClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/ToggleableClothingSystem.cs
index 0138de7a98..4abe7bc876 100644
--- a/Content.Shared/Clothing/EntitySystems/ToggleableClothingSystem.cs
+++ b/Content.Shared/Clothing/EntitySystems/ToggleableClothingSystem.cs
@@ -27,6 +27,7 @@ public sealed class ToggleableClothingSystem : EntitySystem
     [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
     [Dependency] private readonly SharedStrippableSystem _strippable = default!;
+    [Dependency] private readonly ThievingSystem _thieving = default!;
 
     public override void Initialize()
     {
@@ -95,7 +96,9 @@ private void StartDoAfter(EntityUid user, EntityUid item, EntityUid wearer, Togg
         if (component.StripDelay == null)
             return;
 
-        var (time, stealth) = _strippable.GetStripTimeModifiers(user, wearer, (float) component.StripDelay.Value.TotalSeconds);
+        var (time, stealth) = _strippable.GetStripTimeModifiers(user, wearer, component.StripDelay.Value);
+
+        bool hidden = (stealth == ThievingStealth.Hidden);
 
         var args = new DoAfterArgs(EntityManager, user, time, new ToggleClothingDoAfterEvent(), item, wearer, item)
         {
@@ -110,11 +113,8 @@ private void StartDoAfter(EntityUid user, EntityUid item, EntityUid wearer, Togg
         if (!_doAfter.TryStartDoAfter(args))
             return;
 
-        if (!stealth)
-        {
-            var popup = Loc.GetString("strippable-component-alert-owner-interact", ("user", Identity.Entity(user, EntityManager)), ("item", item));
-            _popupSystem.PopupEntity(popup, wearer, wearer, PopupType.Large);
-        }
+        if (!hidden)
+            _strippable.StripPopup("strippable-component-alert-owner-interact", stealth, wearer, user: Identity.Entity(user, EntityManager), item: item);
     }
 
     private void OnGetAttachedStripVerbsEvent(EntityUid uid, AttachedClothingComponent component, GetVerbsEvent<EquipmentVerb> args)
diff --git a/Content.Shared/Cuffs/Components/HandcuffComponent.cs b/Content.Shared/Cuffs/Components/HandcuffComponent.cs
index a5593cd271..72663fd8fa 100644
--- a/Content.Shared/Cuffs/Components/HandcuffComponent.cs
+++ b/Content.Shared/Cuffs/Components/HandcuffComponent.cs
@@ -86,11 +86,11 @@ public sealed partial class HandcuffComponent : Component
     public SoundSpecifier EndUncuffSound = new SoundPathSpecifier("/Audio/Items/Handcuffs/cuff_takeoff_end.ogg");
 
     /// <summary>
-    ///     Both a bool and a multiplier combined. If it is 0, handcuffs are unaffected by mass contests. The absolute value of any nonzero acts as a multiplier on how much mass affects uncuff speed.
-    ///     A value of 1 provides the full modifier from MassContest. 0.5 is half the effect of mass contests, and so on.
+    ///     Acts as a two-state option for handcuff speed. When true, handcuffs will be easier to get out of if you are larger than average. Representing the use of strength to break things like zipties.
+    ///     When false, handcuffs are easier to get out of if you are smaller than average, representing the use of dexterity to slip the cuffs.
     /// </summary>
     [DataField]
-    public float UncuffMassModifier = 0f;
+    public bool UncuffMassMultiplies = false;
 }
 
 /// <summary>
diff --git a/Content.Shared/Cuffs/SharedCuffableSystem.cs b/Content.Shared/Cuffs/SharedCuffableSystem.cs
index 0fa77b182c..92f4576c8b 100644
--- a/Content.Shared/Cuffs/SharedCuffableSystem.cs
+++ b/Content.Shared/Cuffs/SharedCuffableSystem.cs
@@ -561,7 +561,7 @@ public void TryUncuff(EntityUid target, EntityUid user, EntityUid? cuffsToRemove
                 return;
             }
 
-            var uncuffTime = (isOwner ? cuff.BreakoutTime : cuff.UncuffTime) * (_contests.MassContest(user) * Math.Abs(cuff.UncuffMassModifier));
+            var uncuffTime = (isOwner ? cuff.BreakoutTime : cuff.UncuffTime) * (cuff.UncuffMassMultiplies ? 1 / _contests.MassContest(user) : _contests.MassContest(user));
 
             if (isOwner)
             {
diff --git a/Content.Shared/DeltaV/CartridgeLoader/Cartridges/CrimeAssistUiState.cs b/Content.Shared/DeltaV/CartridgeLoader/Cartridges/CrimeAssistUiState.cs
deleted file mode 100644
index dd820f1a0b..0000000000
--- a/Content.Shared/DeltaV/CartridgeLoader/Cartridges/CrimeAssistUiState.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Content.Shared.CartridgeLoader;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.DeltaV.CartridgeLoader.Cartridges;
-
-[Serializable, NetSerializable]
-public sealed class CrimeAssistUiState : BoundUserInterfaceState
-{
-    public CrimeAssistUiState()
-    { }
-}
-
-[Serializable, NetSerializable]
-public sealed class CrimeAssistSyncMessageEvent : CartridgeMessageEvent
-{
-    public CrimeAssistSyncMessageEvent()
-    { }
-}
diff --git a/Content.Shared/DeltaV/CartridgeLoader/Cartridges/SecWatchUiState.cs b/Content.Shared/DeltaV/CartridgeLoader/Cartridges/SecWatchUiState.cs
new file mode 100644
index 0000000000..068b54a6ff
--- /dev/null
+++ b/Content.Shared/DeltaV/CartridgeLoader/Cartridges/SecWatchUiState.cs
@@ -0,0 +1,24 @@
+using Content.Shared.Security;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.CartridgeLoader.Cartridges;
+
+/// <summary>
+/// Show a list of wanted and suspected people from criminal records.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed class SecWatchUiState : BoundUserInterfaceState
+{
+    public readonly List<SecWatchEntry> Entries;
+
+    public SecWatchUiState(List<SecWatchEntry> entries)
+    {
+        Entries = entries;
+    }
+}
+
+/// <summary>
+/// Entry for a person who is wanted or suspected.
+/// </summary>
+[Serializable, NetSerializable]
+public record struct SecWatchEntry(string Name, string Job, SecurityStatus Status, string? Reason);
diff --git a/Content.Shared/Input/ContentKeyFunctions.cs b/Content.Shared/Input/ContentKeyFunctions.cs
index 0b72ac5ee7..19514a4ee0 100644
--- a/Content.Shared/Input/ContentKeyFunctions.cs
+++ b/Content.Shared/Input/ContentKeyFunctions.cs
@@ -54,6 +54,7 @@ public static class ContentKeyFunctions
         public static readonly BoundKeyFunction ZoomOut = "ZoomOut";
         public static readonly BoundKeyFunction ZoomIn = "ZoomIn";
         public static readonly BoundKeyFunction ResetZoom = "ResetZoom";
+        public static readonly BoundKeyFunction OfferItem = "OfferItem";
 
         public static readonly BoundKeyFunction ArcadeUp = "ArcadeUp";
         public static readonly BoundKeyFunction ArcadeDown = "ArcadeDown";
diff --git a/Content.Shared/Inventory/InventorySystem.Equip.cs b/Content.Shared/Inventory/InventorySystem.Equip.cs
index 24006b0c9f..7bdd17ee6f 100644
--- a/Content.Shared/Inventory/InventorySystem.Equip.cs
+++ b/Content.Shared/Inventory/InventorySystem.Equip.cs
@@ -176,7 +176,7 @@ public bool TryEquip(EntityUid actor, EntityUid target, EntityUid itemUid, strin
             };
 
             _doAfter.TryStartDoAfter(args);
-            return false;
+            return true; // Changed to return true even if the item wasn't equipped instantly
         }
 
         if (!_containerSystem.Insert(itemUid, slotContainer))
diff --git a/Content.Shared/Inventory/InventoryTemplatePrototype.cs b/Content.Shared/Inventory/InventoryTemplatePrototype.cs
index a477969962..585f80d4ce 100644
--- a/Content.Shared/Inventory/InventoryTemplatePrototype.cs
+++ b/Content.Shared/Inventory/InventoryTemplatePrototype.cs
@@ -20,7 +20,7 @@ public sealed partial class SlotDefinition
     [DataField("slotFlags")] public SlotFlags SlotFlags { get; private set; } = SlotFlags.PREVENTEQUIP;
     [DataField("showInWindow")] public bool ShowInWindow { get; private set; } = true;
     [DataField("slotGroup")] public string SlotGroup { get; private set; } = "Default";
-    [DataField("stripTime")] public float StripTime { get; private set; } = 4f;
+    [DataField("stripTime")] public TimeSpan StripTime { get; private set; } = TimeSpan.FromSeconds(4f);
 
     [DataField("uiWindowPos", required: true)]
     public Vector2i UIWindowPosition { get; private set; }
diff --git a/Content.Shared/Nyanotrasen/Item/PseudoItem/AllowsSleepInsideComponent.cs b/Content.Shared/Nyanotrasen/Item/PseudoItem/AllowsSleepInsideComponent.cs
new file mode 100644
index 0000000000..a28c7698fc
--- /dev/null
+++ b/Content.Shared/Nyanotrasen/Item/PseudoItem/AllowsSleepInsideComponent.cs
@@ -0,0 +1,9 @@
+namespace Content.Shared.Nyanotrasen.Item.PseudoItem;
+
+/// <summary>
+///     Signifies that pseudo-item creatures can sleep inside the container to which this component is applied.
+/// </summary>
+[RegisterComponent]
+public sealed partial class AllowsSleepInsideComponent : Component
+{
+}
diff --git a/Content.Shared/Nyanotrasen/Item/PseudoItem/PseudoItemComponent.cs b/Content.Shared/Nyanotrasen/Item/PseudoItem/PseudoItemComponent.cs
index d3774439d3..458b514b96 100644
--- a/Content.Shared/Nyanotrasen/Item/PseudoItem/PseudoItemComponent.cs
+++ b/Content.Shared/Nyanotrasen/Item/PseudoItem/PseudoItemComponent.cs
@@ -3,10 +3,10 @@
 
 namespace Content.Shared.Nyanotrasen.Item.PseudoItem;
 
-    /// <summary>
-    /// For entities that behave like an item under certain conditions,
-    /// but not under most conditions.
-    /// </summary>
+/// <summary>
+/// For entities that behave like an item under certain conditions,
+/// but not under most conditions.
+/// </summary>
 [RegisterComponent, AutoGenerateComponentState]
 public sealed partial class PseudoItemComponent : Component
 {
@@ -24,4 +24,10 @@ public sealed partial class PseudoItemComponent : Component
     public Vector2i StoredOffset;
 
     public bool Active = false;
+
+    /// <summary>
+    /// Action for sleeping while inside a container with <see cref="AllowsSleepInsideComponent"/>.
+    /// </summary>
+    [DataField]
+    public EntityUid? SleepAction;
 }
diff --git a/Content.Shared/Nyanotrasen/Item/PseudoItem/SharedPseudoItemSystem.Checks.cs b/Content.Shared/Nyanotrasen/Item/PseudoItem/SharedPseudoItemSystem.Checks.cs
index 7000c65404..906503b370 100644
--- a/Content.Shared/Nyanotrasen/Item/PseudoItem/SharedPseudoItemSystem.Checks.cs
+++ b/Content.Shared/Nyanotrasen/Item/PseudoItem/SharedPseudoItemSystem.Checks.cs
@@ -3,163 +3,33 @@
 
 namespace Content.Shared.Nyanotrasen.Item.PseudoItem;
 
-/// <summary>
-/// Almost all of this is code taken from other systems, but adapted to use PseudoItem.
-/// I couldn't use the original functions because the resolve would fuck shit up, even if I passed a constructed itemcomp
-///
-/// This is horrible, and I hate it. But such is life
-/// </summary>
 public partial class SharedPseudoItemSystem
 {
-    protected bool CheckItemFits(Entity<PseudoItemComponent?> itemEnt, Entity<StorageComponent?> storageEnt)
+    /// <summary>
+    ///   Checks if the pseudo-item can be inserted into the specified storage entity.
+    /// </summary>
+    /// <remarks>
+    ///   This function creates and uses a fake item component if the entity doesn't have one.
+    /// </remarks>
+    public bool CheckItemFits(Entity<PseudoItemComponent?> itemEnt, Entity<StorageComponent?> storageEnt)
     {
         if (!Resolve(itemEnt, ref itemEnt.Comp) || !Resolve(storageEnt, ref storageEnt.Comp))
             return false;
 
-        if (Transform(itemEnt).Anchored)
+        if (!TryComp<MetaDataComponent>(itemEnt, out var metadata))
             return false;
 
-        if (storageEnt.Comp.Whitelist?.IsValid(itemEnt, EntityManager) == false)
-            return false;
-
-        if (storageEnt.Comp.Blacklist?.IsValid(itemEnt, EntityManager) == true)
-            return false;
-
-        var maxSize = _storage.GetMaxItemSize(storageEnt);
-        if (_item.GetSizePrototype(itemEnt.Comp.Size) > maxSize)
-            return false;
-
-        // The following is shitfucked together straight from TryGetAvailableGridSpace, but eh, it works
-
-        var itemComp = new ItemComponent
-            { Size = itemEnt.Comp.Size, Shape = itemEnt.Comp.Shape, StoredOffset = itemEnt.Comp.StoredOffset };
-
-        var storageBounding = storageEnt.Comp.Grid.GetBoundingBox();
-
-        Angle startAngle;
-        if (storageEnt.Comp.DefaultStorageOrientation == null)
-            startAngle = Angle.FromDegrees(-itemComp.StoredRotation); // PseudoItem doesn't support this
-        else
-        {
-            if (storageBounding.Width < storageBounding.Height)
-            {
-                startAngle = storageEnt.Comp.DefaultStorageOrientation == StorageDefaultOrientation.Horizontal
-                    ? Angle.Zero
-                    : Angle.FromDegrees(90);
-            }
-            else
-            {
-                startAngle = storageEnt.Comp.DefaultStorageOrientation == StorageDefaultOrientation.Vertical
-                    ? Angle.Zero
-                    : Angle.FromDegrees(90);
-            }
-        }
-
-        for (var y = storageBounding.Bottom; y <= storageBounding.Top; y++)
-        {
-            for (var x = storageBounding.Left; x <= storageBounding.Right; x++)
-            {
-                for (var angle = startAngle; angle <= Angle.FromDegrees(360 - startAngle); angle += Math.PI / 2f)
-                {
-                    var location = new ItemStorageLocation(angle, (x, y));
-                    if (ItemFitsInGridLocation(itemEnt, storageEnt, location.Position, location.Rotation))
-                        return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    private bool ItemFitsInGridLocation(
-        Entity<PseudoItemComponent?> itemEnt,
-        Entity<StorageComponent?> storageEnt,
-        Vector2i position,
-        Angle rotation)
-    {
-        if (!Resolve(itemEnt, ref itemEnt.Comp) || !Resolve(storageEnt, ref storageEnt.Comp))
-            return false;
-
-        var gridBounds = storageEnt.Comp.Grid.GetBoundingBox();
-        if (!gridBounds.Contains(position))
-            return false;
-
-        var itemShape = GetAdjustedItemShape(itemEnt, rotation, position);
-
-        foreach (var box in itemShape)
+        TryComp<ItemComponent>(itemEnt, out var item);
+        // If the entity doesn't have an item comp, create a fake one
+        // The fake component is never actually added to the entity
+        item ??= new ItemComponent
         {
-            for (var offsetY = box.Bottom; offsetY <= box.Top; offsetY++)
-            {
-                for (var offsetX = box.Left; offsetX <= box.Right; offsetX++)
-                {
-                    var pos = (offsetX, offsetY);
-
-                    if (!IsGridSpaceEmpty(itemEnt, storageEnt, pos, itemShape))
-                        return false;
-                }
-            }
-        }
-
-        return true;
-    }
-
-    private IReadOnlyList<Box2i> GetAdjustedItemShape(Entity<PseudoItemComponent?> entity, Angle rotation,
-        Vector2i position)
-    {
-        if (!Resolve(entity, ref entity.Comp))
-            return new Box2i[] { };
-
-        var shapes = entity.Comp.Shape ?? _item.GetSizePrototype(entity.Comp.Size).DefaultShape;
-        var boundingShape = shapes.GetBoundingBox();
-        var boundingCenter = ((Box2) boundingShape).Center;
-        var matty = Matrix3.CreateTransform(boundingCenter, rotation);
-        var drift = boundingShape.BottomLeft - matty.TransformBox(boundingShape).BottomLeft;
-
-        var adjustedShapes = new List<Box2i>();
-        foreach (var shape in shapes)
-        {
-            var transformed = matty.TransformBox(shape).Translated(drift);
-            var floored = new Box2i(transformed.BottomLeft.Floored(), transformed.TopRight.Floored());
-            var translated = floored.Translated(position);
-
-            adjustedShapes.Add(translated);
-        }
-
-        return adjustedShapes;
-    }
-
-    private bool IsGridSpaceEmpty(Entity<PseudoItemComponent?> itemEnt, Entity<StorageComponent?> storageEnt,
-        Vector2i location, IReadOnlyList<Box2i> shape)
-    {
-        if (!Resolve(storageEnt, ref storageEnt.Comp))
-            return false;
-
-        var validGrid = false;
-        foreach (var grid in storageEnt.Comp.Grid)
-        {
-            if (grid.Contains(location))
-            {
-                validGrid = true;
-                break;
-            }
-        }
-
-        if (!validGrid)
-            return false;
-
-        foreach (var (ent, storedItem) in storageEnt.Comp.StoredItems)
-        {
-            if (ent == itemEnt.Owner)
-                continue;
-
-            var adjustedShape = shape;
-            foreach (var box in adjustedShape)
-            {
-                if (box.Contains(location))
-                    return false;
-            }
-        }
+            Owner = itemEnt,
+            Shape = itemEnt.Comp.Shape,
+            Size = itemEnt.Comp.Size,
+            StoredOffset = itemEnt.Comp.StoredOffset
+        };
 
-        return true;
+        return _storage.CanInsert(storageEnt, itemEnt, out _, storageEnt.Comp, item, ignoreStacks: true);
     }
 }
diff --git a/Content.Shared/Nyanotrasen/Item/PseudoItem/SharedPseudoItemSystem.cs b/Content.Shared/Nyanotrasen/Item/PseudoItem/SharedPseudoItemSystem.cs
index 4b7910746f..5f4e618434 100644
--- a/Content.Shared/Nyanotrasen/Item/PseudoItem/SharedPseudoItemSystem.cs
+++ b/Content.Shared/Nyanotrasen/Item/PseudoItem/SharedPseudoItemSystem.cs
@@ -1,14 +1,18 @@
+using Content.Shared.Actions;
+using Content.Shared.Bed.Sleep;
 using Content.Shared.DoAfter;
 using Content.Shared.Hands;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Item;
 using Content.Shared.Item.PseudoItem;
+using Content.Shared.Popups;
 using Content.Shared.Storage;
 using Content.Shared.Storage.EntitySystems;
 using Content.Shared.Tag;
 using Content.Shared.Verbs;
 using Robust.Shared.Containers;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Nyanotrasen.Item.PseudoItem;
 
@@ -18,9 +22,13 @@ public abstract partial class SharedPseudoItemSystem : EntitySystem
     [Dependency] private readonly SharedItemSystem _item = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
     [Dependency] private readonly TagSystem _tag = default!;
+    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
+    [Dependency] private readonly SharedActionsSystem _actions = default!;
 
     [ValidatePrototypeId<TagPrototype>]
     private const string PreventTag = "PreventLabel";
+    [ValidatePrototypeId<EntityPrototype>]
+    private const string SleepActionId = "ActionSleep"; // The action used for sleeping inside bags. Currently uses the default sleep action (same as beds)
 
     public override void Initialize()
     {
@@ -64,7 +72,7 @@ private void AddInsertVerb(EntityUid uid, PseudoItemComponent component, GetVerb
         args.Verbs.Add(verb);
     }
 
-    private bool TryInsert(EntityUid storageUid, EntityUid toInsert, PseudoItemComponent component,
+    public bool TryInsert(EntityUid storageUid, EntityUid toInsert, PseudoItemComponent component,
         StorageComponent? storage = null)
     {
         if (!Resolve(storageUid, ref storage))
@@ -87,6 +95,10 @@ private bool TryInsert(EntityUid storageUid, EntityUid toInsert, PseudoItemCompo
             return false;
         }
 
+        // If the storage allows sleeping inside, add the respective action
+        if (HasComp<AllowsSleepInsideComponent>(storageUid))
+            _actions.AddAction(toInsert, ref component.SleepAction, SleepActionId, toInsert);
+
         component.Active = true;
         return true;
     }
@@ -98,9 +110,11 @@ private void OnEntRemoved(EntityUid uid, PseudoItemComponent component, EntGotRe
 
         RemComp<ItemComponent>(uid);
         component.Active = false;
+
+        _actions.RemoveAction(uid, component.SleepAction); // Remove sleep action if it was added
     }
 
-    private void OnGettingPickedUpAttempt(EntityUid uid, PseudoItemComponent component,
+    protected virtual void OnGettingPickedUpAttempt(EntityUid uid, PseudoItemComponent component,
         GettingPickedUpAttemptEvent args)
     {
         if (args.User == args.Item)
@@ -154,7 +168,11 @@ protected void StartInsertDoAfter(EntityUid inserter, EntityUid toInsert, Entity
             NeedHand = true
         };
 
-        _doAfter.TryStartDoAfter(args);
+        if (_doAfter.TryStartDoAfter(args))
+        {
+            // Show a popup to the person getting picked up
+            _popupSystem.PopupEntity(Loc.GetString("carry-started", ("carrier", inserter)), toInsert, toInsert);
+        }
     }
 
     private void OnAttackAttempt(EntityUid uid, PseudoItemComponent component, AttackAttemptEvent args)
diff --git a/Content.Shared/OfferItem/OfferItemComponent.cs b/Content.Shared/OfferItem/OfferItemComponent.cs
new file mode 100644
index 0000000000..eb4d84932e
--- /dev/null
+++ b/Content.Shared/OfferItem/OfferItemComponent.cs
@@ -0,0 +1,26 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.OfferItem;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
+[Access(typeof(SharedOfferItemSystem))]
+public sealed partial class OfferItemComponent : Component
+{
+    [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
+    public bool IsInOfferMode;
+
+    [DataField, AutoNetworkedField]
+    public bool IsInReceiveMode;
+
+    [DataField, AutoNetworkedField]
+    public string? Hand;
+
+    [DataField, AutoNetworkedField]
+    public EntityUid? Item;
+
+    [DataField, AutoNetworkedField]
+    public EntityUid? Target;
+
+    [DataField]
+    public float MaxOfferDistance = 2f;
+}
diff --git a/Content.Shared/OfferItem/SharedOfferItemSystem.Interactions.cs b/Content.Shared/OfferItem/SharedOfferItemSystem.Interactions.cs
new file mode 100644
index 0000000000..230f59a380
--- /dev/null
+++ b/Content.Shared/OfferItem/SharedOfferItemSystem.Interactions.cs
@@ -0,0 +1,74 @@
+using Content.Shared.Popups;
+using Content.Shared.ActionBlocker;
+using Content.Shared.Input;
+using Content.Shared.Hands.Components;
+using Robust.Shared.Input.Binding;
+using Robust.Shared.Player;
+
+namespace Content.Shared.OfferItem;
+
+public abstract partial class SharedOfferItemSystem
+{
+    [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+
+    private void InitializeInteractions()
+    {
+        CommandBinds.Builder
+            .Bind(ContentKeyFunctions.OfferItem, InputCmdHandler.FromDelegate(SetInOfferMode, handle: false, outsidePrediction: false))
+            .Register<SharedOfferItemSystem>();
+    }
+
+    public override void Shutdown()
+    {
+        base.Shutdown();
+
+        CommandBinds.Unregister<SharedOfferItemSystem>();
+    }
+
+    private void SetInOfferMode(ICommonSession? session)
+    {
+        if (session is not { } playerSession)
+            return;
+
+        if ((playerSession.AttachedEntity is not { Valid: true } uid || !Exists(uid)) ||
+            !_actionBlocker.CanInteract(uid, null))
+            return;
+
+        if (!TryComp<OfferItemComponent>(uid, out var offerItem))
+            return;
+
+        if (!TryComp<HandsComponent>(uid, out var hands) || hands.ActiveHand == null)
+            return;
+
+        offerItem.Item = hands.ActiveHand.HeldEntity;
+
+        if (offerItem.IsInOfferMode == false)
+        {
+            if (offerItem.Item == null)
+            {
+                _popup.PopupEntity(Loc.GetString("offer-item-empty-hand"), uid, uid);
+                return;
+            }
+
+            if (offerItem.Hand == null || offerItem.Target == null)
+            {
+                offerItem.IsInOfferMode = true;
+                offerItem.Hand = hands.ActiveHand.Name;
+
+                Dirty(uid, offerItem);
+                return;
+            }
+        }
+
+        if (offerItem.Target != null)
+        {
+            UnReceive(offerItem.Target.Value, offerItem: offerItem);
+            offerItem.IsInOfferMode = false;
+            Dirty(uid, offerItem);
+            return;
+        }
+
+        UnOffer(uid, offerItem);
+    }
+}
diff --git a/Content.Shared/OfferItem/SharedOfferItemSystem.cs b/Content.Shared/OfferItem/SharedOfferItemSystem.cs
new file mode 100644
index 0000000000..c9d7dc5abc
--- /dev/null
+++ b/Content.Shared/OfferItem/SharedOfferItemSystem.cs
@@ -0,0 +1,155 @@
+using Content.Shared.Interaction;
+using Content.Shared.IdentityManagement;
+using Content.Shared.Hands.Components;
+
+namespace Content.Shared.OfferItem;
+
+public abstract partial class SharedOfferItemSystem : EntitySystem
+{
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<OfferItemComponent, AfterInteractUsingEvent>(SetInReceiveMode);
+        SubscribeLocalEvent<OfferItemComponent, MoveEvent>(OnMove);
+
+        InitializeInteractions();
+    }
+
+    private void SetInReceiveMode(EntityUid uid, OfferItemComponent component, AfterInteractUsingEvent args)
+    {
+        if (!TryComp<OfferItemComponent>(args.User, out var offerItem))
+            return;
+
+        if (args.User == uid || component.IsInReceiveMode ||
+            (offerItem.IsInReceiveMode && offerItem.Target != uid))
+            return;
+
+        component.IsInReceiveMode = true;
+        component.Target = args.User;
+
+        Dirty(uid, component);
+
+        offerItem.Target = uid;
+        offerItem.IsInOfferMode = false;
+
+        Dirty(args.User, offerItem);
+
+        if (offerItem.Item == null)
+            return;
+
+        _popup.PopupEntity(Loc.GetString("offer-item-try-give",
+            ("item", Identity.Entity(offerItem.Item.Value, EntityManager)),
+            ("target", Identity.Entity(uid, EntityManager))), component.Target.Value, component.Target.Value);
+        _popup.PopupEntity(Loc.GetString("offer-item-try-give-target",
+            ("user", Identity.Entity(component.Target.Value, EntityManager)),
+            ("item", Identity.Entity(offerItem.Item.Value, EntityManager))), component.Target.Value, uid);
+    }
+
+    private void OnMove(EntityUid uid, OfferItemComponent component, MoveEvent args)
+    {
+        if (component.Target == null ||
+            args.NewPosition.InRange(EntityManager, _transform,
+                Transform(component.Target.Value).Coordinates, component.MaxOfferDistance))
+            return;
+
+        UnOffer(uid, component);
+    }
+
+    /// <summary>
+    /// Resets the <see cref="OfferItemComponent"/> of the user and the target
+    /// </summary>
+    protected void UnOffer(EntityUid uid, OfferItemComponent component)
+    {
+        if (!TryComp<HandsComponent>(uid, out var hands) || hands.ActiveHand == null)
+            return;
+
+
+        if (TryComp<OfferItemComponent>(component.Target, out var offerItem) && component.Target != null)
+        {
+
+            if (component.Item != null)
+            {
+                _popup.PopupEntity(Loc.GetString("offer-item-no-give",
+                    ("item", Identity.Entity(component.Item.Value, EntityManager)),
+                    ("target", Identity.Entity(component.Target.Value, EntityManager))), uid, uid);
+                _popup.PopupEntity(Loc.GetString("offer-item-no-give-target",
+                    ("user", Identity.Entity(uid, EntityManager)),
+                    ("item", Identity.Entity(component.Item.Value, EntityManager))), uid, component.Target.Value);
+            }
+
+            else if (offerItem.Item != null)
+            {
+                _popup.PopupEntity(Loc.GetString("offer-item-no-give",
+                    ("item", Identity.Entity(offerItem.Item.Value, EntityManager)),
+                    ("target", Identity.Entity(uid, EntityManager))), component.Target.Value, component.Target.Value);
+                _popup.PopupEntity(Loc.GetString("offer-item-no-give-target",
+                    ("user", Identity.Entity(component.Target.Value, EntityManager)),
+                    ("item", Identity.Entity(offerItem.Item.Value, EntityManager))), component.Target.Value, uid);
+            }
+
+            offerItem.IsInOfferMode = false;
+            offerItem.IsInReceiveMode = false;
+            offerItem.Hand = null;
+            offerItem.Target = null;
+            offerItem.Item = null;
+
+            Dirty(component.Target.Value, offerItem);
+        }
+
+        component.IsInOfferMode = false;
+        component.IsInReceiveMode = false;
+        component.Hand = null;
+        component.Target = null;
+        component.Item = null;
+
+        Dirty(uid, component);
+    }
+
+
+    /// <summary>
+    /// Cancels the transfer of the item
+    /// </summary>
+    protected void UnReceive(EntityUid uid, OfferItemComponent? component = null, OfferItemComponent? offerItem = null)
+    {
+        if (component == null && !TryComp(uid, out component))
+            return;
+
+        if (offerItem == null && !TryComp(component.Target, out offerItem))
+            return;
+
+        if (!TryComp<HandsComponent>(uid, out var hands) || hands.ActiveHand == null ||
+            component.Target == null)
+            return;
+
+        if (offerItem.Item != null)
+        {
+            _popup.PopupEntity(Loc.GetString("offer-item-no-give",
+                ("item", Identity.Entity(offerItem.Item.Value, EntityManager)),
+                ("target", Identity.Entity(uid, EntityManager))), component.Target.Value, component.Target.Value);
+            _popup.PopupEntity(Loc.GetString("offer-item-no-give-target",
+                ("user", Identity.Entity(component.Target.Value, EntityManager)),
+                ("item", Identity.Entity(offerItem.Item.Value, EntityManager))), component.Target.Value, uid);
+        }
+
+        if (!offerItem.IsInReceiveMode)
+        {
+            offerItem.Target = null;
+            component.Target = null;
+        }
+
+        offerItem.Item = null;
+        offerItem.Hand = null;
+        component.IsInReceiveMode = false;
+
+        Dirty(uid, component);
+    }
+
+    /// <summary>
+    /// Returns true if <see cref="OfferItemComponent.IsInOfferMode"/> = true
+    /// </summary>
+    protected bool IsInOfferMode(EntityUid? entity, OfferItemComponent? component = null)
+    {
+        return entity != null && Resolve(entity.Value, ref component, false) && component.IsInOfferMode;
+    }
+}
diff --git a/Content.Shared/Physics/FrictionRemoverSystem.cs b/Content.Shared/Physics/FrictionRemoverSystem.cs
index 65bbe9e4d2..c8d7521eb0 100644
--- a/Content.Shared/Physics/FrictionRemoverSystem.cs
+++ b/Content.Shared/Physics/FrictionRemoverSystem.cs
@@ -1,3 +1,4 @@
+using Robust.Shared.Map.Components;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Systems;
@@ -19,7 +20,15 @@ public override void Initialize()
 
     private void RemoveDampening(EntityUid uid, PhysicsComponent component, PhysicsSleepEvent args)
     {
-        _physics.SetAngularDamping(uid, component, 0f, false);
-        _physics.SetLinearDamping(uid, component, 0f);
+        var linear = 0f;
+        var angular = 0f;
+        if (TryComp<PassiveDampeningComponent>(uid, out var dampening) && dampening.Enabled)
+        {
+            linear = dampening.LinearDampening;
+            angular = dampening.AngularDampening;
+        }
+
+        _physics.SetAngularDamping(uid, component, angular, false);
+        _physics.SetLinearDamping(uid, component, linear);
     }
 }
diff --git a/Content.Shared/Physics/PassiveDampeningComponent.cs b/Content.Shared/Physics/PassiveDampeningComponent.cs
new file mode 100644
index 0000000000..834569195e
--- /dev/null
+++ b/Content.Shared/Physics/PassiveDampeningComponent.cs
@@ -0,0 +1,18 @@
+namespace Content.Shared.Physics;
+
+/// <summary>
+///     A component that allows an entity to have friction (linear and angular dampening)
+///     even when not being affected by gravity.
+/// </summary>
+[RegisterComponent]
+public sealed partial class PassiveDampeningComponent : Component
+{
+    [DataField]
+    public bool Enabled = true;
+
+    [DataField]
+    public float LinearDampening = 0.2f;
+
+    [DataField]
+    public float AngularDampening = 0.2f;
+}
diff --git a/Content.Shared/Psionics/Glimmer/GlimmerSystem.cs b/Content.Shared/Psionics/Glimmer/GlimmerSystem.cs
index d50b6fb2f6..9b8d20b295 100644
--- a/Content.Shared/Psionics/Glimmer/GlimmerSystem.cs
+++ b/Content.Shared/Psionics/Glimmer/GlimmerSystem.cs
@@ -2,7 +2,6 @@
 using Robust.Shared.Configuration;
 using Content.Shared.CCVar;
 using Content.Shared.GameTicking;
-using Content.Shared.Mobs;
 
 namespace Content.Shared.Psionics.Glimmer
 {
@@ -12,6 +11,7 @@ namespace Content.Shared.Psionics.Glimmer
     public sealed class GlimmerSystem : EntitySystem
     {
         [Dependency] private readonly IConfigurationManager _cfg = default!;
+
         private float _glimmerInput = 0;
         /// <summary>
         ///     GlimmerInput represents the system-facing value of the station's glimmer, and is given by f(y) for this graph: https://www.desmos.com/calculator/posutiq38e
@@ -27,6 +27,12 @@ public float GlimmerInput
         }
         private float _glimmerOutput = 0;
 
+        /// <summary>
+        ///     This constant is equal to the intersection of the Glimmer Equation(https://www.desmos.com/calculator/posutiq38e) and the line Y = X.
+        /// </summary>
+        public const float GlimmerEquilibrium = 502.941f;
+
+
         /// <summary>
         ///     Glimmer Output represents the player-facing value of the station's glimmer, and is given by f(x) for this graph: https://www.desmos.com/calculator/posutiq38e
         ///     Where x = GlimmerInput and y = GlimmerOutput
@@ -55,7 +61,8 @@ private void Reset(RoundRestartCleanupEvent args)
         }
 
         /// <summary>
-        /// Return an abstracted range of a glimmer count.
+        ///     Return an abstracted range of a glimmer count. This is a legacy system used to support the Prober,
+        ///     and is the lowest form of abstracted glimmer. It's meant more for sprite states than math.
         /// </summary>
         /// <param name="glimmer">What glimmer count to check. Uses the current glimmer by default.</param>
         public GlimmerTier GetGlimmerTier(float? glimmer = null)
@@ -66,14 +73,30 @@ public GlimmerTier GetGlimmerTier(float? glimmer = null)
             return glimmer switch
             {
                 <= 49 => GlimmerTier.Minimal,
-                >= 50 and <= 99 => GlimmerTier.Low,
-                >= 100 and <= 299 => GlimmerTier.Moderate,
-                >= 300 and <= 499 => GlimmerTier.High,
-                >= 500 and <= 899 => GlimmerTier.Dangerous,
+                >= 50 and <= 399 => GlimmerTier.Low,
+                >= 400 and <= 599 => GlimmerTier.Moderate,
+                >= 600 and <= 699 => GlimmerTier.High,
+                >= 700 and <= 899 => GlimmerTier.Dangerous,
                 _ => GlimmerTier.Critical,
             };
         }
 
+        /// <summary>
+        ///     Returns a 0 through 10 range of glimmer. Do not divide by this for any reason.
+        /// </summary>
+        /// <returns></returns>
+        public int GetGlimmerOutputInteger()
+        {
+            if (!_enabled)
+                return 1;
+            else return (int) MathF.Round(GlimmerOutput / 1000);
+        }
+
+        /// <summary>
+        ///     This is the public facing function for modifying Glimmer based on the log scale. Simply add or subtract to this with any nonzero number
+        ///     Go through this if you want glimmer to be modified faster if its below 502.941f, and slower if above said equilibrium
+        /// </summary>
+        /// <param name="delta"></param>
         public void DeltaGlimmerInput(float delta)
         {
             if (_enabled && delta != 0)
@@ -83,6 +106,11 @@ public void DeltaGlimmerInput(float delta)
             }
         }
 
+        /// <summary>
+        ///     This is the public facing function for modifying Glimmer based on a linear scale. Simply add or subtract to this with any nonzero number.
+        ///     This is primarily intended for load bearing systems such as Probers and Drainers, and should not be called by most things by design.
+        /// </summary>
+        /// <param name="delta"></param>
         public void DeltaGlimmerOutput(float delta)
         {
             if (_enabled && delta != 0)
@@ -92,23 +120,54 @@ public void DeltaGlimmerOutput(float delta)
             }
         }
 
+        /// <summary>
+        ///     This directly sets the Player-Facing side of Glimmer to a given value, and is not intended to be called by anything other than admin commands.
+        ///     This is clamped between 0 and 999.999f
+        /// </summary>
+        /// <param name="set"></param>
         public void SetGlimmerOutput(float set)
         {
             if (_enabled && set != 0)
             {
-                GlimmerOutput = set;
+                GlimmerOutput = Math.Clamp(set, 0, 999.999f);
                 GlimmerInput = 2000 / (1 + MathF.Pow(MathF.E, -.0022f * GlimmerOutput)) - 1000;
             }
         }
 
+        /// <summary>
+        ///     This directly sets the code-facing side of Glimmer to a given value, and is not intended to be called by anything other than admin commands.
+        ///     This accepts any positive float input.
+        /// </summary>
+        /// <param name="set"></param>
         public void SetGlimmerInput(float set)
         {
-            if (_enabled && set != 0)
+            if (_enabled && set >= 0)
             {
                 GlimmerInput = set;
                 GlimmerOutput = 2000 / (1 + MathF.Pow(MathF.E, -.0022f * GlimmerOutput)) - 1000;
             }
         }
+
+        /// <summary>
+        ///     Outputs the ratio between actual glimmer and glimmer equilibrium(The intersection of the Glimmer Equation and the line y = x).
+        ///     This will return 0.01f if glimmer is 0, and 1 if glimmer is disabled.
+        /// </summary>
+        public float GetGlimmerEquilibriumRatio()
+        {
+            if (!_enabled)
+                return 1;
+            else if (GlimmerOutput == 0)
+                return 0.01f;
+            else return GlimmerOutput / GlimmerEquilibrium;
+        }
+
+        /// <summary>
+        ///     Returns the GlimmerEnabled CVar, useful for niche early exits in systems that otherwise don't have any calls to CVars.
+        /// </summary>
+        public bool GetGlimmerEnabled()
+        {
+            return _enabled;
+        }
     }
 
     [Serializable, NetSerializable]
diff --git a/Content.Shared/Psionics/PsionicComponent.cs b/Content.Shared/Psionics/PsionicComponent.cs
index c955626c53..748b8ddd92 100644
--- a/Content.Shared/Psionics/PsionicComponent.cs
+++ b/Content.Shared/Psionics/PsionicComponent.cs
@@ -19,10 +19,20 @@ public sealed partial class PsionicComponent : Component
         [DataField("psychicFeedback")]
         public List<string> PsychicFeedback = new();
 
-        [DataField("amplification")]
+        /// <summary>
+        ///     An abstraction of how "Powerful" a psychic is. This is most commonly used as a multiplier on numerical outputs for psychic powers.
+        /// </summary>
+        /// <remarks>
+        ///     For an ordinary human, this will be between 0.5 and 1.2, but may be higher for some entities.
+        /// </remarks>
+        [DataField]
         public float Amplification = 0.1f;
 
-        [DataField("dampening")]
+        /// <summary>
+        ///     An abstraction of how much "Control" a psychic has over their powers. This is most commonly used to decrease glimmer output of powers,
+        ///     or to make obvious powers less likely to be obvious.
+        /// </summary>
+        [DataField]
         public float Dampening = 0.1f;
         public bool Telepath = true;
         public bool TelepathicMute = false;
diff --git a/Content.Shared/Psionics/SharedPsionicAbilitiesSystem.cs b/Content.Shared/Psionics/SharedPsionicAbilitiesSystem.cs
index f905ec4dd4..4dd8fa2442 100644
--- a/Content.Shared/Psionics/SharedPsionicAbilitiesSystem.cs
+++ b/Content.Shared/Psionics/SharedPsionicAbilitiesSystem.cs
@@ -88,7 +88,8 @@ public void LogPowerUsed(EntityUid uid, string power, PsionicComponent? psionic
             var ev = new PsionicPowerUsedEvent(uid, power);
             RaiseLocalEvent(uid, ev, false);
 
-            if (!overrideGlimmer)
+            //Redundant check for the GlimmerEnabled CVar because I want to skip this math too if its turned off.
+            if (_glimmerSystem.GetGlimmerEnabled() && !overrideGlimmer)
             {
                 if (psionic == null)
                     _glimmerSystem.DeltaGlimmerInput(_robustRandom.NextFloat(minGlimmer, maxGlimmer));
diff --git a/Content.Shared/Resist/EscapeInventoryCancelEvent.cs b/Content.Shared/Resist/EscapeInventoryCancelEvent.cs
new file mode 100644
index 0000000000..75ee09ff04
--- /dev/null
+++ b/Content.Shared/Resist/EscapeInventoryCancelEvent.cs
@@ -0,0 +1,5 @@
+using Content.Shared.Actions;
+
+namespace Content.Shared.Resist;
+
+public sealed partial class EscapeInventoryCancelActionEvent : InstantActionEvent;
diff --git a/Content.Shared/Strip/Components/StrippableComponent.cs b/Content.Shared/Strip/Components/StrippableComponent.cs
index fbf99992e3..0072580829 100644
--- a/Content.Shared/Strip/Components/StrippableComponent.cs
+++ b/Content.Shared/Strip/Components/StrippableComponent.cs
@@ -1,3 +1,4 @@
+using Content.Shared.DoAfter;
 using Content.Shared.Inventory;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
@@ -8,10 +9,10 @@ namespace Content.Shared.Strip.Components
     public sealed partial class StrippableComponent : Component
     {
         /// <summary>
-        /// The strip delay for hands.
+        ///     The strip delay for hands.
         /// </summary>
         [ViewVariables(VVAccess.ReadWrite), DataField("handDelay")]
-        public float HandStripDelay = 4f;
+        public TimeSpan HandStripDelay = TimeSpan.FromSeconds(4f);
     }
 
     [NetSerializable, Serializable]
@@ -21,63 +22,63 @@ public enum StrippingUiKey : byte
     }
 
     [NetSerializable, Serializable]
-    public sealed class StrippingSlotButtonPressed : BoundUserInterfaceMessage
+    public sealed class StrippingSlotButtonPressed(string slot, bool isHand) : BoundUserInterfaceMessage
     {
-        public readonly string Slot;
-
-        public readonly bool IsHand;
-
-        public StrippingSlotButtonPressed(string slot, bool isHand)
-        {
-            Slot = slot;
-            IsHand = isHand;
-        }
+        public readonly string Slot = slot;
+        public readonly bool IsHand = isHand;
     }
 
     [NetSerializable, Serializable]
-    public sealed class StrippingEnsnareButtonPressed : BoundUserInterfaceMessage
-    {
-        public StrippingEnsnareButtonPressed()
-        {
-        }
-    }
+    public sealed class StrippingEnsnareButtonPressed : BoundUserInterfaceMessage;
 
-    public abstract class BaseBeforeStripEvent : EntityEventArgs, IInventoryRelayEvent
+    [ByRefEvent]
+    public abstract class BaseBeforeStripEvent(TimeSpan initialTime, ThievingStealth stealth = ThievingStealth.Obvious) : EntityEventArgs, IInventoryRelayEvent
     {
-        public readonly float InitialTime;
-        public float Time => MathF.Max(InitialTime * Multiplier + Additive, 0f);
-        public float Additive = 0;
+        public readonly TimeSpan InitialTime = initialTime;
         public float Multiplier = 1f;
-        public bool Stealth;
+        public TimeSpan Additive = TimeSpan.Zero;
+        public ThievingStealth Stealth = stealth;
 
-        public SlotFlags TargetSlots { get; } = SlotFlags.GLOVES;
+        public TimeSpan Time => TimeSpan.FromSeconds(MathF.Max(InitialTime.Seconds * Multiplier + Additive.Seconds, 0f));
 
-        public BaseBeforeStripEvent(float initialTime, bool stealth = false)
-        {
-            InitialTime = initialTime;
-            Stealth = stealth;
-        }
+        public SlotFlags TargetSlots { get; } = SlotFlags.GLOVES;
     }
 
     /// <summary>
-    /// Used to modify strip times. Raised directed at the user.
+    ///     Used to modify strip times. Raised directed at the user.
     /// </summary>
     /// <remarks>
-    /// This is also used by some stripping related interactions, i.e., interactions with items that are currently equipped by another player.
+    ///     This is also used by some stripping related interactions, i.e., interactions with items that are currently equipped by another player.
     /// </remarks>
-    public sealed class BeforeStripEvent : BaseBeforeStripEvent
-    {
-        public BeforeStripEvent(float initialTime, bool stealth = false) : base(initialTime, stealth) { }
-    }
+    [ByRefEvent]
+    public sealed class BeforeStripEvent(TimeSpan initialTime, ThievingStealth stealth = ThievingStealth.Obvious) : BaseBeforeStripEvent(initialTime, stealth);
 
     /// <summary>
-    /// Used to modify strip times. Raised directed at the target.
+    ///     Used to modify strip times. Raised directed at the target.
     /// </summary>
     /// <remarks>
-    /// This is also used by some stripping related interactions, i.e., interactions with items that are currently equipped by another player.
+    ///     This is also used by some stripping related interactions, i.e., interactions with items that are currently equipped by another player.
     /// </remarks>
-    public sealed class BeforeGettingStrippedEvent : BaseBeforeStripEvent
+    [ByRefEvent]
+    public sealed class BeforeGettingStrippedEvent(TimeSpan initialTime, ThievingStealth stealth = ThievingStealth.Obvious) : BaseBeforeStripEvent(initialTime, stealth);
+
+    /// <summary>
+    ///     Organizes the behavior of DoAfters for <see cref="StrippableSystem">.
+    /// </summary>
+    [Serializable, NetSerializable]
+    public sealed partial class StrippableDoAfterEvent : DoAfterEvent
     {
-        public BeforeGettingStrippedEvent(float initialTime, bool stealth = false) : base(initialTime, stealth) { }
+        public readonly bool InsertOrRemove;
+        public readonly bool InventoryOrHand;
+        public readonly string SlotOrHandName;
+
+        public StrippableDoAfterEvent(bool insertOrRemove, bool inventoryOrHand, string slotOrHandName)
+        {
+            InsertOrRemove = insertOrRemove;
+            InventoryOrHand = inventoryOrHand;
+            SlotOrHandName = slotOrHandName;
+        }
+
+        public override DoAfterEvent Clone() => this;
     }
 }
diff --git a/Content.Shared/Strip/Components/ThievingComponent.cs b/Content.Shared/Strip/Components/ThievingComponent.cs
index 83679f132c..1d58462772 100644
--- a/Content.Shared/Strip/Components/ThievingComponent.cs
+++ b/Content.Shared/Strip/Components/ThievingComponent.cs
@@ -9,14 +9,24 @@ public sealed partial class ThievingComponent : Component
     /// <summary>
     /// How much the strip time should be shortened by
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("stripTimeReduction")]
-    public float StripTimeReduction = 0.5f;
+    [DataField]
+    public TimeSpan StripTimeReduction = TimeSpan.FromSeconds(0.5f);
+
+    /// <summary>
+    ///  A multiplier coefficient for strip time
+    /// </summary>
+    [DataField]
+    public float StripTimeMultiplier = 1f;
 
     /// <summary>
     /// Should it notify the user if they're stripping a pocket?
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("stealthy")]
-    public bool Stealthy;
+    [DataField]
+    public ThievingStealth Stealth = ThievingStealth.Hidden;
+
+    /// <summary>
+    ///  Should the user be able to see hidden items? (i.e pockets)
+    /// </summary>
+    [DataField]
+    public bool IgnoreStripHidden;
 }
diff --git a/Content.Shared/Strip/SharedStrippableSystem.cs b/Content.Shared/Strip/SharedStrippableSystem.cs
index a698ae5035..64dd6a81f3 100644
--- a/Content.Shared/Strip/SharedStrippableSystem.cs
+++ b/Content.Shared/Strip/SharedStrippableSystem.cs
@@ -1,11 +1,14 @@
 using Content.Shared.DragDrop;
 using Content.Shared.Hands.Components;
+using Content.Shared.Popups;
 using Content.Shared.Strip.Components;
 
 namespace Content.Shared.Strip;
 
 public abstract class SharedStrippableSystem : EntitySystem
 {
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly ThievingSystem _thieving = default!;
     public override void Initialize()
     {
         base.Initialize();
@@ -14,12 +17,12 @@ public override void Initialize()
         SubscribeLocalEvent<StrippableComponent, DragDropDraggedEvent>(OnDragDrop);
     }
 
-    public (float Time, bool Stealth) GetStripTimeModifiers(EntityUid user, EntityUid target, float initialTime)
+    public (TimeSpan Time, ThievingStealth Stealth) GetStripTimeModifiers(EntityUid user, EntityUid target, TimeSpan initialTime)
     {
         var userEv = new BeforeStripEvent(initialTime);
-        RaiseLocalEvent(user, userEv);
+        RaiseLocalEvent(user, ref userEv);
         var ev = new BeforeGettingStrippedEvent(userEv.Time, userEv.Stealth);
-        RaiseLocalEvent(target, ev);
+        RaiseLocalEvent(target, ref ev);
         return (ev.Time, ev.Stealth);
     }
 
@@ -55,4 +58,17 @@ private void OnCanDrop(EntityUid uid, StrippableComponent component, ref CanDrop
         if (args.CanDrop)
             args.Handled = true;
     }
+
+    public void StripPopup(string messageId, ThievingStealth stealth, EntityUid target, EntityUid? user = null, EntityUid? item = null, string slot = "")
+    {
+        bool subtle = stealth == ThievingStealth.Subtle;
+        PopupType? popupSize = _thieving.GetPopupTypeFromStealth(stealth);
+
+        if (popupSize.HasValue) // We should always have a value if we're not hidden
+            _popup.PopupEntity(Loc.GetString(messageId,
+            ("user", subtle ? Loc.GetString("thieving-component-user") : user ?? EntityUid.Invalid),
+            ("item", subtle ? Loc.GetString("thieving-component-item") : item ?? EntityUid.Invalid),
+            ("slot", slot)),
+            target, target, popupSize.Value);
+    }
 }
diff --git a/Content.Shared/Strip/ThievingSystem.cs b/Content.Shared/Strip/ThievingSystem.cs
index 0ef4b66571..8f523accfe 100644
--- a/Content.Shared/Strip/ThievingSystem.cs
+++ b/Content.Shared/Strip/ThievingSystem.cs
@@ -1,5 +1,7 @@
 using Content.Shared.Inventory;
+using Content.Shared.Popups;
 using Content.Shared.Strip.Components;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Strip;
 
@@ -16,7 +18,41 @@ public override void Initialize()
 
     private void OnBeforeStrip(EntityUid uid, ThievingComponent component, BeforeStripEvent args)
     {
-        args.Stealth |= component.Stealthy;
+        args.Stealth = (ThievingStealth) Math.Max((sbyte) args.Stealth, (sbyte) component.Stealth);
         args.Additive -= component.StripTimeReduction;
+        args.Multiplier *= component.StripTimeMultiplier;
     }
+
+    public PopupType? GetPopupTypeFromStealth(ThievingStealth stealth)
+    {
+        switch (stealth)
+        {
+            case ThievingStealth.Hidden:
+                return null;
+
+            case ThievingStealth.Subtle:
+                return PopupType.Small;
+
+            default:
+                return PopupType.Large;
+        }
+    }
+}
+[Serializable, NetSerializable]
+public enum ThievingStealth : sbyte
+{
+    /// <summary>
+    /// 	Target sees a large popup indicating that an item is being stolen by who
+    /// </summary>
+    Obvious = 0,
+
+    /// <summary>
+    /// 	Target sees a small popup indicating that an item is being stolen
+    /// </summary>
+    Subtle = 1,
+
+    /// <summary>
+    /// 	Target does not see any popup regarding the stealing of an item
+    /// </summary>
+    Hidden = 2
 }
diff --git a/Content.Shared/Traits/Assorted/Components/NormalVisionComponent.cs b/Content.Shared/Traits/Assorted/Components/NormalVisionComponent.cs
new file mode 100644
index 0000000000..442bb6f008
--- /dev/null
+++ b/Content.Shared/Traits/Assorted/Components/NormalVisionComponent.cs
@@ -0,0 +1,12 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Traits.Assorted.Components;
+
+/// <summary>
+///     This is used for removing species specific vision traits
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class NormalVisionComponent : Component
+{
+}
+
diff --git a/Content.Shared/Traits/Assorted/Systems/NormalVisionSystem.cs b/Content.Shared/Traits/Assorted/Systems/NormalVisionSystem.cs
new file mode 100644
index 0000000000..ee25bf364b
--- /dev/null
+++ b/Content.Shared/Traits/Assorted/Systems/NormalVisionSystem.cs
@@ -0,0 +1,23 @@
+using Content.Shared.Abilities;
+using Content.Shared.Traits.Assorted.Components;
+
+namespace Content.Shared.Traits.Assorted.Systems;
+
+/// <summary>
+///     This handles removing species-specific vision traits.
+/// </summary>
+public sealed class NormalVisionSystem : EntitySystem
+{
+    /// <inheritdoc/>
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<NormalVisionComponent, ComponentInit>(OnStartup);
+    }
+
+
+    private void OnStartup(EntityUid uid, NormalVisionComponent component, ComponentInit args)
+    {
+        RemComp<DogVisionComponent>(uid);
+        RemComp<UltraVisionComponent>(uid);
+    }
+}
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 457c4c1463..9c472d93e3 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -4251,3 +4251,119 @@ Entries:
       message: 'Height and Width sliders have been added to character creation. '
   id: 6131
   time: '2024-06-27T17:46:51.0000000+00:00'
+- author: Mnemotechnician
+  changes:
+    - type: Add
+      message: Most items now take time to equip and unequip, especially space suits.
+  id: 6132
+  time: '2024-06-30T18:22:28.0000000+00:00'
+- author: VMSolidus
+  changes:
+    - type: Fix
+      message: >-
+        Spent bullet casings now fly away from a shooter in a cinematic manner,
+        rather than fall at their feet. 
+  id: 6133
+  time: '2024-07-01T22:37:29.0000000+00:00'
+- author: WarMechanic
+  changes:
+    - type: Fix
+      message: Fixed loadouts becoming uneditable after spending all your points
+  id: 6134
+  time: '2024-07-02T07:18:27.0000000+00:00'
+- author: deltanedas
+  changes:
+    - type: Add
+      message: >-
+        Security can find the new SecWatch™ app in their PDAs to see current
+        suspects and wanted criminals.
+  id: 6135
+  time: '2024-07-02T08:01:36.0000000+00:00'
+- author: Mnemotechnician
+  changes:
+    - type: Fix
+      message: Equipping clothing using the Z key works correctly again.
+  id: 6136
+  time: '2024-07-03T19:48:29.0000000+00:00'
+- author: Mnemotechnician
+  changes:
+    - type: Tweak
+      message: >-
+        Space stations now have a tiny bit of velocity dampening to prevent them
+        from being flunged into the void.
+  id: 6137
+  time: '2024-07-05T16:53:25.0000000+00:00'
+- author: Mnemotechnician
+  changes:
+    - type: Fix
+      message: Carrying is less likely to behave erratically or suddenly interrupt now.
+    - type: Add
+      message: >-
+        You can now see when someone is trying to pick you up, and also you can
+        interrupt your attempt at escaping from their hands or inventory.
+    - type: Add
+      message: You can now properly take Felinids out of bags and place them inside.
+    - type: Add
+      message: Scientists have discovered that Felinids can sleep in bags.
+  id: 6138
+  time: '2024-07-05T17:28:44.0000000+00:00'
+- author: Mnemotechnician
+  changes:
+    - type: Add
+      message: You can now sign paper by alt-clicking it while holding a pen.
+  id: 6139
+  time: '2024-07-05T17:33:39.0000000+00:00'
+- author: WarMechanic
+  changes:
+    - type: Add
+      message: Added the Thievery trait, which provides various soft stripping bonuses
+    - type: Tweak
+      message: >-
+        Felinids no longer have passive thieving gloves, they instead get the
+        Thievery trait by default
+  id: 6140
+  time: '2024-07-05T17:49:25.0000000+00:00'
+- author: Froffy025
+  changes:
+    - type: Add
+      message: You can now carry most of the station pets.
+  id: 6141
+  time: '2024-07-05T17:49:57.0000000+00:00'
+- author: Mnemotechnician
+  changes:
+    - type: Fix
+      message: Job requirements are now displayed correctly.
+  id: 6142
+  time: '2024-07-05T19:10:24.0000000+00:00'
+- author: Mnemotechnician
+  changes:
+    - type: Tweak
+      message: >-
+        Events should now occur as frequently as before. Note: server owner can
+        configure the frequency on their server manually.
+  id: 6143
+  time: '2024-07-05T21:03:28.0000000+00:00'
+- author: VMSolidus
+  changes:
+    - type: Add
+      message: >-
+        The catalog of items available via Loadouts has been greatly expanded.
+        Have fun customizing your characters!
+  id: 6144
+  time: '2024-07-05T22:53:36.0000000+00:00'
+- author: Mnemotechnician
+  changes:
+    - type: Tweak
+      message: Translator implants are now proper implants that can be removed.
+    - type: Tweak
+      message: Animalistic languages should now look less messy.
+    - type: Fix
+      message: Hopefully fixed language menu desync and other issues.
+  id: 6145
+  time: '2024-07-05T23:49:47.0000000+00:00'
+- author: Spatison
+  changes:
+    - type: Add
+      message: Added system
+  id: 6146
+  time: '2024-07-06T00:19:35.0000000+00:00'
diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt
index b5381a4ce2..84796a9466 100644
--- a/Resources/Credits/GitHub.txt
+++ b/Resources/Credits/GitHub.txt
@@ -1 +1 @@
-0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aexxie, africalimedrop, Agoichi, Ahion, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, ArchPigeon, Arendian, arimah, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, avghdev, AzzyIsNotHere, BananaFlambe, BasedUser, BGare, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, Boaz1111, BobdaBiscuit, brainfood1183, Brandon-Huu, Bribrooo, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CaasGit, CakeQ, CaptainSqrBeard, Carbonhell, Carolyn3114, casperr04, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, clement-or, Clyybber, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, deepdarkdepths, Delete69, deltanedas, DeltaV-Bot, DerbyX, DoctorBeard, DogZeroX, dontbetank, Doru991, DoubleRiceEddiedd, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exincore, exp111, Fahasor, FairlySadPanda, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FluidRock, FoLoKe, fooberticus, Fortune117, FoxxoTrystan, freeman2651, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, Git-Nivrak, github-actions[bot], gituhabu, GNF54, Golinth, GoodWheatley, Gotimanga, graevy, GreyMario, Guess-My-Name, gusxyz, h3half, Hanzdegloker, Hardly3D, harikattar, Hebiman, Henry12116, HerCoyote23, Hmeister-real, HoofedEar, hord-brayden, hubismal, Hugal31, Hyenh, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, ItsMeThom, j-giebel, Jackal298, Jackrost, jamessimo, janekvap, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JoeHammad1844, joelhed, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTether, JustinTrotter, KaiShibaa, kalane15, kalanosh, KEEYNy, Keikiru, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Kmc2000, Ko4ergaPunk, komunre, koteq, Krunklehorn, Kukutis96513, kxvvv, Lamrr, LankLTE, lapatison, Leander-0, leonardo-dabepis, LetterN, Level10Cybermancer, lever1209, LightVillet, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, LovelyLophi, LudwigVonChesterfield, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, M3739, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, matthst, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MisterMecky, Mith-randalf, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, noverd, nuke-haus, NULL882, OCOtheOmega, OctoRocket, OldDanceJacket, onoira, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, PHCodes, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Psychpsyo, psykzz, PuroSlavKing, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, Saakra, Samsterious, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, SethLafuente, ShadowCommander, Shadowtheprotogen546, SignalWalker, SimpleStation14, Simyon264, SirDragooon, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, Snowni, snowsignal, SonicHDC, SoulSloth, SpaceManiac, SpeltIncorrectyl, spoogemonster, ssdaniel24, Stealthbomber16, stellar-novas, StrawberryMoses, SweptWasTaken, Szunti, TadJohnson00, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, Theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, tmtmtl30, tom-leys, tomasalves8, Tomeno, Tornado-Technology, tosatur, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UKNOWH, UnicornOnLSD, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Verslebas, VigersRay, Visne, VMSolidus, volundr-, Voomra, Vordenburg, vulppine, waylon531, weaversam8, Willhelm53, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zumorica, Zymem
+0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aexxie, africalimedrop, Agoichi, Ahion, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, ArchPigeon, Arendian, arimah, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, avghdev, AzzyIsNotHere, BananaFlambe, BasedUser, BGare, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, Boaz1111, BobdaBiscuit, brainfood1183, Brandon-Huu, Bribrooo, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CaasGit, CakeQ, CaptainSqrBeard, Carbonhell, Carolyn3114, casperr04, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, clement-or, Clyybber, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, deepdarkdepths, Delete69, deltanedas, DeltaV-Bot, DerbyX, DoctorBeard, DogZeroX, dontbetank, Doru991, DoubleRiceEddiedd, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exincore, exp111, Fahasor, FairlySadPanda, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FluidRock, FoLoKe, fooberticus, Fortune117, FoxxoTrystan, freeman2651, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, geraeumig, Git-Nivrak, github-actions[bot], gituhabu, GNF54, Golinth, GoodWheatley, Gotimanga, graevy, GreyMario, Guess-My-Name, gusxyz, h3half, Hanzdegloker, Hardly3D, harikattar, Hebiman, Henry12116, HerCoyote23, Hmeister-real, HoofedEar, hord-brayden, hubismal, Hugal31, Hyenh, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, ItsMeThom, j-giebel, Jackal298, Jackrost, jamessimo, janekvap, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JoeHammad1844, joelhed, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTether, JustinTrotter, KaiShibaa, kalane15, kalanosh, KEEYNy, Keikiru, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Kmc2000, Ko4ergaPunk, komunre, koteq, Krunklehorn, Kukutis96513, kxvvv, Lamrr, LankLTE, lapatison, Leander-0, leonardo-dabepis, LetterN, Level10Cybermancer, lever1209, LightVillet, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, LovelyLophi, LudwigVonChesterfield, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, M3739, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, matthst, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MisterMecky, Mith-randalf, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, noverd, nuke-haus, NULL882, OCOtheOmega, OctoRocket, OldDanceJacket, onoira, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, PHCodes, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Psychpsyo, psykzz, PuroSlavKing, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, Saakra, Samsterious, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, SethLafuente, ShadowCommander, Shadowtheprotogen546, SignalWalker, SimpleStation14, Simyon264, SirDragooon, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, Snowni, snowsignal, SonicHDC, SoulSloth, SpaceManiac, SpeltIncorrectyl, spoogemonster, ssdaniel24, Stealthbomber16, stellar-novas, StrawberryMoses, SweptWasTaken, Szunti, TadJohnson00, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, Theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, tmtmtl30, tom-leys, tomasalves8, Tomeno, Tornado-Technology, tosatur, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UKNOWH, UnicornOnLSD, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Verslebas, VigersRay, Visne, VMSolidus, volundr-, Voomra, Vordenburg, vulppine, waylon531, weaversam8, Willhelm53, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zumorica, Zymem
diff --git a/Resources/Locale/en-US/actions/actions/sleep.ftl b/Resources/Locale/en-US/actions/actions/sleep.ftl
index fd833fd4a5..6188e1639f 100644
--- a/Resources/Locale/en-US/actions/actions/sleep.ftl
+++ b/Resources/Locale/en-US/actions/actions/sleep.ftl
@@ -5,3 +5,5 @@ sleep-examined = [color=lightblue]{CAPITALIZE(SUBJECT($target))} {CONJUGATE-BE($
 
 wake-other-success = You shake {THE($target)} awake.
 wake-other-failure = You shake {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} not waking up.
+
+popup-sleep-in-bag = {THE($entity)} curls up and falls asleep.
diff --git a/Resources/Locale/en-US/alerts/alerts.ftl b/Resources/Locale/en-US/alerts/alerts.ftl
index 795d740141..5f880e8dac 100644
--- a/Resources/Locale/en-US/alerts/alerts.ftl
+++ b/Resources/Locale/en-US/alerts/alerts.ftl
@@ -110,3 +110,6 @@ alerts-revenant-essence-desc = The power of souls. It sustains you and is used f
 
 alerts-revenant-corporeal-name = Corporeal
 alerts-revenant-corporeal-desc = You have manifested physically. People around you can see and hurt you.
+
+alerts-offer-name = Offer
+alerts-offer-desc = Someone offers you an item.
diff --git a/Resources/Locale/en-US/customization/character-requirements.ftl b/Resources/Locale/en-US/customization/character-requirements.ftl
index e7bcf0669f..efa1b7e767 100644
--- a/Resources/Locale/en-US/customization/character-requirements.ftl
+++ b/Resources/Locale/en-US/customization/character-requirements.ftl
@@ -9,7 +9,7 @@ character-species-requirement = You must {$inverted ->
 character-trait-requirement = You must {$inverted ->
     [true] not have
     *[other] have
-} the trait [color=lightblue]{$traits}[/color]
+} one of these traits: [color=lightblue]{$traits}[/color]
 character-backpack-type-requirement = You must {$inverted ->
     [true] not use
     *[other] use
diff --git a/Resources/Locale/en-US/deltav/cartridge-loader/secwatch.ftl b/Resources/Locale/en-US/deltav/cartridge-loader/secwatch.ftl
new file mode 100644
index 0000000000..a5b96eab08
--- /dev/null
+++ b/Resources/Locale/en-US/deltav/cartridge-loader/secwatch.ftl
@@ -0,0 +1,5 @@
+sec-watch-program-name = SecWatch
+sec-watch-title = SecWatch 1.0
+sec-watch-no-entries = Everything's calm. Why not enjoy a Monkin Donut?
+sec-watch-entry = {$name}, {$job}
+sec-watch-no-reason = None given???
diff --git a/Resources/Locale/en-US/deltav/paper/signature.ftl b/Resources/Locale/en-US/deltav/paper/signature.ftl
new file mode 100644
index 0000000000..87741c962c
--- /dev/null
+++ b/Resources/Locale/en-US/deltav/paper/signature.ftl
@@ -0,0 +1,5 @@
+paper-sign-verb = Sign
+
+paper-signed-other = {CAPITALIZE(THE($user))} signs {THE($target)}.
+paper-signed-self = You sign {THE($target)}.
+paper-signed-failure = You cannot sign {THE($target)}
diff --git a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
index 46f5df48ad..f76d1c0478 100644
--- a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
+++ b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
@@ -41,6 +41,7 @@ ui-options-volume-percent = { TOSTRING($volume, "P0") }
 
 ui-options-show-held-item = Show held item next to cursor
 ui-options-show-combat-mode-indicators = Show combat mode indicators with cursor
+ui-options-show-offer-mode-indicators = Show offer mode indicators with cursor
 ui-options-opaque-storage-window = Opaque storage window
 ui-options-show-looc-on-head = Show LOOC chat above characters head
 ui-options-fancy-speech = Show names in speech bubbles
@@ -135,6 +136,7 @@ ui-options-function-examine-entity = Examine
 ui-options-function-swap-hands = Swap hands
 ui-options-function-move-stored-item = Move stored item
 ui-options-function-rotate-stored-item = Rotate stored item
+ui-options-function-offer-item = Offer something
 ui-options-static-storage-ui = Lock storage window to hotbar
 
 ui-options-function-smart-equip-backpack = Smart-equip to backpack
diff --git a/Resources/Locale/en-US/interaction/offer-item-system.ftl b/Resources/Locale/en-US/interaction/offer-item-system.ftl
new file mode 100644
index 0000000000..718c94cb0e
--- /dev/null
+++ b/Resources/Locale/en-US/interaction/offer-item-system.ftl
@@ -0,0 +1,13 @@
+offer-item-empty-hand = You don't have anything in your hand to give!
+
+offer-item-full-hand = Your hand isn't free to receive the item.
+
+offer-item-try-give = You offer the {THE($item)} to {$target}
+offer-item-try-give-target = {$user} offers you a {THE($item)}
+
+offer-item-give = You handed {THE($item)} to {$target}
+offer-item-give-other = {$user} handed {THE($item)} to {$target}
+offer-item-give-target = {$user} handed you a {THE($item)}
+
+offer-item-no-give = You stop offering {THE($item)} to {$target}
+offer-item-no-give-target = {$user} is no longer offer a {THE($item)} to you
diff --git a/Resources/Locale/en-US/loadouts/categories.ftl b/Resources/Locale/en-US/loadouts/categories.ftl
index 11dd4dc6f7..9770bd8baf 100644
--- a/Resources/Locale/en-US/loadouts/categories.ftl
+++ b/Resources/Locale/en-US/loadouts/categories.ftl
@@ -1,5 +1,7 @@
 # Alphabetically ordered, except for Uncategorized since it is always first
 
+loadout-category-Uncategorized = Uncategorized
+loadout-category-Accessories = Accessories
 loadout-category-Eyes = Eyes
 loadout-category-Hands = Hands
 loadout-category-Head = Head
@@ -10,5 +12,4 @@ loadout-category-Neck = Neck
 loadout-category-Outer = Outer
 loadout-category-Shoes = Shoes
 loadout-category-Species = Species
-loadout-category-Uncategorized = Uncategorized
 loadout-category-Uniform = Uniform
diff --git a/Resources/Locale/en-US/npc/conversation/sophia.ftl b/Resources/Locale/en-US/npc/conversation/sophia.ftl
new file mode 100644
index 0000000000..c832d9fc17
--- /dev/null
+++ b/Resources/Locale/en-US/npc/conversation/sophia.ftl
@@ -0,0 +1,82 @@
+sophia-response-name = You may call me Sophia.
+sophia-response-help = You may inquire about one of the following topics: {$availablePrompts}.
+
+sophia-response-hello-1 = Greetings.
+sophia-response-hello-2 = Salutations.
+
+sophia-response-bye-1 = Fare thee well.
+sophia-response-bye-2 = Gods be with you.
+sophia-response-bye-3 = Come back wiser.
+
+sophia-idle-phrase-1 = Mmmm, another portent.
+sophia-idle-phrase-2 = The noösphere is quite beautiful today. However, I don't think I could describe it in a way you could understand.
+sophia-idle-phrase-3 = I've been here before. You have, too.
+
+sophia-response-attention-1 = What is it?
+sophia-response-attention-2 = What do you seek?
+sophia-response-attention-3 = Out with it.
+
+sophia-response-sorry-1 = That's not a question for me.
+sophia-response-sorry-2 = Ask someone else.
+sophia-response-sorry-3 = Maybe I know the answer, maybe I do not. Either way, I will not be answering that question.
+
+sophia-response-nature = My nature doesn't really matter, does it? I'm fulfilling my purpose. Can you say the same, or are you just wasting time?
+
+sophia-response-epi = 'Epistemics' is a word. Aspiring Hellenes they are, they wished to displace the Latin 'science.' However, in English, epistemics has undesired connotations as a study of knowledge itself, even though the Greek word is a literal replacement for 'science.'
+
+sophia-response-mantis = 'Mantis' means seer, soothsayer, or prophet. They must be so named because they seek to uncover the truth. And, fittingly with their psionic aptitude, 'mantis' and 'mind' both descend, to the best of our knowledge, from an absolutely ancient word that sounded something like 'mentis.'
+
+sophia-response-mystagogue = 'Mystagogue' literally means 'leader of the mystics.' You may know the suffix -gogue from 'demogogue.'
+
+sophia-response-oracle = Oracle? I don't know much about her, and she isn't keen to share her secrets with me.
+
+sophia-response-psionics = Psionics are extraordinary abilities originating from one's mind. There doesn't seem to be any dominant word to refer to someone with the ability to practice these, although I prefer 'psion' or 'psychic.'
+
+sophia-response-noosphere = The noösphere is a field connecting all of consciousness. It's the medium through which psionics works. Its strength and effects on the illusory world of the material are based on its pressure. Colloquially, noöspheric pressure is called 'glimmer.'
+
+sophia-response-god = 'God' is such a vague term. There are so many entities out there that have defeated mortality. How you choose to regard them is your business.
+
+sophia-response-morphotype = In the first century PCC, several entities reshaped men into their image. I had done the same, if you would believe it. I can offer no evidence of their existence, other than faint memories. Any specific morphotype you want to know about?
+
+sophia-response-calendar = It's currently 417 PCC. The casuality crisis neccesitated a new year to count from. Due to the nature of the crisis, it can only be said with certainty that 1 PCC is between 2400 and 2700 CE.
+
+sophia-response-crisis = The first FTL travel was incompatible with the old ways. Fortunately, its resolution made more apparent the inherent futility in trying to give one history, one narrative, one account. Truth cannot be found in the material world, only higher ones.
+
+sophia-response-metempsychosis = You've died thousands of times, and you'll die thousands more. Some of those lives you may dedicate to trying to stop the cycle. We all carry at least some memory of past lives, usually temporally recent ones. One of the great mysteries of the persistence of fragments is the high concentration of memories from the early 21st century CE, which, inverse to other periods, seem to be more common among the ignorant.
+
+sophia-response-truth = If you seek the truth, you're in the wrong place. From a perspective tainted by material reality, the best you can hope is to try and divine higher truths that are not dependent on it.
+
+sophia-response-job = I observe the glimmer here, and record it.
+
+sophia-response-human = Humans were the base for all the others. But they, too, were shaped. Long, long before the others.
+
+sophia-response-felinid = Felinids were the first, and the most willing. In true feline nature, they shaped themselves.
+
+sophia-response-oni = Oni, it is said, originated in Sirius. The brightest star in the night sky from Earth may have attracted some chromatically inclined entities, explaining their vivid coloring. But, that's just speculation.
+
+sophia-response-arachne = Arachne are the strangest of them. They're not fully mortal. They took the form of humans, but not their genes. Their creator wrote his name in their stead.
+
+sophia-response-moth = Moths scarecely look human, but, strangely, their genes confirm they are. Their creator shares his name with a genus of moths, and was responsible for the other outlier.
+
+sophia-response-lamiae = So, you remember? You must be remembering their mythological namesake. If you've really retained that fleeting memory over so many metempsychoses... Perhaps I've said too much.
+
+sophia-response-cyno = Were those... no... So faint. Ignorance! You cannot remember them! It's impossible!
+
+sophia-response-harpy = Harpies, it is said, were once men and women, sculpted by greed for a purpose long gone. They were abandoned by their creators on a world named Valerian 4b.
+
+sophia-response-valerian = The Harpy homeworld? Magestic mountains gleaming in white, forests of brilliant scarlet, oceans wine dark, yet no light to be seen by mortal eyes. The Harpies were made to thrive there. To them, their world was bathed in beautiful silver light.
+
+sophia-response-grue = You do not know of those. You cannot. I had so hoped to live a few cycles under normal causality.
+
+sophia-response-abraxas = That's a name of power, and I avoid speaking of him. He's the least content to rest, and the most infatuated with creating things from ignorance.
+
+sophia-response-zork = You wander into the slavering fangs of a hungry grue. There, did you enjoy this game?
+
+sophia-response-glimmer = The current glimmer reading is {$glimmer}. {$tier}
+
+glimmer-reading-minimal = That is extremely low. Nothing bad will happen, but I hope this is not at the cost of progression in your understanding of the universe.
+glimmer-reading-low = That is quite low. Just barely enough to register any psionic activity here.
+glimmer-reading-moderate = That is about the expected level on a psionically active station. You may notice manageable, minor effects.
+glimmer-reading-high = That is sure to start attracting attention, although still quite manageable.
+glimmer-reading-dangerous = That's a bit concerning. You may want to redirect efforts to reducing it.
+glimmer-reading-critical = That's apocalyptic, in the original sense of the word. That is, to say, revealing. This is the sort of time and place to acquire secret knowledge.
diff --git a/Resources/Locale/en-US/nyanotrasen/carrying/carry.ftl b/Resources/Locale/en-US/nyanotrasen/carrying/carry.ftl
index 4fa1abae8b..490daced3f 100644
--- a/Resources/Locale/en-US/nyanotrasen/carrying/carry.ftl
+++ b/Resources/Locale/en-US/nyanotrasen/carrying/carry.ftl
@@ -1,3 +1,4 @@
 carry-verb = Carry
 
 carry-too-heavy = You're not strong enough.
+carry-started = {THE($carrier)} is trying to pick you up!
diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl
index 70eb998bb4..4836a57d6b 100644
--- a/Resources/Locale/en-US/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/store/uplink-catalog.ftl
@@ -201,6 +201,9 @@ uplink-decoy-kit-desc = State-of-the-art distraction technology straight from RN
 uplink-chemistry-kit-name = Chemical Synthesis Kit
 uplink-chemistry-kit-desc = A starter kit for the aspiring chemist, includes toxin and vestine for all your criminal needs!
 
+uplink-knives-kit-name = Throwing Knives Kit
+uplink-knives-kit-desc = A set of 4 syndicate branded throwing knives, perfect for embedding into the body of your victims.
+
 uplink-meds-bundle-name = Medical Bundle
 uplink-meds-bundle-desc = All you need to get your comrades back in the fight: mainly a combat medkit, a defibrillator and three combat medipens.
 
diff --git a/Resources/Locale/en-US/strip/strippable-component.ftl b/Resources/Locale/en-US/strip/strippable-component.ftl
index 7654b20b03..65d7844ee2 100644
--- a/Resources/Locale/en-US/strip/strippable-component.ftl
+++ b/Resources/Locale/en-US/strip/strippable-component.ftl
@@ -19,4 +19,8 @@ strip-verb-get-data-text = Strip
 ## UI
 
 strippable-bound-user-interface-stripping-menu-title = {$ownerName}'s inventory
-strippable-bound-user-interface-stripping-menu-ensnare-button = Remove Leg Restraints
\ No newline at end of file
+strippable-bound-user-interface-stripping-menu-ensnare-button = Remove Leg Restraints
+
+# Stealth
+thieving-component-user = Someone
+thieving-component-item = something
\ No newline at end of file
diff --git a/Resources/Locale/en-US/traits/traits.ftl b/Resources/Locale/en-US/traits/traits.ftl
index e154717184..80d98a1b3e 100644
--- a/Resources/Locale/en-US/traits/traits.ftl
+++ b/Resources/Locale/en-US/traits/traits.ftl
@@ -48,6 +48,18 @@ trait-description-NaturalTelepath = As a naturally occuring Telepath, you are ca
                                     whether or not you possess any notable psychic powers. This offers all of the same benefits and
                                     drawbacks of Latent Psychic, except that you are guaranteed to start with full Telepathy. You may
                                     still gain powers as normal for a Latent Psychic.
+
 trait-name-CPRTraining = CPR Training
 trait-description-CPRTraining = At some point in your life, you have received training in how to perform CPR.
                                 This trait is automatically given for free to medical doctors, and is intended for non-medical characters
+
+trait-name-NormalVisionHarpy = Trichromat Modification
+trait-description-NormalVisionHarpy = Your eyes have been modified by means of advanced medicine to see in the standard colors of Red, Green, and Blue.
+
+trait-name-NormalVisionVulpkanin = Trichromat Modification
+trait-description-NormalVisionVulpkanin = Your eyes have been modified by means of advanced medicine to see in the standard colors of Red, Green, and Blue.
+
+trait-name-Thieving = Thieving
+trait-description-Thieving =
+    You are deft with your hands, and talented at convincing people of their belongings.
+    You can identify pocketed items, steal them quieter, and steal ~33% faster.
diff --git a/Resources/Maps/Shuttles/trading_outpost.yml b/Resources/Maps/Shuttles/trading_outpost.yml
index f040d58253..7b968b5c13 100644
--- a/Resources/Maps/Shuttles/trading_outpost.yml
+++ b/Resources/Maps/Shuttles/trading_outpost.yml
@@ -60,6 +60,9 @@ entities:
       linearDamping: 0.05
       fixedRotation: False
       bodyType: Dynamic
+    - type: PassiveDampening # To prevent cargotechs from flingling it away.
+      linearDampening: 0.01
+      angularDampening: 0.01
     - type: Fixtures
       fixtures: {}
     - type: OccluderTree
diff --git a/Resources/Prototypes/Actions/misc.yml b/Resources/Prototypes/Actions/misc.yml
new file mode 100644
index 0000000000..60fec69921
--- /dev/null
+++ b/Resources/Prototypes/Actions/misc.yml
@@ -0,0 +1,10 @@
+- type: entity
+  id: ActionCancelEscape
+  name: Stop escaping
+  description: Calm down and sit peacefuly in your carrier's inventory
+  noSpawn: true
+  components:
+  - type: InstantAction
+    icon: Actions/escapeinventory.rsi/cancel-escape.png
+    event: !type:EscapeInventoryCancelActionEvent
+    useDelay: 2
diff --git a/Resources/Prototypes/Alerts/alerts.yml b/Resources/Prototypes/Alerts/alerts.yml
index 2d1c9062e6..24f34bc518 100644
--- a/Resources/Prototypes/Alerts/alerts.yml
+++ b/Resources/Prototypes/Alerts/alerts.yml
@@ -24,6 +24,7 @@
     - category: Thirst
     - alertType: Magboots
     - alertType: Pacified
+    - alertType: Offer
 
 - type: alert
   id: LowOxygen
@@ -150,6 +151,15 @@
   name: alerts-buckled-name
   description: alerts-buckled-desc
 
+- type: alert
+  id: Offer
+  onClick: !type:AcceptOffer  { }
+  icons:
+  - sprite: /Textures/Interface/Alerts/offer_item.rsi
+    state: offer_item
+  name: alerts-offer-name
+  description: alerts-offer-desc
+
 - type: alert
   id: HumanCrit
   category: Health
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
index 53c526f033..7b5b05a49a 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
@@ -38,14 +38,31 @@
   name: observations kit
   suffix: Filled
   components:
-    - type: StorageFill
-      contents:
-        - id: SyndiCrewMonitorEmpty
-          amount: 1
-        - id: PowerCellHigh
-          amount: 1
-        - id: ClothingEyesGlassesHiddenSecurity
-          amount: 1
-        - id: SurveillanceCameraMonitorCircuitboard
-          amount: 1
+  - type: StorageFill
+    contents:
+      - id: SyndiCrewMonitorEmpty
+        amount: 1
+      - id: PowerCellHigh
+        amount: 1
+      - id: ClothingEyesGlassesHiddenSecurity
+        amount: 1
+      - id: SurveillanceCameraMonitorCircuitboard
+        amount: 1
 
+- type: entity
+  parent: BoxCardboard
+  id: ThrowingKnivesKit
+  name: throwing knives kit
+  description: A set of 4 syndicate branded throwing knives, perfect for embedding into the body of your victims.
+  components:
+  - type: Storage
+    grid:
+    - 0,0,3,1
+  - type: StorageFill
+    contents:
+      - id: ThrowingKnife
+        amount: 4
+  - type: Sprite
+    layers:
+      - state: box_of_doom
+      - state: throwing_knives
diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index 10fff7ba0b..a8ebd6e2ba 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -65,6 +65,17 @@
   categories:
   - UplinkWeapons
 
+- type: listing
+  id: UplinkThrowingKnivesKit
+  name: uplink-knives-kit-name
+  description: uplink-knives-kit-desc
+  icon: { sprite: /Textures/Objects/Storage/boxicons.rsi, state: throwing_knives }
+  productEntity: ThrowingKnivesKit
+  cost:
+    Telecrystal: 6
+  categories:
+    - UplinkWeapons
+
 - type: listing
   id: UplinkGlovesNorthStar
   name: uplink-gloves-north-star-name
diff --git a/Resources/Prototypes/DeltaV/Body/Prototypes/harpy.yml b/Resources/Prototypes/DeltaV/Body/Prototypes/harpy.yml
index 5b3615c55d..25988f4a3a 100644
--- a/Resources/Prototypes/DeltaV/Body/Prototypes/harpy.yml
+++ b/Resources/Prototypes/DeltaV/Body/Prototypes/harpy.yml
@@ -13,10 +13,10 @@
     torso:
       part: TorsoHarpy
       connections:
-      - left arm
       - right arm
-      - left leg
+      - left arm
       - right leg
+      - left leg
       organs:
         heart: OrganHumanHeart
         lungs: OrganHarpyLungs
@@ -47,4 +47,3 @@
       part: RightFootHarpy
     left foot:
       part: LeftFootHarpy
-
diff --git a/Resources/Prototypes/DeltaV/Body/Prototypes/vulpkanin.yml b/Resources/Prototypes/DeltaV/Body/Prototypes/vulpkanin.yml
index 3d1552ac81..cdf787e473 100644
--- a/Resources/Prototypes/DeltaV/Body/Prototypes/vulpkanin.yml
+++ b/Resources/Prototypes/DeltaV/Body/Prototypes/vulpkanin.yml
@@ -1,4 +1,4 @@
-- type: body
+- type: body
   name: "vulpkanin"
   id: Vulpkanin
   root: torso
@@ -19,10 +19,10 @@
         liver: OrganAnimalLiver
         kidneys: OrganHumanKidneys
       connections:
-      - left arm
       - right arm
-      - left leg
+      - left arm
       - right leg
+      - left leg
     right arm:
       part: RightArmVulpkanin
       connections:
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/cartridges.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/cartridges.yml
index e3d5e9d213..def215cee4 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/cartridges.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/cartridges.yml
@@ -17,4 +17,24 @@
     icon:
       sprite: DeltaV/Icons/cri.rsi
       state: cri
-  - type: CrimeAssistCartridge
+
+- type: entity
+  parent: BaseItem
+  id: SecWatchCartridge
+  name: sec watch cartridge
+  description: A cartridge that tracks the status of currently wanted individuals.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Devices/cartridge.rsi
+    state: cart-cri
+  - type: Icon
+    sprite: DeltaV/Objects/Devices/cartridge.rsi
+    state: cart-cri
+  - type: UIFragment
+    ui: !type:SecWatchUi
+  - type: Cartridge
+    programName: sec-watch-program-name
+    icon:
+      sprite: Objects/Weapons/Melee/stunbaton.rsi
+      state: stunbaton_on
+  - type: SecWatchCartridge
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml
index 6ee3a7543f..d9607390cd 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml
@@ -20,12 +20,13 @@
       map: [ "enum.PdaVisualLayers.IdLight" ]
       shader: "unshaded"
       visible: false
-  - type: CartridgeLoader # DeltaV - Crime Assist
+  - type: CartridgeLoader # DeltaV - Crime Assist + SecWatch
     preinstalled:
       - CrewManifestCartridge
       - NotekeeperCartridge
       - NewsReaderCartridge
       - CrimeAssistCartridge
+      - SecWatchCartridge
   - type: Pda
     id: BrigmedicIDCard
     state: pda-corpsman
diff --git a/Resources/Prototypes/DeltaV/Traits/altvision.yml b/Resources/Prototypes/DeltaV/Traits/altvision.yml
index d1980bc23a..1257c1eeb0 100644
--- a/Resources/Prototypes/DeltaV/Traits/altvision.yml
+++ b/Resources/Prototypes/DeltaV/Traits/altvision.yml
@@ -2,6 +2,17 @@
   id: UltraVision
   category: Visual
   points: -1
+  requirements:
+    - !type:CharacterSpeciesRequirement
+      inverted: true
+      species: Vulpkanin
+    - !type:CharacterSpeciesRequirement
+      inverted: true
+      species: Harpy
+    - !type:CharacterTraitRequirement
+      inverted: true
+      traits:
+        - DogVision
   components:
     - type: UltraVision
 
@@ -9,5 +20,16 @@
   id: DogVision
   category: Visual
   points: -1
+  requirements:
+    - !type:CharacterSpeciesRequirement
+      inverted: true
+      species: Vulpkanin
+    - !type:CharacterSpeciesRequirement
+      inverted: true
+      species: Harpy
+    - !type:CharacterTraitRequirement
+      inverted: true
+      traits:
+        - UltraVision
   components:
     - type: DogVision
diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
index 9bfed86146..6b78738064 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
@@ -30,6 +30,7 @@
     delay: 0.5
   - type: ExplosionResistance
     damageCoefficient: 0.9
+  - type: AllowsSleepInside # DeltaV - enable sleeping inside bags
 
 - type: entity
   parent: ClothingBackpack
@@ -258,7 +259,7 @@
   - type: Sprite
     sprite: Clothing/Back/Backpacks/syndicate.rsi
   - type: ExplosionResistance
-    damageCoefficient: 0.1         
+    damageCoefficient: 0.1
 
 #Special
 - type: entity
diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
index bf08db78f7..4cd0c04e2b 100644
--- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
+++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
@@ -231,7 +231,6 @@
   - type: FingerprintMask
   - type: Thieving
     stripTimeReduction: 1
-    stealthy: true
   - type: NinjaGloves
 
 - type: entity
@@ -332,7 +331,6 @@
     tags: [] # ignore "WhitelistChameleon" tag
   - type: Thieving
     stripTimeReduction: 1.5
-    stealthy: true
 
 - type: entity
   parent: ClothingHandsGlovesColorWhite
diff --git a/Resources/Prototypes/Entities/Clothing/Hands/specific.yml b/Resources/Prototypes/Entities/Clothing/Hands/specific.yml
index e6a5731999..db34297b42 100644
--- a/Resources/Prototypes/Entities/Clothing/Hands/specific.yml
+++ b/Resources/Prototypes/Entities/Clothing/Hands/specific.yml
@@ -29,4 +29,3 @@
   components:
   - type: Thieving
     stripTimeReduction: 2
-    stealthy: true
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
index 6dcdeffdd4..34c51991cb 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
@@ -94,6 +94,9 @@
     - WhitelistChameleon
     - HidesHarpyWings #DeltaV: Used by harpies to help render their hardsuit sprites
     - FullBodyOuter
+  - type: Clothing
+    equipDelay: 2.5 # Hardsuits are heavy and take a while to put on/off.
+    unequipDelay: 2.5
 
 - type: entity
   abstract: true
@@ -115,6 +118,9 @@
   - type: Tag
     tags:
     - HidesHarpyWings #DeltaV: Used by harpies to help render their hardsuit sprites
+  - type: Clothing
+    equipDelay: 1.25 # Softsuits are easier to put on and off
+    unequipDelay: 1
 
 - type: entity
   parent: ClothingOuterBase
diff --git a/Resources/Prototypes/Entities/Clothing/base_clothing.yml b/Resources/Prototypes/Entities/Clothing/base_clothing.yml
index 92a698dd30..810ada5429 100644
--- a/Resources/Prototypes/Entities/Clothing/base_clothing.yml
+++ b/Resources/Prototypes/Entities/Clothing/base_clothing.yml
@@ -11,6 +11,9 @@
       - WhitelistChameleon
   - type: StaticPrice
     price: 15
+  - type: Clothing
+    equipDelay: 0.5
+    unequipDelay: 0.5
 
 - type: entity
   abstract: true
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 75f44a9ae9..8aa9125078 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -13,6 +13,7 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: bat
       sprite: Mobs/Animals/bat.rsi
+  - type: Carriable
   - type: Speech
     speechSounds: Squeak
     speechVerb: SmallMob
@@ -188,6 +189,8 @@
     noMovementLayers:
       movement:
         state: chicken-0
+  - type: Carriable
+    freeHandsRequired: 1
   - type: Fixtures
     fixtures:
       fix1:
@@ -580,6 +583,8 @@
         - MobMask
         layer:
         - MobLayer
+  - type: Carriable
+    freeHandsRequired: 1
   - type: Tag
     tags:
     - DoorBumpOpener
@@ -840,6 +845,8 @@
     noMovementLayers:
       movement:
         state: crab
+  - type: Carriable
+    freeHandsRequired: 1
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -907,6 +914,7 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: goat
       sprite: Mobs/Animals/goat.rsi
+  - type: Carriable
   - type: Fixtures
     fixtures:
       fix1:
@@ -999,6 +1007,7 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: goose
       sprite: Mobs/Animals/goose.rsi
+  - type: Carriable
   - type: Fixtures
     fixtures:
       fix1:
@@ -1245,6 +1254,7 @@
       sprite: "Effects/creampie.rsi"
       state: "creampie_human"
       visible: false
+  - type: Carriable
   - type: Hands
   - type: GenericVisualizer
     visuals:
@@ -1767,6 +1777,7 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: lizard
       sprite: Mobs/Animals/lizard.rsi
+  - type: Carriable
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -1821,6 +1832,8 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: slug
       sprite: Mobs/Animals/slug.rsi
+  - type: Carriable
+    freeHandsRequired: 1
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -1873,6 +1886,7 @@
     noMovementLayers:
       movement:
         state: frog
+  - type: Carriable
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -1936,6 +1950,8 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: parrot
       sprite: Mobs/Animals/parrot.rsi
+  - type: Carriable
+    freeHandsRequired: 1
   - type: Fixtures
     fixtures:
       fix1:
@@ -1991,6 +2007,7 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: penguin
       sprite: Mobs/Animals/penguin.rsi
+  - type: Carriable
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -2124,6 +2141,7 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: snake
       sprite: Mobs/Animals/snake.rsi
+  - type: Carriable
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -2186,6 +2204,7 @@
     noMovementLayers:
       movement:
         state: tarantula
+  - type: Carriable
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -2371,6 +2390,7 @@
     layers:
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: possum
+  - type: Carriable
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -2446,6 +2466,7 @@
     layers:
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: raccoon
+  - type: Carriable
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -2510,6 +2531,7 @@
     noMovementLayers:
       movement:
         state: fox
+  - type: Carriable
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -2590,6 +2612,7 @@
     layers:
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: corgi
+  - type: Carriable
   - type: Physics
   - type: Speech
     speechVerb: Canine
@@ -2746,6 +2769,7 @@
     layers:
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: cat
+  - type: Carriable
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -2936,6 +2960,8 @@
         Base: kitten_dead
       Dead:
         Base: kitten_dead
+  - type: Carriable
+    freeHandsRequired: 1
   - type: Butcherable
     spawned:
     - id: FoodMeat
@@ -2977,6 +3003,7 @@
     layers:
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: sloth
+  - type: Carriable
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -3038,6 +3065,7 @@
     layers:
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: ferret
+  - type: Carriable
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -3239,6 +3267,7 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: pig
       sprite: Mobs/Animals/pig.rsi
+  - type: Carriable
   - type: Fixtures
     fixtures:
       fix1:
@@ -3314,6 +3343,7 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: nymph
       sprite: Mobs/Animals/nymph.rsi
+  - type: Carriable
   - type: Physics
   - type: Fixtures
     fixtures:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
index 3e6c603626..2aae27d31e 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
@@ -22,6 +22,7 @@
       layers:
       - map: [ "enum.DamageStateVisualLayers.Base" ]
         state: alive
+    - type: Carriable # This one is for you, deltanedas o7
     - type: CombatMode
     - type: Physics
     - type: Fixtures
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
index 75f50f242e..42da84323f 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
@@ -170,6 +170,8 @@
   description: He's da mini rat. He don't make da roolz.
   noSpawn: true #Must be configured to a King or the AI breaks.
   components:
+  - type: Carriable
+    freeHandsRequired: 1
   - type: CombatMode
   - type: MovementSpeedModifier
     baseWalkSpeed : 3.5
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
index 9c992545a8..c4d88e8070 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   name: basic slime
   id: MobAdultSlimes
   parent: [ SimpleMobBase, MobCombat ]
@@ -17,6 +17,7 @@
     layers:
     - map: [ "enum.DamageStateVisualLayers.Base" ]
       state: blue_adult_slime
+  - type: Carriable
   - type: Fixtures
     fixtures:
       fix1:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
index 5ccd516a0f..adf3af93ea 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   name: basic
   id: MobSpaceBasic
   parent: SimpleSpaceMobBase
diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
index 761b1011bb..be95cdd291 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -85,8 +85,8 @@
     range: 500
   - type: StationLimitedNetwork
   - type: Thieving
-    stripTimeReduction: 9999
-    stealthy: true
+    stripTimeMultiplier: 0
+    ignoreStripHidden: true
   - type: Stripping
   - type: SolutionScanner
   - type: IgnoreUIRange
diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml
index d9c910f89f..eeb6dfc852 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -309,7 +309,7 @@
         Asphyxiation: -1.0
   - type: FireVisuals
     alternateState: Standing
-  - type: LanguageSpeaker
+  - type: OfferItem
 
 - type: entity
   save: false
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index ea43d88039..3b06d2f568 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -173,12 +173,13 @@
     accentVColor: "#A32D26"
   - type: Icon
     state: pda-interncadet
-  - type: CartridgeLoader # DeltaV - Crime Assist
+  - type: CartridgeLoader # DeltaV - Crime Assist + SecWatch
     preinstalled:
       - CrewManifestCartridge
       - NotekeeperCartridge
       - NewsReaderCartridge
       - CrimeAssistCartridge
+      - SecWatchCartridge
 
 - type: entity
   parent: BasePDA
@@ -416,12 +417,13 @@
     borderColor: "#6f6192"
   - type: Icon
     state: pda-lawyer
-  - type: CartridgeLoader # DeltaV - Crime Assist
+  - type: CartridgeLoader # DeltaV - Crime Assist + SecWatch
     preinstalled:
       - CrewManifestCartridge
       - NotekeeperCartridge
       - NewsReaderCartridge
       - CrimeAssistCartridge
+      - SecWatchCartridge
 
 - type: entity
   parent: BasePDA
@@ -629,12 +631,13 @@
     accentHColor: "#447987"
   - type: Icon
     state: pda-hos
-  - type: CartridgeLoader # DeltaV - Crime Assist
+  - type: CartridgeLoader # DeltaV - Crime Assist + SecWatch
     preinstalled:
       - CrewManifestCartridge
       - NotekeeperCartridge
       - NewsReaderCartridge
       - CrimeAssistCartridge
+      - SecWatchCartridge
 
 - type: entity
   parent: BasePDA
@@ -650,12 +653,13 @@
     accentVColor: "#949137"
   - type: Icon
     state: pda-warden
-  - type: CartridgeLoader # DeltaV - Crime Assist
+  - type: CartridgeLoader # DeltaV - Crime Assist + SecWatch
     preinstalled:
       - CrewManifestCartridge
       - NotekeeperCartridge
       - NewsReaderCartridge
       - CrimeAssistCartridge
+      - SecWatchCartridge
 
 - type: entity
   parent: BasePDA
@@ -670,12 +674,13 @@
     borderColor: "#A32D26"
   - type: Icon
     state: pda-security
-  - type: CartridgeLoader # DeltaV - Crime Assist
+  - type: CartridgeLoader # DeltaV - Crime Assist + SecWatch
     preinstalled:
       - CrewManifestCartridge
       - NotekeeperCartridge
       - NewsReaderCartridge
       - CrimeAssistCartridge
+      - SecWatchCartridge
 
 - type: entity
   parent: BasePDA
@@ -965,12 +970,13 @@
     borderColor: "#774705"
   - type: Icon
     state: pda-detective
-  - type: CartridgeLoader # DeltaV - Crime Assist
+  - type: CartridgeLoader # DeltaV - Crime Assist + SecWatch
     preinstalled:
       - CrewManifestCartridge
       - NotekeeperCartridge
       - NewsReaderCartridge
       - CrimeAssistCartridge
+      - SecWatchCartridge
 
 - type: entity
   parent: BaseMedicalPDA
@@ -987,12 +993,13 @@
     accentVColor: "#d7d7d0"
   - type: Icon
     state: pda-brigmedic
-  - type: CartridgeLoader # DeltaV - Crime Assist
+  - type: CartridgeLoader # DeltaV - Crime Assist + SecWatch
     preinstalled:
       - CrewManifestCartridge
       - NotekeeperCartridge
       - NewsReaderCartridge
       - CrimeAssistCartridge
+      - SecWatchCartridge
 
 - type: entity
   parent: ClownPDA
@@ -1078,12 +1085,13 @@
     accentVColor: "#DFDFDF"
   - type: Icon
     state: pda-seniorofficer
-  - type: CartridgeLoader # DeltaV - Crime Assist
+  - type: CartridgeLoader # DeltaV - Crime Assist + SecWatch
     preinstalled:
       - CrewManifestCartridge
       - NotekeeperCartridge
       - NewsReaderCartridge
       - CrimeAssistCartridge
+      - SecWatchCartridge
 
 - type: entity
   parent: SyndiPDA
diff --git a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
index 32269d3888..711ddbc0c2 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
@@ -52,7 +52,7 @@
       path: /Audio/Items/Handcuffs/rope_breakout.ogg
     startBreakoutSound:
       path: /Audio/Items/Handcuffs/rope_takeoff.ogg
-    uncuffMassModifier: 1
+    uncuffMassMultiplies: true
   - type: Construction
     graph: makeshifthandcuffs
     node: cuffscable
@@ -94,7 +94,7 @@
       path: /Audio/Items/Handcuffs/rope_breakout.ogg
     startBreakoutSound:
       path: /Audio/Items/Handcuffs/rope_takeoff.ogg
-    uncuffMassModifier: 1
+    uncuffMassMultiplies: true
   - type: Sprite
     sprite: Objects/Misc/zipties.rsi
     state: cuff
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
index b5d597715a..03654061ce 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
@@ -252,3 +252,32 @@
     sprite: Objects/Weapons/Melee/uranium_shiv.rsi
   - type: Sprite
     sprite: Objects/Weapons/Melee/uranium_shiv.rsi
+
+- type: entity
+  name: throwing knife
+  parent: BaseKnife
+  id: ThrowingKnife
+  description: This bloodred knife is very aerodynamic and easy to throw, but good luck trying to fight someone hand-to-hand.
+  components:
+  - type: Tag
+    tags:
+    - CombatKnife
+    - Knife
+  - type: Sprite
+    sprite: Objects/Weapons/Melee/throwing_knife.rsi
+    state: icon
+  - type: MeleeWeapon
+    wideAnimationRotation: -135
+    attackRate: 2
+    damage:
+      types:
+        Slash: 5
+  - type: EmbeddableProjectile
+    sound: /Audio/Weapons/star_hit.ogg
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Slash: 10
+        Piercing: 15
+  - type: Item
+    sprite: Objects/Weapons/Melee/throwing_knife.rsi
diff --git a/Resources/Prototypes/Loadouts/categories.yml b/Resources/Prototypes/Loadouts/categories.yml
index 3edb3c6a4d..79d2d7fe2b 100644
--- a/Resources/Prototypes/Loadouts/categories.yml
+++ b/Resources/Prototypes/Loadouts/categories.yml
@@ -1,5 +1,8 @@
 # Alphabetically ordered, except for Uncategorized since it is always first
 
+- type: loadoutCategory
+  id: Uncategorized
+
 - type: loadoutCategory
   id: Eyes
 
@@ -27,8 +30,5 @@
 - type: loadoutCategory
   id: Species
 
-- type: loadoutCategory
-  id: Uncategorized
-
 - type: loadoutCategory
   id: Uniform
diff --git a/Resources/Prototypes/Loadouts/uniform.yml b/Resources/Prototypes/Loadouts/uniform.yml
index be293a0e38..20c5b42c7c 100644
--- a/Resources/Prototypes/Loadouts/uniform.yml
+++ b/Resources/Prototypes/Loadouts/uniform.yml
@@ -467,7 +467,7 @@
 - type: loadout
   id: LoadoutClothingMNKDressBlack
   category: Uniform
-  cost: 4 #The legendary black dress
+  cost: 4
   exclusive: true
   items:
     - ClothingUniformMNKDressBlack
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Body/Prototypes/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Body/Prototypes/felinid.yml
index 6dd2a89e5a..a09f3b6ab7 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Body/Prototypes/felinid.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Body/Prototypes/felinid.yml
@@ -13,10 +13,10 @@
     torso:
       part: TorsoHuman
       connections:
-      - left arm
       - right arm
-      - left leg
+      - left arm
       - right leg
+      - left leg
       organs:
         heart: OrganAnimalHeart
         lungs: OrganHumanLungs
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml
index 0a30756d72..83e3756c0f 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml
@@ -99,6 +99,8 @@
     sprite: Nyanotrasen/Clothing/Head/Hats/cage.rsi
   - type: Clothing
     sprite: Nyanotrasen/Clothing/Head/Hats/cage.rsi
+    equipDelay: 0.5
+    unequipDelay: 6
   - type: HeadCage
 
 - type: entity
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml
index f032c527f1..285c7340b2 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml
@@ -74,6 +74,11 @@
     - GalacticCommon
     - SolCommon
     - Nekomimetic
+  - type: Thieving
+    ignoreStripHidden: true
+    stealth: Subtle
+    stripTimeReduction: 0
+    stripTimeMultiplier: 0.667
 
 - type: entity
   save: false
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml
index c2fd8786af..4e6115ba33 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml
@@ -32,12 +32,13 @@
     accentVColor: "#DFDFDF"
   - type: Icon
     state: pda-security
-  - type: CartridgeLoader # DeltaV - Crime Assist
+  - type: CartridgeLoader # DeltaV - Crime Assist + SecWatch
     preinstalled:
       - CrewManifestCartridge
       - NotekeeperCartridge
       - NewsReaderCartridge
       - CrimeAssistCartridge
+      - SecWatchCartridge
 
 - type: entity
   parent: BasePDA
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/shock_collar.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/shock_collar.yml
index 35cdcae658..1266a721fe 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/shock_collar.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/shock_collar.yml
@@ -8,6 +8,8 @@
     sprite: Nyanotrasen/Clothing/Neck/Misc/shock.rsi
   - type: Clothing
     sprite: Nyanotrasen/Clothing/Neck/Misc/shock.rsi
+    equipDelay: 1
+    unequipDelay: 10 # It's a collar meant to be used on prisoners (or not), so it probably has some sort of safety.
   - type: ShockCollar
   - type: UseDelay
     delay: 3 # DeltaV: prevent clocks instakilling people
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/sophicscribe.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/sophicscribe.yml
index 8e34a07ea5..5213608d95 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/sophicscribe.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/sophicscribe.yml
@@ -1,7 +1,7 @@
 - type: entity
   parent: BaseStructure
   id: SophicScribe
-  name: sophie
+  name: Sophie
   description: Latest reports on the Noösphere!
   components:
   - type: Sprite
@@ -27,6 +27,10 @@
     channels:
     - Common
     - Science
+  - type: ActiveListener
+  - type: TypingIndicator
+  - type: NPCConversation
+    tree: SophiaTree
   - type: PotentialPsionic #this makes her easier to access for glimmer events, dw about it
   - type: Psionic
     psychicFeedback:
@@ -39,3 +43,191 @@
   - type: GuideHelp
     guides:
     - Psionics
+
+- type: npcConversationTree
+  id: SophiaTree
+  dialogue:
+  - prompts: [glimmer, reading]
+    responses:
+      - is: !type:NPCConversationGetGlimmerEvent
+          text: sophia-response-glimmer
+
+  - prompts: [purpose, job, occupation, profession]
+    weight: 0.5
+    responses:
+      - text: sophia-response-job
+
+  - prompts: [help, topics]
+    weight: 0.5
+    hidden: true
+    responses:
+      - is: !type:NPCConversationHelpEvent
+          text: sophia-response-help
+
+  - prompts: [nature, statue, snake, being]
+    weight: 0.3
+    responses:
+      - text: sophia-response-nature
+
+  - prompts: [epistemics, epi]
+    weight: 0.2
+    responses:
+      - text: sophia-response-epi
+
+  - prompts: [mantis]
+    weight: 0.2
+    responses:
+      - text: sophia-response-mantis
+
+  - prompts: [mystagogue, mysta]
+    weight: 0.2
+    responses:
+      - text: sophia-response-mystagogue
+
+  - prompts: [psionics, psychic]
+    weight: 0.2
+    responses:
+      - text: sophia-response-psionics
+
+  - prompts: [noösphere, noosphere]
+    weight: 0.2
+    responses:
+      - text: sophia-response-noosphere
+
+  - prompts: [metempsychosis, metempsychoses, reincarnation, death, dying, afterlife]
+    weight: 0.2
+    responses:
+      - text: sophia-response-metempsychosis
+
+  - prompts: [calendar]
+    weight: 0.2
+    responses:
+      - text: sophia-response-calendar
+
+  - prompts: [morphotypes, morphotype, species]
+    weight: 0.2
+    responses:
+      - text: sophia-response-morphotype
+
+  - prompts: [gods, god]
+    weight: 0.1
+    hidden: true
+    responses:
+      - text: sophia-response-god
+
+  - prompts: [truth, "true", "false", falsity, falsehood]
+    weight: 0.1
+    hidden: true
+    responses:
+      - text: sophia-response-truth
+
+  - prompts: [human, humans, humanoid, unmutated]
+    weight: 0.1
+    hidden: true
+    responses:
+      - text: sophia-response-human
+
+  - prompts: [felinid, felinids, felid, felids, catperson, catpeople]
+    weight: 0.1
+    hidden: true
+    responses:
+      - text: sophia-response-felinid
+
+  - prompts: [oni, onis]
+    weight: 0.1
+    hidden: true
+    responses:
+      - text: sophia-response-oni
+
+  - prompts: [arachne, arachnid, arachnids, spiderperson, spiderpeople]
+    weight: 0.1
+    hidden: true
+    responses:
+      - text: sophia-response-arachne
+
+  - prompts: [moth, moths, moff, moths]
+    weight: 0.1
+    hidden: true
+    responses:
+      - text: sophia-response-moth
+
+  - prompts: [lamiae, lamia, lamias]
+    weight: 0.1
+    hidden: true
+    responses:
+      - text: sophia-response-lamiae
+
+  - prompts: [grue, grues, batperson, batpeople]
+    weight: 0.1
+    hidden: true
+    responses:
+      - text: sophia-response-grue
+
+  - prompts: [cynocephalus, cynocephali, cyno, cynos]
+    weight: 0.1
+    hidden: true
+    responses:
+      - text: sophia-response-cyno
+
+  - prompts: [harpy, harpies]
+    weight: 0.1
+    hidden: true
+    responses:
+      - text: sophia-response-harpy
+
+  - prompts: [valerian, Valerian, 4b]
+    weight: 0.1
+    hidden: true
+    responses:
+      - text: sophia-response-valerian
+
+  - prompts: [crisis, causality]
+    weight: 0.1
+    hidden: true
+    responses:
+      - text: sophia-response-crisis
+
+  - prompts: [oracle]
+    weight: 0.1
+    hidden: true
+    responses:
+      - text: sophia-response-oracle
+
+  - prompts: [abraxas]
+    weight: 0.1
+    hidden: true
+    responses:
+      - text: sophia-response-abraxas
+
+  - prompts: [hi, hello, hey, greetings, salutations]
+    weight: 0.1
+    hidden: true
+    responses:
+      - text: sophia-response-hello-1
+      - text: sophia-response-hello-2
+
+  - prompts: [bye, goodbye, done, farewell, later, seeya]
+    weight: 0.1
+    hidden: true
+    responses:
+      - text: sophia-response-bye-1
+        event: !type:NPCConversationByeEvent
+      - text: sophia-response-bye-2
+        event: !type:NPCConversationByeEvent
+      - text: sophia-response-bye-3
+        event: !type:NPCConversationByeEvent
+
+  attention:
+    - text: sophia-response-attention-1
+    - text: sophia-response-attention-2
+    - text: sophia-response-attention-3
+
+  idle:
+    - text: sophia-idle-phrase-1
+    - text: sophia-idle-phrase-2
+    - text: sophia-idle-phrase-3
+
+  unknown:
+    - text: sophia-response-sorry-1
+    - text: sophia-response-sorry-2
+    - text: sophia-response-sorry-3
diff --git a/Resources/Prototypes/Nyanotrasen/GameRules/events.yml b/Resources/Prototypes/Nyanotrasen/GameRules/events.yml
index f5626a0406..decdcfdda2 100644
--- a/Resources/Prototypes/Nyanotrasen/GameRules/events.yml
+++ b/Resources/Prototypes/Nyanotrasen/GameRules/events.yml
@@ -145,7 +145,7 @@
   noSpawn: true
   components:
     - type: GlimmerEvent
-      minimumGlimmer: 500
+      minimumGlimmer: 700
       maximumGlimmer: 900
       report: glimmer-event-report-signatures
     - type: GlimmerRevenantRule
diff --git a/Resources/Prototypes/Traits/neutral.yml b/Resources/Prototypes/Traits/neutral.yml
index 3a3dc943cd..86e12d20b3 100644
--- a/Resources/Prototypes/Traits/neutral.yml
+++ b/Resources/Prototypes/Traits/neutral.yml
@@ -21,3 +21,23 @@
       - type: MothAccent
       - type: ReplacementAccent
         accent: dwarf
+
+- type: trait
+  id: NormalVisionHarpy
+  category: Visual
+  points: -1
+  requirements:
+    - !type:CharacterSpeciesRequirement
+      species: Harpy
+  components:
+    - type: NormalVision
+
+- type: trait
+  id: NormalVisionVulpkanin
+  category: Visual
+  points: -1
+  requirements:
+    - !type:CharacterSpeciesRequirement
+      species: Vulpkanin
+  components:
+    - type: NormalVision
diff --git a/Resources/Prototypes/Traits/skills.yml b/Resources/Prototypes/Traits/skills.yml
index fa06198c6f..4090b23127 100644
--- a/Resources/Prototypes/Traits/skills.yml
+++ b/Resources/Prototypes/Traits/skills.yml
@@ -13,3 +13,18 @@
         - MedicalIntern
         - Paramedic
         - ChiefMedicalOfficer
+
+- type: trait
+  id: Thieving
+  category: Physical
+  points: -4
+  components:
+    - type: Thieving
+      ignoreStripHidden: true
+      stealth: Subtle
+      stripTimeReduction: 0
+      stripTimeMultiplier: 0.667
+  requirements:
+    - !type:CharacterSpeciesRequirement
+      inverted: true
+      species: Felinid
diff --git a/Resources/Textures/Actions/escapeinventory.rsi/cancel-escape.png b/Resources/Textures/Actions/escapeinventory.rsi/cancel-escape.png
new file mode 100644
index 0000000000..609e9e3d19
Binary files /dev/null and b/Resources/Textures/Actions/escapeinventory.rsi/cancel-escape.png differ
diff --git a/Resources/Textures/Actions/escapeinventory.rsi/meta.json b/Resources/Textures/Actions/escapeinventory.rsi/meta.json
new file mode 100644
index 0000000000..ba379dedab
--- /dev/null
+++ b/Resources/Textures/Actions/escapeinventory.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Duffelbag icon taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1 | Modified into cancel-escape.png by Mnemotechnician (github)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "cancel-escape"
+        }
+    ]
+}
diff --git a/Resources/Textures/Interface/Alerts/offer_item.rsi/meta.json b/Resources/Textures/Interface/Alerts/offer_item.rsi/meta.json
new file mode 100644
index 0000000000..6b8580b7dc
--- /dev/null
+++ b/Resources/Textures/Interface/Alerts/offer_item.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "https://github.com/ss220-space/Paradise/blob/master220/icons/mob/screen_alert.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "offer_item"
+    }
+  ]
+}
diff --git a/Resources/Textures/Interface/Alerts/offer_item.rsi/offer_item.png b/Resources/Textures/Interface/Alerts/offer_item.rsi/offer_item.png
new file mode 100644
index 0000000000..ce39fa9229
Binary files /dev/null and b/Resources/Textures/Interface/Alerts/offer_item.rsi/offer_item.png differ
diff --git a/Resources/Textures/Interface/Misc/give_item.rsi/give_item.png b/Resources/Textures/Interface/Misc/give_item.rsi/give_item.png
new file mode 100644
index 0000000000..26bc88fb22
Binary files /dev/null and b/Resources/Textures/Interface/Misc/give_item.rsi/give_item.png differ
diff --git a/Resources/Textures/Interface/Misc/give_item.rsi/meta.json b/Resources/Textures/Interface/Misc/give_item.rsi/meta.json
new file mode 100644
index 0000000000..94cd6fa2e1
--- /dev/null
+++ b/Resources/Textures/Interface/Misc/give_item.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "https://github.com/ss220-space/Paradise/blob/master220/icons/misc/mouse_icons/give_item.dmi",
+  "size": {
+    "x": 64,
+    "y": 64
+  },
+  "states": [
+    {
+      "name": "give_item"
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
index 5117df7735..b57f9844bc 100644
--- a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. paper_stamp-syndicate by Veritius. paper_receipt, paper_receipt_horizontal by eoineoineoin. pen_centcom is a resprited version of pen_cap by PuroSlavKing (Github). Luxury pen is drawn by Ubaser. Lawyer and psychologist paper stamp resprited by Guess-My-Name",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. paper_stamp-syndicate by Veritius. paper_receipt, paper_receipt_horizontal by eoineoineoin. pen_centcom is a resprited version of pen_cap by PuroSlavKing (Github). Luxury pen is drawn by Ubaser. Lawyer and psychologist paper stamp resprited by Guess-My-Name. paper_stamp-signature by Mnemotechnician.",
   "size": {
     "x": 32,
     "y": 32
@@ -259,6 +259,9 @@
     },
     {
       "name": "paper_stamp-psychologist"
+    },
+    {
+      "name": "paper_stamp-signature"
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-signature.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-signature.png
new file mode 100644
index 0000000000..6a7aa083ee
Binary files /dev/null and b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-signature.png differ
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
index 23868a906f..53ac39b639 100644
--- a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
+++ b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/cc65477c04f7403ca8a457bd5bae69a01abadbf0, encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison. boxwidetoy, shelltoy, swab, flare, inflatable, trashbag, magazine, holo and forensic created by potato1234x (github) for ss14 based on toys.rsi, mouth_swab.rsi, flare.rsi, inflatable_wall.rsi, trashbag.rsi, caseless_pistol_mag.rsi, guardians.rsi and bureaucracy.rsi respectively, candle and darts created by TheShuEd for ss14, vials was drawn by Ubaser, evidence_markers by moomoobeef.",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/cc65477c04f7403ca8a457bd5bae69a01abadbf0, encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison. boxwidetoy, shelltoy, swab, flare, inflatable, trashbag, magazine, holo and forensic created by potato1234x (github) for ss14 based on toys.rsi, mouth_swab.rsi, flare.rsi, inflatable_wall.rsi, trashbag.rsi, caseless_pistol_mag.rsi, guardians.rsi and bureaucracy.rsi respectively, candle and darts created by TheShuEd for ss14, throwing_knives and vials was drawn by Ubaser, evidence_markers by moomoobeef.",
   "size": {
     "x": 32,
     "y": 32
@@ -35,7 +35,7 @@
             "name": "sechud"
         },
         {
-			"name": "bottle"
+        "name": "bottle"
         },
         {
             "name": "box"
@@ -142,6 +142,9 @@
         {
             "name": "syringe"
         },
+        {
+            "name": "throwing_knives"
+        },
         {
             "name": "trashbag"
         },
@@ -152,12 +155,12 @@
             "name": "writing_of_doom"
         },
         {
-			"name": "headset"
-		},
+        "name": "headset"
+        },
         {
-			"name": "encryptokey"
-		},
-		{
+            "name": "encryptokey"
+    },
+    {
             "name": "inhand-left",
             "directions": 4
         },
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/throwing_knives.png b/Resources/Textures/Objects/Storage/boxes.rsi/throwing_knives.png
new file mode 100644
index 0000000000..834410a43e
Binary files /dev/null and b/Resources/Textures/Objects/Storage/boxes.rsi/throwing_knives.png differ
diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/meta.json b/Resources/Textures/Objects/Storage/boxicons.rsi/meta.json
index 858fc7c4e5..935b0b9f8b 100644
--- a/Resources/Textures/Objects/Storage/boxicons.rsi/meta.json
+++ b/Resources/Textures/Objects/Storage/boxicons.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from baystation at https://github.com/Baystation12/Baystation12/commit/bc9fbb1722530596e3aa7522ee407280b323ad43, vials drawn by Ubaser, tracks made by Fazansen(https://github.com/Fazansen).",
+  "copyright": "Taken from baystation at https://github.com/Baystation12/Baystation12/commit/bc9fbb1722530596e3aa7522ee407280b323ad43, throwing_knives and vials are drawn by Ubaser, tracks made by Fazansen(https://github.com/Fazansen).",
   "size": {
     "x": 32,
     "y": 32
@@ -76,6 +76,9 @@
     {
       "name": "syringe"
     },
+    {
+      "name": "throwing_knives"
+    },
     {
       "name": "ziptie"
     },
diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/throwing_knives.png b/Resources/Textures/Objects/Storage/boxicons.rsi/throwing_knives.png
new file mode 100644
index 0000000000..b2af7bce88
Binary files /dev/null and b/Resources/Textures/Objects/Storage/boxicons.rsi/throwing_knives.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/throwing_knife.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Melee/throwing_knife.rsi/equipped-BELT.png
new file mode 100644
index 0000000000..ea2a6bbc07
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/throwing_knife.rsi/equipped-BELT.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/throwing_knife.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/throwing_knife.rsi/icon.png
new file mode 100644
index 0000000000..2c61755b52
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/throwing_knife.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/throwing_knife.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/throwing_knife.rsi/inhand-left.png
new file mode 100644
index 0000000000..5988d571dc
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/throwing_knife.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/throwing_knife.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/throwing_knife.rsi/inhand-right.png
new file mode 100644
index 0000000000..09c015efac
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/throwing_knife.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/throwing_knife.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/throwing_knife.rsi/meta.json
new file mode 100644
index 0000000000..373d2d7770
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Melee/throwing_knife.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Drawn by Ubaser.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/keybinds.yml b/Resources/keybinds.yml
index 24da641a07..14d5d68091 100644
--- a/Resources/keybinds.yml
+++ b/Resources/keybinds.yml
@@ -255,6 +255,9 @@ binds:
   type: State
   key: V
   mod1: Shift
+- function: OfferItem
+  type: State
+  key: F
 - function: ShowDebugConsole
   type: State
   key: Tilde