diff --git a/Content.Client/Chat/Managers/ChatManager.cs b/Content.Client/Chat/Managers/ChatManager.cs
index 18f03cd7db0..27b126a5c04 100644
--- a/Content.Client/Chat/Managers/ChatManager.cs
+++ b/Content.Client/Chat/Managers/ChatManager.cs
@@ -47,6 +47,10 @@ public void SendMessage(string text, ChatSelectChannel channel)
                     _consoleHost.ExecuteCommand($"me \"{CommandParsing.Escape(str)}\"");
                     break;
 
+                case ChatSelectChannel.Subtle: // Floofstation
+                    _consoleHost.ExecuteCommand($"subtle \"{CommandParsing.Escape(str)}\"");
+                    break;
+
                 case ChatSelectChannel.Dead:
                     if (_systems.GetEntitySystemOrNull<GhostSystem>() is {IsGhost: true})
                         goto case ChatSelectChannel.Local;
@@ -76,7 +80,7 @@ public void SendMessage(string text, ChatSelectChannel channel)
                     throw new ArgumentOutOfRangeException(nameof(channel), channel, null);
             }
         }
-        //Nyano - Summary: fires off the update permissions script. 
+        //Nyano - Summary: fires off the update permissions script.
         public void UpdatePermissions()
         {
             PermissionsUpdated?.Invoke();
diff --git a/Content.Client/FurryServers/FurryServersWindow.xaml b/Content.Client/FurryServers/FurryServersWindow.xaml
new file mode 100644
index 00000000000..1fb63a9281d
--- /dev/null
+++ b/Content.Client/FurryServers/FurryServersWindow.xaml
@@ -0,0 +1,16 @@
+<ui:FurryServersWindow xmlns="https://spacestation14.io"
+                    xmlns:ui="clr-namespace:Content.Client.FurryServers"
+                    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+                    Title="Other Furry Servers..."
+                    MinSize="500 300"
+                    SetSize="500 450">
+    <ScrollContainer HScrollEnabled="False" Margin="4" VerticalExpand="True" ReturnMeasure="True">
+        <BoxContainer Orientation="Vertical">
+            <Label Margin="8 0 0 0" StyleClasses="FurryServersSectionHeader" Align="Center"
+                                Text="BlepStation (LRP)" Name="BlepstationHeader" />
+            <RichTextLabel Margin="8 8 8 8" Name="BlepstationDescription" />
+
+            <Button Name="BlepstationWebsite" Text="Launch Website:  BlepStation.com" />
+        </BoxContainer>
+    </ScrollContainer>
+</ui:FurryServersWindow>
diff --git a/Content.Client/FurryServers/FurryServersWindow.xaml.cs b/Content.Client/FurryServers/FurryServersWindow.xaml.cs
new file mode 100644
index 00000000000..29db69f967f
--- /dev/null
+++ b/Content.Client/FurryServers/FurryServersWindow.xaml.cs
@@ -0,0 +1,59 @@
+using System.Linq;
+using Content.Client.Administration.Managers;
+using Content.Client.Stylesheets;
+using Content.Client.UserInterface.Controls;
+using Content.Client.UserInterface.Systems.EscapeMenu;
+using Content.Shared.Administration;
+using JetBrains.Annotations;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Console;
+using Robust.Client.ResourceManagement;
+using Robust.Shared.Utility;
+
+namespace Content.Client.FurryServers
+{
+    [GenerateTypedNameReferences]
+    public sealed partial class FurryServersWindow : FancyWindow
+    {
+        [Dependency] private readonly IResourceCache _resourceManager = default!;
+        [Dependency] private readonly IUriOpener _uri = default!;
+
+        public FurryServersWindow()
+        {
+            RobustXamlLoader.Load(this);
+            IoCManager.InjectDependencies(this);
+            Stylesheet = IoCManager.Resolve<IStylesheetManager>().SheetSpace;
+
+            BlepstationHeader.AddStyleClass(StyleBase.StyleClassLabelHeading);
+            BlepstationHeader.FontColorOverride = Color.FromHex("#7687f2");
+
+            var description = FormattedMessage.FromMarkup(_resourceManager.ContentFileReadAllText($"/FurryServers/Blepstation.txt"));
+            BlepstationDescription.SetMessage(description);
+
+            BlepstationWebsite.OnPressed += _ =>
+            {
+                _uri.OpenUri("https://blepstation.com");
+            };
+        }
+
+        protected override void Opened()
+        {
+            base.Opened();
+        }
+    }
+
+    [UsedImplicitly, AnyCommand]
+    public sealed class FurryServersCommand : IConsoleCommand
+    {
+        public string Command => "furry";
+        public string Description => "Shows list of furry space station 14 servers";
+        public string Help => "Usage: furry";
+
+        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        {
+            IoCManager.Resolve<IUserInterfaceManager>().GetUIController<FurryServersUIController>().OpenWindow();
+        }
+    }
+}
diff --git a/Content.Client/Info/LinkBanner.cs b/Content.Client/Info/LinkBanner.cs
index a30aa413761..6f83fe9b5f9 100644
--- a/Content.Client/Info/LinkBanner.cs
+++ b/Content.Client/Info/LinkBanner.cs
@@ -43,6 +43,10 @@ public LinkBanner()
             };
             buttons.AddChild(guidebookButton);
 
+            var furryServersButton = new Button() { Text = "More Furry Servers" };
+            furryServersButton.OnPressed += args => UserInterfaceManager.GetUIController<FurryServersUIController>().ToggleWindow();
+            buttons.AddChild(furryServersButton);
+
             var changelogButton = new ChangelogButton();
             changelogButton.OnPressed += args => UserInterfaceManager.GetUIController<ChangelogUIController>().ToggleWindow();
             buttons.AddChild(changelogButton);
diff --git a/Content.Client/Input/ContentContexts.cs b/Content.Client/Input/ContentContexts.cs
index 3ba6ad0fffb..6033a95f17d 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 f8eb12df914..4bb49fecc14 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/Language/LanguageMenuWindow.xaml.cs b/Content.Client/Language/LanguageMenuWindow.xaml.cs
index 312814aca35..11d1c290d16 100644
--- a/Content.Client/Language/LanguageMenuWindow.xaml.cs
+++ b/Content.Client/Language/LanguageMenuWindow.xaml.cs
@@ -1,14 +1,8 @@
 using Content.Client.Language.Systems;
-using Content.Shared.Language;
-using Content.Shared.Language.Systems;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Console;
-using Robust.Shared.Utility;
-using Serilog;
-using static Content.Shared.Language.Systems.SharedLanguageSystem;
 
 namespace Content.Client.Language;
 
@@ -121,8 +115,11 @@ private void AddLanguageEntry(string language)
     private void OnLanguageChosen(string id)
     {
         var proto = _clientLanguageSystem.GetLanguagePrototype(id);
-        if (proto != null)
-            _clientLanguageSystem.RequestSetLanguage(proto);
+        if (proto == null)
+            return;
+
+        _clientLanguageSystem.RequestSetLanguage(proto);
+        UpdateState(id, _clientLanguageSystem.SpokenLanguages);
     }
 
 
diff --git a/Content.Client/Language/Systems/LanguageSystem.cs b/Content.Client/Language/Systems/LanguageSystem.cs
index 9714078b2c5..5dc2fc1f4e7 100644
--- a/Content.Client/Language/Systems/LanguageSystem.cs
+++ b/Content.Client/Language/Systems/LanguageSystem.cs
@@ -2,7 +2,6 @@
 using Content.Shared.Language.Events;
 using Content.Shared.Language.Systems;
 using Robust.Client;
-using Robust.Shared.Console;
 
 namespace Content.Client.Language.Systems;
 
diff --git a/Content.Client/Language/Systems/TranslatorImplanterSystem.cs b/Content.Client/Language/Systems/TranslatorImplanterSystem.cs
deleted file mode 100644
index da19b3decf9..00000000000
--- a/Content.Client/Language/Systems/TranslatorImplanterSystem.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Content.Shared.Language.Systems;
-
-namespace Content.Client.Language.Systems;
-
-public sealed class TranslatorImplanterSystem : SharedTranslatorImplanterSystem
-{
-
-}
diff --git a/Content.Client/MainMenu/MainMenu.cs b/Content.Client/MainMenu/MainMenu.cs
index 43c5bfe5674..9c73af11583 100644
--- a/Content.Client/MainMenu/MainMenu.cs
+++ b/Content.Client/MainMenu/MainMenu.cs
@@ -10,6 +10,7 @@
 using Robust.Shared.Network;
 using Robust.Shared.Utility;
 using UsernameHelpers = Robust.Shared.AuthLib.UsernameHelpers;
+using Content.Client.UserInterface.Systems.WhitelistWindow;
 
 namespace Content.Client.MainMenu
 {
@@ -176,7 +177,18 @@ private void ParseAddress(string address, out string ip, out ushort port)
 
         private void _onConnectFailed(object? _, NetConnectFailArgs args)
         {
-            _userInterfaceManager.Popup(Loc.GetString("main-menu-failed-to-connect",("reason", args.Reason)));
+            // This assumes whitelist related disconnect will contain the text 'whitelist' which is probably a fair
+            // assumption.  More ideally, disconnect reasons would send across an enum or something, but that looks to
+            // be in engine code, perhaps.
+            if (args.Reason.ToUpper().Contains("WHITELIST"))
+            {
+                // Whitelist specialized popup that shows application link for the whitelist
+                _userInterfaceManager.GetUIController<WhitelistDenialUIController>().OpenWindow(args.Reason);
+            } else {
+                // Generic popup
+                _userInterfaceManager.Popup(Loc.GetString("main-menu-failed-to-connect",("reason", args.Reason)));
+            }
+
             _netManager.ConnectFailed -= _onConnectFailed;
             _setConnectingState(false);
         }
diff --git a/Content.Client/OfferItem/OfferItemIndicatorsOverlay.cs b/Content.Client/OfferItem/OfferItemIndicatorsOverlay.cs
new file mode 100644
index 00000000000..16a314a2cf4
--- /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 00000000000..51b8dcbc0bc
--- /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/EscapeMenu.xaml b/Content.Client/Options/UI/EscapeMenu.xaml
index 71da231f29b..f93b1a2ecd6 100644
--- a/Content.Client/Options/UI/EscapeMenu.xaml
+++ b/Content.Client/Options/UI/EscapeMenu.xaml
@@ -12,6 +12,7 @@
         <Button Access="Public" Name="RulesButton" Text="{Loc 'ui-escape-rules'}" />
         <Button Access="Public" Name="GuidebookButton" Text="{Loc 'ui-escape-guidebook'}" />
         <Button Access="Public" Name="WikiButton" Text="{Loc 'ui-escape-wiki'}" />
+        <Button Access="Public" Name="FurryServersButton" Text="More Furry Servers" />
         <Button Access="Public" Name="DisconnectButton" Text="{Loc 'ui-escape-disconnect'}" />
         <Button Access="Public" Name="QuitButton" Text="{Loc 'ui-escape-quit'}" />
     </BoxContainer>
diff --git a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
index ba1037c635a..bcb186d107f 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 2ee59910f70..e12aa964b06 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 3b9c41efdfb..95b77e71bb6 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 7688a3b3aaa..ee581186f35 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/Stylesheets/StyleNano.cs b/Content.Client/Stylesheets/StyleNano.cs
index 13ba259dbcd..ab5ff4b2896 100644
--- a/Content.Client/Stylesheets/StyleNano.cs
+++ b/Content.Client/Stylesheets/StyleNano.cs
@@ -1335,6 +1335,11 @@ public StyleNano(IResourceCache resCache) : base(resCache)
                  .Prop(Label.StylePropertyFont, notoSans10),
                 // ---
 
+                // Furry Servers - Very Large Label for section headers
+                 Element<Label>().Class("FurryServersSectionHeader")
+                     .Prop(Label.StylePropertyFont, notoSansBold20),
+                // ---
+
                 // Different Background shapes ---
                 Element<PanelContainer>().Class(ClassAngleRect)
                     .Prop(PanelContainer.StylePropertyPanel, BaseAngleRect)
diff --git a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
index f989fa0ee75..77e62ee5411 100644
--- a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
+++ b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
@@ -78,6 +78,7 @@ public sealed class ChatUIController : UIController
         {SharedChatSystem.OOCPrefix, ChatSelectChannel.OOC},
         {SharedChatSystem.EmotesPrefix, ChatSelectChannel.Emotes},
         {SharedChatSystem.EmotesAltPrefix, ChatSelectChannel.Emotes},
+        {SharedChatSystem.SubtlePrefix, ChatSelectChannel.Subtle}, // Floofstation
         {SharedChatSystem.AdminPrefix, ChatSelectChannel.Admin},
         {SharedChatSystem.RadioCommonPrefix, ChatSelectChannel.Radio},
         {SharedChatSystem.DeadPrefix, ChatSelectChannel.Dead},
@@ -92,6 +93,7 @@ public sealed class ChatUIController : UIController
         {ChatSelectChannel.LOOC, SharedChatSystem.LOOCPrefix},
         {ChatSelectChannel.OOC, SharedChatSystem.OOCPrefix},
         {ChatSelectChannel.Emotes, SharedChatSystem.EmotesPrefix},
+        {ChatSelectChannel.Subtle, SharedChatSystem.SubtlePrefix}, // Floofstation
         {ChatSelectChannel.Admin, SharedChatSystem.AdminPrefix},
         {ChatSelectChannel.Radio, SharedChatSystem.RadioCommonPrefix},
         {ChatSelectChannel.Dead, SharedChatSystem.DeadPrefix},
@@ -496,6 +498,7 @@ private void UpdateChannelPermissions()
             FilterableChannels |= ChatChannel.Whisper;
             FilterableChannels |= ChatChannel.Radio;
             FilterableChannels |= ChatChannel.Emotes;
+            FilterableChannels |= ChatChannel.Subtle; // Floofstation
             FilterableChannels |= ChatChannel.Notifications;
 
             // Can only send local / radio / emote when attached to a non-ghost entity.
@@ -506,6 +509,7 @@ private void UpdateChannelPermissions()
                 CanSendChannels |= ChatSelectChannel.Whisper;
                 CanSendChannels |= ChatSelectChannel.Radio;
                 CanSendChannels |= ChatSelectChannel.Emotes;
+                CanSendChannels |= ChatSelectChannel.Subtle; // Floofstation
             }
         }
 
diff --git a/Content.Client/UserInterface/Systems/Chat/Controls/ChannelSelectorPopup.cs b/Content.Client/UserInterface/Systems/Chat/Controls/ChannelSelectorPopup.cs
index c1f3559d793..2137b173436 100644
--- a/Content.Client/UserInterface/Systems/Chat/Controls/ChannelSelectorPopup.cs
+++ b/Content.Client/UserInterface/Systems/Chat/Controls/ChannelSelectorPopup.cs
@@ -12,8 +12,9 @@ public sealed class ChannelSelectorPopup : Popup
         ChatSelectChannel.Local,
         ChatSelectChannel.Whisper,
         ChatSelectChannel.Emotes,
+        ChatSelectChannel.Subtle, // Floofstation
         ChatSelectChannel.Radio,
-        ChatSelectChannel.Telepathic, //Nyano - Summary: determines the order in which telepathic shows. 
+        ChatSelectChannel.Telepathic, //Nyano - Summary: determines the order in which telepathic shows.
         ChatSelectChannel.LOOC,
         ChatSelectChannel.OOC,
         ChatSelectChannel.Dead,
diff --git a/Content.Client/UserInterface/Systems/EscapeMenu/EscapeUIController.cs b/Content.Client/UserInterface/Systems/EscapeMenu/EscapeUIController.cs
index 85c4af76723..ad9df82c631 100644
--- a/Content.Client/UserInterface/Systems/EscapeMenu/EscapeUIController.cs
+++ b/Content.Client/UserInterface/Systems/EscapeMenu/EscapeUIController.cs
@@ -25,6 +25,7 @@ public sealed class EscapeUIController : UIController, IOnStateEntered<GameplayS
     [Dependency] private readonly InfoUIController _info = default!;
     [Dependency] private readonly OptionsUIController _options = default!;
     [Dependency] private readonly GuidebookUIController _guidebook = default!;
+    [Dependency] private readonly FurryServersUIController _furryServers = default!;
 
     private Options.UI.EscapeMenu? _escapeWindow;
 
@@ -98,6 +99,12 @@ public void OnStateEntered(GameplayState state)
             _uri.OpenUri(_cfg.GetCVar(CCVars.InfoLinksWiki));
         };
 
+        _escapeWindow.FurryServersButton.OnPressed += _ =>
+        {
+            CloseEscapeWindow();
+            _furryServers.ToggleWindow();
+        };
+
         _escapeWindow.GuidebookButton.OnPressed += _ =>
         {
             _guidebook.ToggleGuidebook();
diff --git a/Content.Client/UserInterface/Systems/EscapeMenu/FurryServersUIController.cs b/Content.Client/UserInterface/Systems/EscapeMenu/FurryServersUIController.cs
new file mode 100644
index 00000000000..36bd008da2d
--- /dev/null
+++ b/Content.Client/UserInterface/Systems/EscapeMenu/FurryServersUIController.cs
@@ -0,0 +1,43 @@
+using Content.Client.FurryServers;
+using JetBrains.Annotations;
+using Robust.Client.State;
+using Robust.Client.UserInterface.Controllers;
+using Robust.Client.ResourceManagement;
+
+namespace Content.Client.UserInterface.Systems.EscapeMenu;
+
+[UsedImplicitly]
+public sealed class FurryServersUIController : UIController
+{
+    private FurryServersWindow _furryServersWindow = default!;
+
+    public void OpenWindow()
+    {
+        EnsureWindow();
+
+        _furryServersWindow.OpenCentered();
+        _furryServersWindow.MoveToFront();
+    }
+
+    private void EnsureWindow()
+    {
+        if (_furryServersWindow is { Disposed: false })
+            return;
+
+        _furryServersWindow = UIManager.CreateWindow<FurryServersWindow>();
+    }
+
+    public void ToggleWindow()
+    {
+        EnsureWindow();
+
+        if (_furryServersWindow.IsOpen)
+        {
+            _furryServersWindow.Close();
+        }
+        else
+        {
+            OpenWindow();
+        }
+    }
+}
diff --git a/Content.Client/UserInterface/Systems/WhitelistWindow/Controls/WhitelistDenialWindow.xaml b/Content.Client/UserInterface/Systems/WhitelistWindow/Controls/WhitelistDenialWindow.xaml
new file mode 100644
index 00000000000..08568f25bb8
--- /dev/null
+++ b/Content.Client/UserInterface/Systems/WhitelistWindow/Controls/WhitelistDenialWindow.xaml
@@ -0,0 +1,15 @@
+<ui:WhitelistDenialWindow xmlns="https://spacestation14.io"
+                    xmlns:ui="clr-namespace:Content.Client.UserInterface.Systems.WhitelistWindow.Controls"
+                    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+                    Title="Whitelist Required"
+                    MinSize="400 170"
+                    SetSize="400 230">
+    <ScrollContainer HScrollEnabled="False" Margin="4" VerticalExpand="True" ReturnMeasure="True">
+        <BoxContainer Orientation="Vertical">
+            <RichTextLabel Margin="8 0 0 0" Name="DenialReason" />
+            <Button Margin="8 10 0 0" Name="WhitelistApplyButton" Text="Apply for whitelist" />
+            <PanelContainer Margin="8 10 0 0" StyleClasses="LowDivider" />
+            <Button Margin="8 20 0 0" Name="FurryServersButton" Text="Or check out other Furry SS14 Servers" />
+        </BoxContainer>
+    </ScrollContainer>
+</ui:WhitelistDenialWindow>
diff --git a/Content.Client/UserInterface/Systems/WhitelistWindow/Controls/WhitelistDenialWindow.xaml.cs b/Content.Client/UserInterface/Systems/WhitelistWindow/Controls/WhitelistDenialWindow.xaml.cs
new file mode 100644
index 00000000000..b845257af4e
--- /dev/null
+++ b/Content.Client/UserInterface/Systems/WhitelistWindow/Controls/WhitelistDenialWindow.xaml.cs
@@ -0,0 +1,52 @@
+using System.Linq;
+using Content.Client.Administration.Managers;
+using Content.Client.Stylesheets;
+using Content.Client.UserInterface.Controls;
+using Content.Client.UserInterface.Systems.EscapeMenu;
+using Content.Shared.Administration;
+using JetBrains.Annotations;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Console;
+using Robust.Client.ResourceManagement;
+using Robust.Shared.Utility;
+using Content.Client.UserInterface.Systems.EscapeMenu;
+
+namespace Content.Client.UserInterface.Systems.WhitelistWindow.Controls
+{
+    [GenerateTypedNameReferences]
+    public sealed partial class WhitelistDenialWindow : FancyWindow
+    {
+        [Dependency] private readonly IResourceCache _resourceManager = default!;
+        [Dependency] private readonly IUriOpener _uri = default!;
+
+        public WhitelistDenialWindow()
+        {
+            RobustXamlLoader.Load(this);
+            IoCManager.InjectDependencies(this);
+            Stylesheet = IoCManager.Resolve<IStylesheetManager>().SheetSpace;
+
+            WhitelistApplyButton.OnPressed += _ =>
+            {
+                _uri.OpenUri("https://discord.gg/ZZYNpq5KBJ"); // Floof discord link
+            };
+
+            FurryServersButton.OnPressed += _ =>
+            {
+                UserInterfaceManager.GetUIController<FurryServersUIController>().ToggleWindow();
+            };
+        }
+
+
+        protected override void Opened()
+        {
+            base.Opened();
+        }
+
+        public void SetDenialMessage(string denial)
+        {
+            DenialReason.SetMessage(denial);
+        }
+    }
+}
diff --git a/Content.Client/UserInterface/Systems/WhitelistWindow/WhitelistDenialUIController.cs b/Content.Client/UserInterface/Systems/WhitelistWindow/WhitelistDenialUIController.cs
new file mode 100644
index 00000000000..849a04edbd7
--- /dev/null
+++ b/Content.Client/UserInterface/Systems/WhitelistWindow/WhitelistDenialUIController.cs
@@ -0,0 +1,34 @@
+using Content.Client.Options.UI;
+using JetBrains.Annotations;
+using Robust.Client.UserInterface.Controllers;
+using Robust.Shared.Console;
+using Content.Client.UserInterface.Systems.WhitelistWindow.Controls;
+
+namespace Content.Client.UserInterface.Systems.WhitelistWindow;
+
+[UsedImplicitly]
+public sealed class WhitelistDenialUIController : UIController
+{
+    public override void Initialize()
+    {
+    }
+    private WhitelistDenialWindow _whitelistDenialWindow = default!;
+
+    private void EnsureWindow()
+    {
+        if (_whitelistDenialWindow is { Disposed: false })
+            return;
+
+        _whitelistDenialWindow = UIManager.CreateWindow<WhitelistDenialWindow>();
+    }
+
+    public void OpenWindow(string denialMessage)
+    {
+        EnsureWindow();
+
+        _whitelistDenialWindow.SetDenialMessage(denialMessage);
+
+        _whitelistDenialWindow.OpenCentered();
+        _whitelistDenialWindow.MoveToFront();
+    }
+}
diff --git a/Content.Server/Alert/Click/AcceptingOffer.cs b/Content.Server/Alert/Click/AcceptingOffer.cs
new file mode 100644
index 00000000000..b6adbf83bd3
--- /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/Chat/Commands/SubtleCommand.cs b/Content.Server/Chat/Commands/SubtleCommand.cs
new file mode 100644
index 00000000000..a33bc0bc99e
--- /dev/null
+++ b/Content.Server/Chat/Commands/SubtleCommand.cs
@@ -0,0 +1,43 @@
+using Content.Server.Chat.Systems;
+using Content.Shared.Administration;
+using Robust.Shared.Console;
+using Robust.Shared.Enums;
+
+namespace Content.Server.Chat.Commands
+{
+    [AnyCommand]
+    internal sealed class SubtleCommand : IConsoleCommand
+    {
+        public string Command => "subtle";
+        public string Description => "Perform an subtle action.";
+        public string Help => "subtle <text>";
+
+        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        {
+            if (shell.Player is not { } player)
+            {
+                shell.WriteError("This command cannot be run from the server.");
+                return;
+            }
+
+            if (player.Status != SessionStatus.InGame)
+                return;
+
+            if (player.AttachedEntity is not {} playerEntity)
+            {
+                shell.WriteError("You don't have an entity!");
+                return;
+            }
+
+            if (args.Length < 1)
+                return;
+
+            var message = string.Join(" ", args).Trim();
+            if (string.IsNullOrEmpty(message))
+                return;
+
+            IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<ChatSystem>()
+                .TrySendInGameICMessage(playerEntity, message, InGameICChatType.Subtle, ChatTransmitRange.NoGhosts, false, shell, player);
+        }
+    }
+}
diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs
index 7190b94e141..cd48b6de716 100644
--- a/Content.Server/Chat/Systems/ChatSystem.cs
+++ b/Content.Server/Chat/Systems/ChatSystem.cs
@@ -263,6 +263,9 @@ public void TrySendInGameICMessage(
             case InGameICChatType.Emote:
                 SendEntityEmote(source, message, range, nameOverride, hideLog: hideLog, ignoreActionBlocker: ignoreActionBlocker);
                 break;
+            case InGameICChatType.Subtle:
+                SendEntitySubtle(source, message, range, nameOverride, hideLog: hideLog, ignoreActionBlocker: ignoreActionBlocker);
+                break;
             //Nyano - Summary: case adds the telepathic chat sending ability.
             case InGameICChatType.Telepathic:
                 _nyanoChatSystem.SendTelepathicChat(source, message, range == ChatTransmitRange.HideChat);
@@ -423,11 +426,11 @@ private void SendEntitySpeak(
 
         name = FormattedMessage.EscapeText(name);
         // The chat message wrapped in a "x says y" string
-        var wrappedMessage = WrapPublicMessage(source, name, message);
+        var wrappedMessage = WrapPublicMessage(source, name, message, languageOverride: language);
         // The chat message obfuscated via language obfuscation
         var obfuscated = SanitizeInGameICMessage(source, _language.ObfuscateSpeech(message, language), out var emoteStr, true, _configurationManager.GetCVar(CCVars.ChatPunctuation), (!CultureInfo.CurrentCulture.IsNeutralCulture && CultureInfo.CurrentCulture.Parent.Name == "en") || (CultureInfo.CurrentCulture.IsNeutralCulture && CultureInfo.CurrentCulture.Name == "en"));
         // The language-obfuscated message wrapped in a "x says y" string
-        var wrappedObfuscated = WrapPublicMessage(source, name, obfuscated);
+        var wrappedObfuscated = WrapPublicMessage(source, name, obfuscated, languageOverride: language);
 
         SendInVoiceRange(ChatChannel.Local, name, message, wrappedMessage, obfuscated, wrappedObfuscated, source, range, languageOverride: language);
 
@@ -502,7 +505,7 @@ private void SendEntityWhisper(
             if (MessageRangeCheck(session, data, range) != MessageRangeCheckResult.Full)
                 continue; // Won't get logged to chat, and ghosts are too far away to see the pop-up, so we just won't send it to them.
 
-            var canUnderstandLanguage = _language.CanUnderstand(listener, language);
+            var canUnderstandLanguage = _language.CanUnderstand(listener, language.ID);
             // How the entity perceives the message depends on whether it can understand its language
             var perceivedMessage = canUnderstandLanguage ? message : languageObfuscatedMessage;
 
@@ -514,6 +517,7 @@ private void SendEntityWhisper(
                 // Scenario 1: the listener can clearly understand the message
                 result = perceivedMessage;
                 wrappedMessage = Loc.GetString("chat-manager-entity-whisper-wrap-message",
+                    ("color", language.Color ?? Color.Gray),
                     ("entityName", name),
                     ("message", FormattedMessage.EscapeText(result)));
             }
@@ -523,13 +527,14 @@ private void SendEntityWhisper(
                 // Collisiongroup.Opaque is not ideal for this use. Preferably, there should be a check specifically with "Can Ent1 see Ent2" in mind
                 result = ObfuscateMessageReadability(perceivedMessage);
                 wrappedMessage = Loc.GetString("chat-manager-entity-whisper-wrap-message",
-                    ("entityName", nameIdentity), ("message", FormattedMessage.EscapeText(result)));
+                    ("entityName", nameIdentity), ("color", language.Color ?? Color.Gray), ("message", FormattedMessage.EscapeText(result)));
             }
             else
             {
                 // Scenario 3: If listener is too far and has no line of sight, they can't identify the whisperer's identity
                 result = ObfuscateMessageReadability(perceivedMessage);
                 wrappedMessage = Loc.GetString("chat-manager-entity-whisper-unknown-wrap-message",
+                    ("color", language.Color ?? Color.Gray),
                     ("message", FormattedMessage.EscapeText(result)));
             }
 
@@ -537,6 +542,7 @@ private void SendEntityWhisper(
         }
 
         var replayWrap = Loc.GetString("chat-manager-entity-whisper-wrap-message",
+            ("color", language.Color ?? Color.Gray),
             ("entityName", name),
             ("message", FormattedMessage.EscapeText(message)));
         _replay.RecordServerMessage(new ChatMessage(ChatChannel.Whisper, message, replayWrap, GetNetEntity(source), null, MessageRangeHideChatForReplay(range)));
@@ -596,6 +602,47 @@ private void SendEntityEmote(
                 _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Emote from {ToPrettyString(source):user}: {action}");
     }
 
+    private void SendEntitySubtle(
+        EntityUid source,
+        string action,
+        ChatTransmitRange range,
+        string? nameOverride,
+        bool hideLog = false,
+        bool ignoreActionBlocker = false,
+        NetUserId? author = null
+        )
+    {
+        if (!_actionBlocker.CanEmote(source) && !ignoreActionBlocker)
+            return;
+
+        // get the entity's apparent name (if no override provided).
+        var ent = Identity.Entity(source, EntityManager);
+        string name = FormattedMessage.EscapeText(nameOverride ?? Name(ent));
+
+        // Emotes use Identity.Name, since it doesn't actually involve your voice at all.
+        var wrappedMessage = Loc.GetString("chat-manager-entity-subtle-wrap-message",
+            ("entityName", name),
+            ("entity", ent),
+            ("message", FormattedMessage.RemoveMarkup(action)));
+
+        foreach (var (session, data) in GetRecipients(source, WhisperClearRange))
+        {
+            if (session.AttachedEntity is not { Valid: true } listener)
+                continue;
+
+            if (MessageRangeCheck(session, data, range) == MessageRangeCheckResult.Disallowed)
+                continue;
+
+            _chatManager.ChatMessageToOne(ChatChannel.Emotes, action, wrappedMessage, source, false, session.Channel);
+        }
+
+        if (!hideLog)
+            if (name != Name(source))
+                _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Subtle from {ToPrettyString(source):user} as {name}: {action}");
+            else
+                _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Subtle from {ToPrettyString(source):user}: {action}");
+    }
+
     // ReSharper disable once InconsistentNaming
     private void SendLOOC(EntityUid source, ICommonSession player, string message, bool hideChat)
     {
@@ -717,7 +764,7 @@ private void SendInVoiceRange(ChatChannel channel, string name, string message,
 
 
             // If the channel does not support languages, or the entity can understand the message, send the original message, otherwise send the obfuscated version
-            if (channel == ChatChannel.LOOC || channel == ChatChannel.Emotes || _language.CanUnderstand(listener, language))
+            if (channel == ChatChannel.LOOC || channel == ChatChannel.Emotes || _language.CanUnderstand(listener, language.ID))
             {
                 _chatManager.ChatMessageToOne(channel, message, wrappedMessage, source, entHideChat, session.Channel, author: author);
             }
@@ -837,16 +884,17 @@ public string SanitizeMessageReplaceWords(string message)
     /// <summary>
     ///     Wraps a message sent by the specified entity into an "x says y" string.
     /// </summary>
-    public string WrapPublicMessage(EntityUid source, string name, string message)
+    public string WrapPublicMessage(EntityUid source, string name, string message, LanguagePrototype? languageOverride = null)
     {
+        var language = languageOverride ?? _language.GetLanguage(source);
         var speech = GetSpeechVerb(source, message);
-        var verbName = Loc.GetString(_random.Pick(speech.SpeechVerbStrings));
         return Loc.GetString(speech.Bold ? "chat-manager-entity-say-bold-wrap-message" : "chat-manager-entity-say-wrap-message",
+            ("color", language.Color ?? Color.White),
             ("entityName", name),
-            ("verb", verbName),
-            ("fontType", speech.FontId),
-            ("fontSize", speech.FontSize),
-            ("message", FormattedMessage.EscapeText(message)));
+            ("verb", Loc.GetString(_random.Pick(speech.SpeechVerbStrings))),
+            ("fontType", language.FontId ?? speech.FontId),
+            ("fontSize", language.FontSize ?? speech.FontSize),
+            ("message", message));
     }
 
     /// <summary>
@@ -1012,6 +1060,7 @@ public enum InGameICChatType : byte
     Speak,
     Emote,
     Whisper,
+    Subtle, // FloofStation
     Telepathic //Nyano - Summary: adds telepathic as a type of message users can receive.
 }
 
diff --git a/Content.Server/Chemistry/ReagentEffects/MakeSentient.cs b/Content.Server/Chemistry/ReagentEffects/MakeSentient.cs
index da16529d515..8d5a583f6d8 100644
--- a/Content.Server/Chemistry/ReagentEffects/MakeSentient.cs
+++ b/Content.Server/Chemistry/ReagentEffects/MakeSentient.cs
@@ -1,13 +1,17 @@
 using System.Linq;
 using Content.Server.Ghost.Roles.Components;
+using Content.Server.Language;
+using Content.Server.Language.Events;
 using Content.Server.Speech.Components;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Language;
 using Content.Shared.Language.Systems;
 using Content.Shared.Mind.Components;
 using Robust.Shared.Prototypes;
-using Content.Server.Psionics; //Nyano - Summary: pulls in the ability for the sentient creature to become psionic.
-using Content.Shared.Humanoid; //Delta-V - Banning humanoids from becoming ghost roles.
+using Content.Server.Psionics;
+using Content.Shared.Body.Part; //Nyano - Summary: pulls in the ability for the sentient creature to become psionic.
+using Content.Shared.Humanoid;
+using Content.Shared.Language.Components; //Delta-V - Banning humanoids from becoming ghost roles.
 using Content.Shared.Language.Events;
 
 namespace Content.Server.Chemistry.ReagentEffects;
@@ -28,19 +32,18 @@ public override void Effect(ReagentEffectArgs args)
         entityManager.RemoveComponent<ReplacementAccentComponent>(uid);
         entityManager.RemoveComponent<MonkeyAccentComponent>(uid);
 
+        // Make sure the entity knows at least fallback (Galactic Common)
         var speaker = entityManager.EnsureComponent<LanguageSpeakerComponent>(uid);
+        var knowledge = entityManager.EnsureComponent<LanguageKnowledgeComponent>(uid);
         var fallback = SharedLanguageSystem.FallbackLanguagePrototype;
 
-        if (!speaker.UnderstoodLanguages.Contains(fallback))
-            speaker.UnderstoodLanguages.Add(fallback);
+        if (!knowledge.UnderstoodLanguages.Contains(fallback))
+            knowledge.UnderstoodLanguages.Add(fallback);
 
-        if (!speaker.SpokenLanguages.Contains(fallback))
-        {
-            speaker.CurrentLanguage = fallback;
-            speaker.SpokenLanguages.Add(fallback);
-        }
+        if (!knowledge.SpokenLanguages.Contains(fallback))
+            knowledge.SpokenLanguages.Add(fallback);
 
-        args.EntityManager.EventBus.RaiseLocalEvent(uid, new LanguagesUpdateEvent(), true);
+        IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<LanguageSystem>().UpdateEntityLanguages(uid, speaker);
 
         // Stops from adding a ghost role to things like people who already have a mind
         if (entityManager.TryGetComponent<MindContainerComponent>(uid, out var mindContainer) && mindContainer.HasMind)
diff --git a/Content.Server/DeltaV/Paper/SignAttemptEvent.cs b/Content.Server/DeltaV/Paper/SignAttemptEvent.cs
new file mode 100644
index 00000000000..ff2d1b5103a
--- /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 00000000000..07a249399bc
--- /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/Language/Commands/ListLanguagesCommand.cs b/Content.Server/Language/Commands/ListLanguagesCommand.cs
index 6698e1b6453..e5787cba48c 100644
--- a/Content.Server/Language/Commands/ListLanguagesCommand.cs
+++ b/Content.Server/Language/Commands/ListLanguagesCommand.cs
@@ -1,5 +1,5 @@
-using System.Linq;
 using Content.Shared.Administration;
+using Content.Shared.Language;
 using Robust.Shared.Console;
 using Robust.Shared.Enums;
 
@@ -30,10 +30,29 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
         }
 
         var languages = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<LanguageSystem>();
+        var currentLang = languages.GetLanguage(playerEntity).ID;
 
-        var (spokenLangs, knownLangs) = languages.GetAllLanguages(playerEntity);
+        shell.WriteLine(Loc.GetString("command-language-spoken"));
+        var spoken = languages.GetSpokenLanguages(playerEntity);
+        for (int i = 0; i < spoken.Count; i++)
+        {
+            var lang = spoken[i];
+            shell.WriteLine(lang == currentLang
+                ? Loc.GetString("command-language-current-entry", ("id", i + 1), ("language", lang), ("name", LanguageName(lang)))
+                : Loc.GetString("command-language-entry", ("id", i + 1), ("language", lang), ("name", LanguageName(lang))));
+        }
 
-        shell.WriteLine("Spoken:\n" + string.Join("\n", spokenLangs));
-        shell.WriteLine("Understood:\n" + string.Join("\n", knownLangs));
+        shell.WriteLine(Loc.GetString("command-language-understood"));
+        var understood = languages.GetUnderstoodLanguages(playerEntity);
+        for (int i = 0; i < understood.Count; i++)
+        {
+            var lang = understood[i];
+            shell.WriteLine(Loc.GetString("command-language-entry", ("id", i + 1), ("language", lang), ("name", LanguageName(lang))));
+        }
+    }
+
+    private string LanguageName(string id)
+    {
+        return Loc.GetString($"language-{id}-name");
     }
 }
diff --git a/Content.Server/Language/Commands/SayLanguageCommand.cs b/Content.Server/Language/Commands/SayLanguageCommand.cs
index 2e4a27b1dcc..2304781fa04 100644
--- a/Content.Server/Language/Commands/SayLanguageCommand.cs
+++ b/Content.Server/Language/Commands/SayLanguageCommand.cs
@@ -32,7 +32,6 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
         if (args.Length < 2)
             return;
 
-        var languageId = args[0];
         var message = string.Join(" ", args, startIndex: 1, count: args.Length - 1).Trim();
 
         if (string.IsNullOrEmpty(message))
@@ -41,10 +40,9 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
         var languages = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<LanguageSystem>();
         var chats = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<ChatSystem>();
 
-        var language = languages.GetLanguagePrototype(languageId);
-        if (language == null || !languages.CanSpeak(playerEntity, language.ID))
+        if (!SelectLanguageCommand.TryParseLanguageArgument(languages, playerEntity, args[0], out var failReason, out var language))
         {
-            shell.WriteError($"Language {languageId} is invalid or you cannot speak it!");
+            shell.WriteError(failReason);
             return;
         }
 
diff --git a/Content.Server/Language/Commands/SelectLanguageCommand.cs b/Content.Server/Language/Commands/SelectLanguageCommand.cs
index e3363846539..d340135925d 100644
--- a/Content.Server/Language/Commands/SelectLanguageCommand.cs
+++ b/Content.Server/Language/Commands/SelectLanguageCommand.cs
@@ -1,5 +1,7 @@
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Shared.Administration;
+using Content.Shared.Language;
 using Robust.Shared.Console;
 using Robust.Shared.Enums;
 
@@ -32,17 +34,55 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
         if (args.Length < 1)
             return;
 
-        var languageId = args[0];
-
         var languages = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<LanguageSystem>();
 
-        var language = languages.GetLanguagePrototype(languageId);
-        if (language == null || !languages.CanSpeak(playerEntity, language.ID))
+        if (!TryParseLanguageArgument(languages, playerEntity, args[0], out var failReason, out var language))
         {
-            shell.WriteError($"Language {languageId} is invalid or you cannot speak it!");
+            shell.WriteError(failReason);
             return;
         }
 
         languages.SetLanguage(playerEntity, language.ID);
     }
+
+    // TODO: find a better place for this method
+    /// <summary>
+    ///     Tries to parse the input argument as either a language ID or the position of the language in the list of languages
+    ///     the entity can speak. Returns true if sucessful.
+    /// </summary>
+    public static bool TryParseLanguageArgument(
+        LanguageSystem languageSystem,
+        EntityUid speaker,
+        string input,
+        [NotNullWhen(false)] out string? failureReason,
+        [NotNullWhen(true)] out LanguagePrototype? language)
+    {
+        failureReason = null;
+        language = null;
+
+        if (int.TryParse(input, out var num))
+        {
+            // The argument is a number
+            var spoken = languageSystem.GetSpokenLanguages(speaker);
+            if (num > 0 && num - 1 < spoken.Count)
+                language = languageSystem.GetLanguagePrototype(spoken[num - 1]);
+
+            if (language != null) // the ability to speak it is implied
+                return true;
+
+            failureReason = Loc.GetString("command-language-invalid-number", ("total", spoken.Count));
+            return false;
+        }
+        else
+        {
+            // The argument is a language ID
+            language = languageSystem.GetLanguagePrototype(input);
+
+            if (language != null && languageSystem.CanSpeak(speaker, language.ID))
+                return true;
+
+            failureReason = Loc.GetString("command-language-invalid-language", ("id", input));
+            return false;
+        }
+    }
 }
diff --git a/Content.Server/Language/DetermineEntityLanguagesEvent.cs b/Content.Server/Language/DetermineEntityLanguagesEvent.cs
index 13ab2cac279..8d6b868d070 100644
--- a/Content.Server/Language/DetermineEntityLanguagesEvent.cs
+++ b/Content.Server/Language/DetermineEntityLanguagesEvent.cs
@@ -1,29 +1,25 @@
+using Content.Shared.Language;
+
 namespace Content.Server.Language;
 
 /// <summary>
-///   Raised in order to determine the language an entity speaks at the current moment,
-///   as well as the list of all languages the entity may speak and understand.
+///     Raised in order to determine the list of languages the entity can speak and understand at the given moment.
+///     Typically raised on an entity after a language agent (e.g. a translator) has been added to or removed from them.
 /// </summary>
-public sealed class DetermineEntityLanguagesEvent : EntityEventArgs
+[ByRefEvent]
+public record struct DetermineEntityLanguagesEvent
 {
     /// <summary>
-    ///   The default language of this entity. If empty, remain unchanged.
-    ///   This field has no effect if the entity decides to speak in a concrete language.
-    /// </summary>
-    public string CurrentLanguage;
-    /// <summary>
-    ///   The list of all languages the entity may speak. Must NOT be held as a reference!
+    ///     The list of all languages the entity may speak.
+    ///     By default, contains the languages this entity speaks intrinsically.
     /// </summary>
-    public List<string> SpokenLanguages;
+    public HashSet<string> SpokenLanguages = new();
+
     /// <summary>
-    ///   The list of all languages the entity may understand. Must NOT be held as a reference!
+    ///     The list of all languages the entity may understand.
+    ///     By default, contains the languages this entity understands intrinsically.
     /// </summary>
-    public List<string> UnderstoodLanguages;
+    public HashSet<string> UnderstoodLanguages = new();
 
-    public DetermineEntityLanguagesEvent(string currentLanguage, List<string> spokenLanguages, List<string> understoodLanguages)
-    {
-        CurrentLanguage = currentLanguage;
-        SpokenLanguages = spokenLanguages;
-        UnderstoodLanguages = understoodLanguages;
-    }
+    public DetermineEntityLanguagesEvent() {}
 }
diff --git a/Content.Server/Language/LanguageSystem.Networking.cs b/Content.Server/Language/LanguageSystem.Networking.cs
index 7517b4185e3..572e2961fde 100644
--- a/Content.Server/Language/LanguageSystem.Networking.cs
+++ b/Content.Server/Language/LanguageSystem.Networking.cs
@@ -1,5 +1,7 @@
+using Content.Server.Language.Events;
 using Content.Server.Mind;
 using Content.Shared.Language;
+using Content.Shared.Language.Components;
 using Content.Shared.Language.Events;
 using Content.Shared.Mind;
 using Content.Shared.Mind.Components;
@@ -7,11 +9,6 @@
 
 namespace Content.Server.Language;
 
-/// <summary>
-///   LanguageSystem Networking
-///   This is used to update client state when mind change entity.
-/// </summary>
-
 public sealed partial class LanguageSystem
 {
     [Dependency] private readonly MindSystem _mind = default!;
@@ -19,6 +16,11 @@ public sealed partial class LanguageSystem
 
     public void InitializeNet()
     {
+        SubscribeNetworkEvent<LanguagesSetMessage>(OnClientSetLanguage);
+        SubscribeNetworkEvent<RequestLanguagesMessage>((_, session) => SendLanguageStateToClient(session.SenderSession));
+
+        SubscribeLocalEvent<LanguageSpeakerComponent, LanguagesUpdateEvent>((uid, comp, _) => SendLanguageStateToClient(uid, comp));
+
         // Refresh the client's state when its mind hops to a different entity
         SubscribeLocalEvent<MindContainerComponent, MindAddedMessage>((uid, _, _) => SendLanguageStateToClient(uid));
         SubscribeLocalEvent<MindComponent, MindGotRemovedEvent>((_, _, args) =>
@@ -26,12 +28,21 @@ public void InitializeNet()
             if (args.Mind.Comp.Session != null)
                 SendLanguageStateToClient(args.Mind.Comp.Session);
         });
-
-        SubscribeLocalEvent<LanguageSpeakerComponent, LanguagesUpdateEvent>((uid, comp, _) => SendLanguageStateToClient(uid, comp));
-        SubscribeNetworkEvent<RequestLanguagesMessage>((_, session) => SendLanguageStateToClient(session.SenderSession));
     }
 
 
+    private void OnClientSetLanguage(LanguagesSetMessage message, EntitySessionEventArgs args)
+    {
+        if (args.SenderSession.AttachedEntity is not { Valid: true } uid)
+            return;
+
+        var language = GetLanguagePrototype(message.CurrentLanguage);
+        if (language == null || !CanSpeak(uid, language.ID))
+            return;
+
+        SetLanguage(uid, language.ID);
+    }
+
     private void SendLanguageStateToClient(EntityUid uid, LanguageSpeakerComponent? comp = null)
     {
         // Try to find a mind inside the entity and notify its session
@@ -50,10 +61,18 @@ private void SendLanguageStateToClient(ICommonSession session, LanguageSpeakerCo
         SendLanguageStateToClient(entity, session, comp);
     }
 
+    // TODO this is really stupid and can be avoided if we just make everything shared...
     private void SendLanguageStateToClient(EntityUid uid, ICommonSession session, LanguageSpeakerComponent? component = null)
     {
-        var langs = GetLanguages(uid, component);
-        var message = new LanguagesUpdatedMessage(langs.CurrentLanguage, langs.SpokenLanguages, langs.UnderstoodLanguages);
+        var isUniversal = HasComp<UniversalLanguageSpeakerComponent>(uid);
+        if (!isUniversal)
+            Resolve(uid, ref component, logMissing: false);
+
+        // I really don't want to call 3 getter methods here, so we'll just have this slightly hardcoded solution
+        var message = isUniversal || component == null
+            ? new LanguagesUpdatedMessage(UniversalPrototype, [UniversalPrototype], [UniversalPrototype])
+            : new LanguagesUpdatedMessage(component.CurrentLanguage, component.SpokenLanguages, component.UnderstoodLanguages);
+
         RaiseNetworkEvent(message, session);
     }
 }
diff --git a/Content.Server/Language/LanguageSystem.cs b/Content.Server/Language/LanguageSystem.cs
index f1bf44c1f4f..e68489e9e28 100644
--- a/Content.Server/Language/LanguageSystem.cs
+++ b/Content.Server/Language/LanguageSystem.cs
@@ -1,289 +1,212 @@
 using System.Linq;
-using System.Text;
-using Content.Server.GameTicking.Events;
+using Content.Server.Language.Events;
 using Content.Shared.Language;
+using Content.Shared.Language.Components;
 using Content.Shared.Language.Events;
 using Content.Shared.Language.Systems;
-using Robust.Shared.Random;
 using UniversalLanguageSpeakerComponent = Content.Shared.Language.Components.UniversalLanguageSpeakerComponent;
 
 namespace Content.Server.Language;
 
 public sealed partial class LanguageSystem : SharedLanguageSystem
 {
-    // Static and re-used event instances used to minimize memory allocations during language processing, which can happen many times per tick.
-    // These are used in the method GetLanguages and returned from it. They should never be mutated outside of that method or returned outside this system.
-    private readonly DetermineEntityLanguagesEvent
-        _determineLanguagesEvent = new(string.Empty, new(), new()),
-        _universalLanguagesEvent = new(UniversalPrototype, [UniversalPrototype], [UniversalPrototype]); // Returned for universal speakers only
-
-    /// <summary>
-    ///   A random number added to each pseudo-random number's seed. Changes every round.
-    /// </summary>
-    public int RandomRoundSeed { get; private set; }
-
-
     public override void Initialize()
     {
         base.Initialize();
+        InitializeNet();
 
-        SubscribeNetworkEvent<LanguagesSetMessage>(OnClientSetLanguage);
         SubscribeLocalEvent<LanguageSpeakerComponent, ComponentInit>(OnInitLanguageSpeaker);
-        SubscribeLocalEvent<RoundStartingEvent>(_ => RandomRoundSeed = _random.Next());
-
-        InitializeNet();
     }
 
 
     #region public api
-    /// <summary>
-    ///   Obfuscate a message using an entity's default language.
-    /// </summary>
-    public string ObfuscateSpeech(EntityUid source, string message)
-    {
-        var language = GetLanguage(source) ?? Universal;
-        return ObfuscateSpeech(message, language);
-    }
 
-    /// <summary>
-    ///     Obfuscate a message using the given language.
-    /// </summary>
-    public string ObfuscateSpeech(string message, LanguagePrototype language)
+    public bool CanUnderstand(EntityUid listener, string language, LanguageSpeakerComponent? component = null)
     {
-        var builder = new StringBuilder();
-        if (language.ObfuscateSyllables)
-            ObfuscateSyllables(builder, message, language);
-        else
-            ObfuscatePhrases(builder, message, language);
+        if (language == UniversalPrototype || HasComp<UniversalLanguageSpeakerComponent>(listener))
+            return true;
 
-        return builder.ToString();
+        if (!Resolve(listener, ref component, logMissing: false))
+            return false;
+
+        return component.UnderstoodLanguages.Contains(language);
     }
 
-    public bool CanUnderstand(EntityUid listener, LanguagePrototype language, LanguageSpeakerComponent? listenerLanguageComp = null)
+    public bool CanSpeak(EntityUid speaker, string language, LanguageSpeakerComponent? component = null)
     {
-        if (language.ID == UniversalPrototype || HasComp<UniversalLanguageSpeakerComponent>(listener))
+        if (HasComp<UniversalLanguageSpeakerComponent>(speaker))
             return true;
 
-        var listenerLanguages = GetLanguages(listener, listenerLanguageComp)?.UnderstoodLanguages;
+        if (!Resolve(speaker, ref component, logMissing: false))
+            return false;
 
-        return listenerLanguages?.Contains(language.ID, StringComparer.Ordinal) ?? false;
+        return component.SpokenLanguages.Contains(language);
     }
 
-    public bool CanSpeak(EntityUid speaker, string language, LanguageSpeakerComponent? speakerComp = null)
+    /// <summary>
+    ///     Returns the current language of the given entity, assumes Universal if it's not a language speaker.
+    /// </summary>
+    public LanguagePrototype GetLanguage(EntityUid speaker, LanguageSpeakerComponent? component = null)
     {
-        if (HasComp<UniversalLanguageSpeakerComponent>(speaker))
-            return true;
+        if (HasComp<UniversalLanguageSpeakerComponent>(speaker) || !Resolve(speaker, ref component, logMissing: false))
+            return Universal; // Serves both as a fallback and uhhh something (TODO: fix this comment)
+
+        if (string.IsNullOrEmpty(component.CurrentLanguage) || !_prototype.TryIndex<LanguagePrototype>(component.CurrentLanguage, out var proto))
+            return Universal;
 
-        var langs = GetLanguages(speaker, speakerComp)?.UnderstoodLanguages;
-        return langs?.Contains(language, StringComparer.Ordinal) ?? false;
+        return proto;
     }
 
     /// <summary>
-    ///     Returns the current language of the given entity.
-    ///     Assumes Universal if not specified.
+    ///     Returns the list of languages this entity can speak.
     /// </summary>
-    public LanguagePrototype GetLanguage(EntityUid speaker, LanguageSpeakerComponent? languageComp = null)
+    /// <remarks>Typically, checking <see cref="LanguageSpeakerComponent.SpokenLanguages"/> is sufficient.</remarks>
+    public List<string> GetSpokenLanguages(EntityUid uid)
     {
-        var id = GetLanguages(speaker, languageComp)?.CurrentLanguage;
-        if (id == null)
-            return Universal; // Fallback
+        if (HasComp<UniversalLanguageSpeakerComponent>(uid))
+            return [UniversalPrototype];
 
-        _prototype.TryIndex(id, out LanguagePrototype? proto);
+        if (TryComp<LanguageSpeakerComponent>(uid, out var component))
+            return component.SpokenLanguages;
 
-        return proto ?? Universal;
+        return [];
     }
 
-    public void SetLanguage(EntityUid speaker, string language, LanguageSpeakerComponent? languageComp = null)
+    /// <summary>
+    ///     Returns the list of languages this entity can understand.
+    /// </summary>
+    /// <remarks>Typically, checking <see cref="LanguageSpeakerComponent.UnderstoodLanguages"/> is sufficient.</remarks>
+    public List<string> GetUnderstoodLanguages(EntityUid uid)
     {
-        if (!CanSpeak(speaker, language) || HasComp<UniversalLanguageSpeakerComponent>(speaker))
-            return;
+        if (HasComp<UniversalLanguageSpeakerComponent>(uid))
+            return [UniversalPrototype]; // This one is tricky because... well, they understand all of them, not just one.
 
-        if (languageComp == null && !TryComp(speaker, out languageComp))
-            return;
+        if (TryComp<LanguageSpeakerComponent>(uid, out var component))
+            return component.UnderstoodLanguages;
+
+        return [];
+    }
 
-        if (languageComp.CurrentLanguage == language)
+    public void SetLanguage(EntityUid speaker, string language, LanguageSpeakerComponent? component = null)
+    {
+        if (!CanSpeak(speaker, language) || (HasComp<UniversalLanguageSpeakerComponent>(speaker) && language != UniversalPrototype))
             return;
 
-        languageComp.CurrentLanguage = language;
+        if (!Resolve(speaker, ref component) || component.CurrentLanguage == language)
+            return;
 
+        component.CurrentLanguage = language;
         RaiseLocalEvent(speaker, new LanguagesUpdateEvent(), true);
     }
 
     /// <summary>
-    ///   Adds a new language to the lists of understood and/or spoken languages of the given component.
+    ///     Adds a new language to the respective lists of intrinsically known languages of the given entity.
     /// </summary>
-    public void AddLanguage(LanguageSpeakerComponent comp, string language, bool addSpoken = true, bool addUnderstood = true)
+    public void AddLanguage(
+        EntityUid uid,
+        string language,
+        bool addSpoken = true,
+        bool addUnderstood = true,
+        LanguageKnowledgeComponent? knowledge = null,
+        LanguageSpeakerComponent? speaker = null)
     {
-        if (addSpoken && !comp.SpokenLanguages.Contains(language))
-            comp.SpokenLanguages.Add(language);
+        if (knowledge == null)
+            knowledge = EnsureComp<LanguageKnowledgeComponent>(uid);
 
-        if (addUnderstood && !comp.UnderstoodLanguages.Contains(language))
-            comp.UnderstoodLanguages.Add(language);
+        if (addSpoken && !knowledge.SpokenLanguages.Contains(language))
+            knowledge.SpokenLanguages.Add(language);
 
-        RaiseLocalEvent(comp.Owner, new LanguagesUpdateEvent(), true);
-    }
+        if (addUnderstood && !knowledge.UnderstoodLanguages.Contains(language))
+            knowledge.UnderstoodLanguages.Add(language);
 
-    public (List<string> spoken, List<string> understood) GetAllLanguages(EntityUid speaker)
-    {
-        var languages = GetLanguages(speaker);
-        // The lists need to be copied because the internal ones are re-used for performance reasons.
-        return (new List<string>(languages.SpokenLanguages), new List<string>(languages.UnderstoodLanguages));
+        UpdateEntityLanguages(uid, speaker);
     }
 
     /// <summary>
-    ///   Ensures the given entity has a valid language as its current language.
-    ///   If not, sets it to the first entry of its SpokenLanguages list, or universal if it's empty.
+    ///     Removes a language from the respective lists of intrinsically known languages of the given entity.
     /// </summary>
-    public void EnsureValidLanguage(EntityUid entity, LanguageSpeakerComponent? comp = null)
+    public void RemoveLanguage(
+        EntityUid uid,
+        string language,
+        bool removeSpoken = true,
+        bool removeUnderstood = true,
+        LanguageKnowledgeComponent? knowledge = null,
+        LanguageSpeakerComponent? speaker = null)
     {
-        if (comp == null && !TryComp(entity, out comp))
-            return;
+        if (knowledge == null)
+            knowledge = EnsureComp<LanguageKnowledgeComponent>(uid);
 
-        var langs = GetLanguages(entity, comp);
-        if (!langs.SpokenLanguages.Contains(comp!.CurrentLanguage, StringComparer.Ordinal))
-        {
-            comp.CurrentLanguage = langs.SpokenLanguages.FirstOrDefault(UniversalPrototype);
-            RaiseLocalEvent(comp.Owner, new LanguagesUpdateEvent(), true);
-        }
-    }
-    #endregion
+        if (removeSpoken)
+            knowledge.SpokenLanguages.Remove(language);
 
-    #region event handling
-    private void OnInitLanguageSpeaker(EntityUid uid, LanguageSpeakerComponent component, ComponentInit args)
-    {
-        if (string.IsNullOrEmpty(component.CurrentLanguage))
-            component.CurrentLanguage = component.SpokenLanguages.FirstOrDefault(UniversalPrototype);
-    }
-    #endregion
+        if (removeUnderstood)
+            knowledge.UnderstoodLanguages.Remove(language);
 
-    #region internal api - obfuscation
-    private void ObfuscateSyllables(StringBuilder builder, string message, LanguagePrototype language)
-    {
-        // Go through each word. Calculate its hash sum and count the number of letters.
-        // Replicate it with pseudo-random syllables of pseudo-random (but similar) length. Use the hash code as the seed.
-        // This means that identical words will be obfuscated identically. Simple words like "hello" or "yes" in different langs can be memorized.
-        var wordBeginIndex = 0;
-        var hashCode = 0;
-        for (var i = 0; i < message.Length; i++)
-        {
-            var ch = char.ToLower(message[i]);
-            // A word ends when one of the following is found: a space, a sentence end, or EOM
-            if (char.IsWhiteSpace(ch) || IsSentenceEnd(ch) || i == message.Length - 1)
-            {
-                var wordLength = i - wordBeginIndex;
-                if (wordLength > 0)
-                {
-                    var newWordLength = PseudoRandomNumber(hashCode, 1, 4);
-
-                    for (var j = 0; j < newWordLength; j++)
-                    {
-                        var index = PseudoRandomNumber(hashCode + j, 0, language.Replacement.Count);
-                        builder.Append(language.Replacement[index]);
-                    }
-                }
-
-                builder.Append(ch);
-                hashCode = 0;
-                wordBeginIndex = i + 1;
-            }
-            else
-                hashCode = hashCode * 31 + ch;
-        }
+        UpdateEntityLanguages(uid, speaker);
     }
 
-    private void ObfuscatePhrases(StringBuilder builder, string message, LanguagePrototype language)
+    /// <summary>
+    ///   Ensures the given entity has a valid language as its current language.
+    ///   If not, sets it to the first entry of its SpokenLanguages list, or universal if it's empty.
+    /// </summary>
+    /// <returns>True if the current language was modified, false otherwise.</returns>
+    public bool EnsureValidLanguage(EntityUid entity, LanguageSpeakerComponent? comp = null)
     {
-        // In a similar manner, each phrase is obfuscated with a random number of conjoined obfuscation phrases.
-        // However, the number of phrases depends on the number of characters in the original phrase.
-        var sentenceBeginIndex = 0;
-        for (var i = 0; i < message.Length; i++)
+        if (!Resolve(entity, ref comp))
+            return false;
+
+        if (!comp.SpokenLanguages.Contains(comp.CurrentLanguage))
         {
-            var ch = char.ToLower(message[i]);
-            if (IsSentenceEnd(ch) || i == message.Length - 1)
-            {
-                var length = i - sentenceBeginIndex;
-                if (length > 0)
-                {
-                    var newLength = (int) Math.Clamp(Math.Cbrt(length) - 1, 1, 4); // 27+ chars for 2 phrases, 64+ for 3, 125+ for 4.
-
-                    for (var j = 0; j < newLength; j++)
-                    {
-                        var phrase = _random.Pick(language.Replacement);
-                        builder.Append(phrase);
-                    }
-                }
-                sentenceBeginIndex = i + 1;
-
-                if (IsSentenceEnd(ch))
-                    builder.Append(ch).Append(" ");
-            }
+            comp.CurrentLanguage = comp.SpokenLanguages.FirstOrDefault(UniversalPrototype);
+            RaiseLocalEvent(entity, new LanguagesUpdateEvent());
+            return true;
         }
-    }
 
-    private static bool IsSentenceEnd(char ch)
-    {
-        return ch is '.' or '!' or '?';
+        return false;
     }
-    #endregion
 
-    #region internal api - misc
     /// <summary>
-    ///   Dynamically resolves the current language of the entity and the list of all languages it speaks.
-    ///
-    ///   If the entity is not a language speaker, or is a universal language speaker, then it's assumed to speak Universal,
-    ///   aka all languages at once and none at the same time.
+    ///     Immediately refreshes the cached lists of spoken and understood languages for the given entity.
     /// </summary>
-    /// <remarks>
-    ///   The returned event is reused and thus must not be held as a reference anywhere but inside the caller function.
-    /// </remarks>
-    private DetermineEntityLanguagesEvent GetLanguages(EntityUid speaker, LanguageSpeakerComponent? comp = null)
+    public void UpdateEntityLanguages(EntityUid entity, LanguageSpeakerComponent? languages = null)
     {
-        // This is a shortcut for ghosts and entities that should not speak normally (admemes)
-        if (HasComp<UniversalLanguageSpeakerComponent>(speaker) || !TryComp(speaker, out comp))
-            return _universalLanguagesEvent;
+        if (!Resolve(entity, ref languages))
+            return;
 
-        var ev = _determineLanguagesEvent;
-        ev.SpokenLanguages.Clear();
-        ev.UnderstoodLanguages.Clear();
+        var ev = new DetermineEntityLanguagesEvent();
+        // We add the intrinsically known languages first so other systems can manipulate them easily
+        if (TryComp<LanguageKnowledgeComponent>(entity, out var knowledge))
+        {
+            foreach (var spoken in knowledge.SpokenLanguages)
+                ev.SpokenLanguages.Add(spoken);
 
-        ev.CurrentLanguage = comp.CurrentLanguage;
-        ev.SpokenLanguages.AddRange(comp.SpokenLanguages);
-        ev.UnderstoodLanguages.AddRange(comp.UnderstoodLanguages);
+            foreach (var understood in knowledge.UnderstoodLanguages)
+                ev.UnderstoodLanguages.Add(understood);
+        }
 
-        RaiseLocalEvent(speaker, ev, true);
+        RaiseLocalEvent(entity, ref ev);
 
-        if (ev.CurrentLanguage.Length == 0)
-            ev.CurrentLanguage = !string.IsNullOrEmpty(comp.CurrentLanguage) ? comp.CurrentLanguage : UniversalPrototype; // Fall back to account for admemes like admins possessing a bread
-        return ev;
-    }
+        languages.SpokenLanguages.Clear();
+        languages.UnderstoodLanguages.Clear();
 
-    /// <summary>
-    ///   Generates a stable pseudo-random number in the range (min, max) for the given seed.
-    ///   Each input seed corresponds to exactly one random number.
-    /// </summary>
-    private int PseudoRandomNumber(int seed, int min, int max)
-    {
-        // This is not a uniform distribution, but it shouldn't matter given there's 2^31 possible random numbers,
-        //   the bias of this function should be so tiny it will never be noticed.
-        seed += RandomRoundSeed;
-        var random = ((seed * 1103515245) + 12345) & 0x7fffffff; // Source: http://cs.uccs.edu/~cs591/bufferOverflow/glibc-2.2.4/stdlib/random_r.c
-        return random % (max - min) + min;
+        languages.SpokenLanguages.AddRange(ev.SpokenLanguages);
+        languages.UnderstoodLanguages.AddRange(ev.UnderstoodLanguages);
+
+        if (!EnsureValidLanguage(entity))
+            RaiseLocalEvent(entity, new LanguagesUpdateEvent());
     }
 
-    /// <summary>
-    ///   Set CurrentLanguage of the client, the client must be able to Understand the language requested.
-    /// </summary>
-    private void OnClientSetLanguage(LanguagesSetMessage message, EntitySessionEventArgs args)
-    {
-        if (args.SenderSession.AttachedEntity is not {Valid: true} speaker)
-            return;
+    #endregion
 
-        var language = GetLanguagePrototype(message.CurrentLanguage);
+    #region event handling
 
-        if (language == null || !CanSpeak(speaker, language.ID))
-            return;
+    private void OnInitLanguageSpeaker(EntityUid uid, LanguageSpeakerComponent component, ComponentInit args)
+    {
+        if (string.IsNullOrEmpty(component.CurrentLanguage))
+            component.CurrentLanguage = component.SpokenLanguages.FirstOrDefault(UniversalPrototype);
 
-        SetLanguage(speaker, language.ID);
+        UpdateEntityLanguages(uid, component);
     }
+
     #endregion
 }
diff --git a/Content.Shared/Language/Events/LanguagesUpdateEvent.cs b/Content.Server/Language/LanguagesUpdateEvent.cs
similarity index 78%
rename from Content.Shared/Language/Events/LanguagesUpdateEvent.cs
rename to Content.Server/Language/LanguagesUpdateEvent.cs
index 90ce2f4446b..88ea09916bb 100644
--- a/Content.Shared/Language/Events/LanguagesUpdateEvent.cs
+++ b/Content.Server/Language/LanguagesUpdateEvent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Language.Events;
+namespace Content.Server.Language.Events;
 
 /// <summary>
 ///     Raised on an entity when its list of languages changes.
diff --git a/Content.Server/Language/TranslatorImplantSystem.cs b/Content.Server/Language/TranslatorImplantSystem.cs
new file mode 100644
index 00000000000..4d58144481d
--- /dev/null
+++ b/Content.Server/Language/TranslatorImplantSystem.cs
@@ -0,0 +1,66 @@
+using Content.Shared.Implants.Components;
+using Content.Shared.Language;
+using Content.Shared.Language.Components;
+using Robust.Shared.Containers;
+
+namespace Content.Server.Language;
+
+public sealed class TranslatorImplantSystem : EntitySystem
+{
+    [Dependency] private readonly LanguageSystem _language = default!;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<TranslatorImplantComponent, EntGotInsertedIntoContainerMessage>(OnImplant);
+        SubscribeLocalEvent<TranslatorImplantComponent, EntGotRemovedFromContainerMessage>(OnDeImplant);
+        SubscribeLocalEvent<ImplantedComponent, DetermineEntityLanguagesEvent>(OnDetermineLanguages);
+    }
+
+    private void OnImplant(EntityUid uid, TranslatorImplantComponent component, EntGotInsertedIntoContainerMessage args)
+    {
+        if (args.Container.ID != ImplanterComponent.ImplantSlotId)
+            return;
+
+        var implantee = Transform(uid).ParentUid;
+        if (implantee is not { Valid: true } || !TryComp<LanguageKnowledgeComponent>(implantee, out var knowledge))
+            return;
+
+        component.Enabled = true;
+        // To operate an implant, you need to know its required language intrinsically, because like... it connects to your brain or something.
+        // So external translators or other implants can't help you operate it.
+        component.SpokenRequirementSatisfied = TranslatorSystem.CheckLanguagesMatch(
+            component.RequiredLanguages, knowledge.SpokenLanguages, component.RequiresAllLanguages);
+
+        component.UnderstoodRequirementSatisfied = TranslatorSystem.CheckLanguagesMatch(
+            component.RequiredLanguages, knowledge.UnderstoodLanguages, component.RequiresAllLanguages);
+
+        _language.UpdateEntityLanguages(implantee);
+    }
+
+    private void OnDeImplant(EntityUid uid, TranslatorImplantComponent component, EntGotRemovedFromContainerMessage args)
+    {
+        // Even though the description of this event says it gets raised BEFORE reparenting, that's actually false...
+        component.Enabled = component.SpokenRequirementSatisfied = component.UnderstoodRequirementSatisfied = false;
+
+        if (TryComp<SubdermalImplantComponent>(uid, out var subdermal) && subdermal.ImplantedEntity is { Valid: true} implantee)
+            _language.UpdateEntityLanguages(implantee);
+    }
+
+    private void OnDetermineLanguages(EntityUid uid, ImplantedComponent component, ref DetermineEntityLanguagesEvent args)
+    {
+        // TODO: might wanna find a better solution, i just can't come up with something viable
+        foreach (var implant in component.ImplantContainer.ContainedEntities)
+        {
+            if (!TryComp<TranslatorImplantComponent>(implant, out var translator) || !translator.Enabled)
+                continue;
+
+            if (translator.SpokenRequirementSatisfied)
+                foreach (var language in translator.SpokenLanguages)
+                    args.SpokenLanguages.Add(language);
+
+            if (translator.UnderstoodRequirementSatisfied)
+                foreach (var language in translator.UnderstoodLanguages)
+                    args.UnderstoodLanguages.Add(language);
+        }
+    }
+}
diff --git a/Content.Server/Language/TranslatorImplanterSystem.cs b/Content.Server/Language/TranslatorImplanterSystem.cs
deleted file mode 100644
index 1e0c13375e4..00000000000
--- a/Content.Server/Language/TranslatorImplanterSystem.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-using System.Linq;
-using Content.Server.Administration.Logs;
-using Content.Server.Popups;
-using Content.Shared.Database;
-using Content.Shared.Interaction;
-using Content.Shared.Language;
-using Content.Shared.Language.Components;
-using Content.Shared.Language.Events;
-using Content.Shared.Language.Systems;
-using Content.Shared.Mobs.Components;
-using Content.Shared.Language.Components.Translators;
-
-namespace Content.Server.Language;
-
-public sealed class TranslatorImplanterSystem : SharedTranslatorImplanterSystem
-{
-    [Dependency] private readonly PopupSystem _popup = default!;
-    [Dependency] private readonly IAdminLogManager _adminLogger = default!;
-    [Dependency] private readonly LanguageSystem _language = default!;
-
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<TranslatorImplanterComponent, AfterInteractEvent>(OnImplant);
-    }
-
-
-    private void OnImplant(EntityUid implanter, TranslatorImplanterComponent component, AfterInteractEvent args)
-    {
-        if (component.Used || !args.CanReach || args.Target is not { Valid: true } target)
-            return;
-
-        if (!TryComp<LanguageSpeakerComponent>(target, out var speaker))
-            return;
-
-        if (component.MobsOnly && !HasComp<MobStateComponent>(target))
-        {
-            _popup.PopupEntity("translator-implanter-refuse", component.Owner);
-            return;
-        }
-
-        var understood = _language.GetAllLanguages(target).understood;
-        if (component.RequiredLanguages.Count > 0 && !component.RequiredLanguages.Any(lang => understood.Contains(lang)))
-        {
-            _popup.PopupEntity(Loc.GetString("translator-implanter-refuse",
-                ("implanter", implanter), ("target", target)), implanter);
-            return;
-        }
-
-        var intrinsic = EnsureComp<ImplantedTranslatorComponent>(target);
-        intrinsic.Enabled = true;
-
-        foreach (var lang in component.SpokenLanguages.Where(lang => !intrinsic.SpokenLanguages.Contains(lang)))
-            intrinsic.SpokenLanguages.Add(lang);
-
-        foreach (var lang in component.UnderstoodLanguages.Where(lang => !intrinsic.UnderstoodLanguages.Contains(lang)))
-            intrinsic.UnderstoodLanguages.Add(lang);
-
-        component.Used = true;
-        _popup.PopupEntity(Loc.GetString("translator-implanter-success",
-            ("implanter", implanter), ("target", target)), implanter);
-
-        _adminLogger.Add(LogType.Action, LogImpact.Medium,
-            $"{ToPrettyString(args.User):player} used {ToPrettyString(implanter):implanter} to give {ToPrettyString(target):target} the following languages:"
-            + $"\nSpoken: {string.Join(", ", component.SpokenLanguages)}; Understood: {string.Join(", ", component.UnderstoodLanguages)}");
-
-        OnAppearanceChange(implanter, component);
-        RaiseLocalEvent(target, new LanguagesUpdateEvent(), true);
-    }
-}
diff --git a/Content.Server/Language/TranslatorSystem.cs b/Content.Server/Language/TranslatorSystem.cs
index 3b7704b9a71..5022e540960 100644
--- a/Content.Server/Language/TranslatorSystem.cs
+++ b/Content.Server/Language/TranslatorSystem.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using Content.Server.Language.Events;
 using Content.Server.Popups;
 using Content.Server.PowerCell;
 using Content.Shared.Interaction;
@@ -8,6 +9,7 @@
 using Content.Shared.Language.Systems;
 using Content.Shared.PowerCell;
 using Content.Shared.Language.Components.Translators;
+using Robust.Shared.Utility;
 
 namespace Content.Server.Language;
 
@@ -23,7 +25,6 @@ public override void Initialize()
     {
         base.Initialize();
 
-        // I wanna die. But my death won't help us discover polymorphism.
         SubscribeLocalEvent<IntrinsicTranslatorComponent, DetermineEntityLanguagesEvent>(OnDetermineLanguages);
         SubscribeLocalEvent<HoldsTranslatorComponent, DetermineEntityLanguagesEvent>(OnDetermineLanguages);
         SubscribeLocalEvent<ImplantedTranslatorComponent, DetermineEntityLanguagesEvent>(OnDetermineLanguages);
@@ -31,67 +32,36 @@ public override void Initialize()
         SubscribeLocalEvent<HandheldTranslatorComponent, ActivateInWorldEvent>(OnTranslatorToggle);
         SubscribeLocalEvent<HandheldTranslatorComponent, PowerCellSlotEmptyEvent>(OnPowerCellSlotEmpty);
 
-        // TODO: why does this use InteractHandEvent??
         SubscribeLocalEvent<HandheldTranslatorComponent, InteractHandEvent>(OnTranslatorInteract);
         SubscribeLocalEvent<HandheldTranslatorComponent, DroppedEvent>(OnTranslatorDropped);
     }
 
-    private void OnDetermineLanguages(EntityUid uid, IntrinsicTranslatorComponent component,
-        DetermineEntityLanguagesEvent ev)
+    private void OnDetermineLanguages(EntityUid uid, IntrinsicTranslatorComponent component, DetermineEntityLanguagesEvent ev)
     {
-        if (!component.Enabled)
+        if (!component.Enabled || !TryComp<LanguageSpeakerComponent>(uid, out var speaker))
             return;
 
         if (!_powerCell.HasActivatableCharge(uid))
             return;
 
-        var addUnderstood = true;
-        var addSpoken = true;
-        if (component.RequiredLanguages.Count > 0)
-        {
-            if (component.RequiresAllLanguages)
-            {
-                // Add langs when the wielder has all of the required languages
-                foreach (var language in component.RequiredLanguages)
-                {
-                    if (!ev.SpokenLanguages.Contains(language, StringComparer.Ordinal))
-                        addSpoken = false;
-
-                    if (!ev.UnderstoodLanguages.Contains(language, StringComparer.Ordinal))
-                        addUnderstood = false;
-                }
-            }
-            else
-            {
-                // Add langs when the wielder has at least one of the required languages
-                addUnderstood = false;
-                addSpoken = false;
-                foreach (var language in component.RequiredLanguages)
-                {
-                    if (ev.SpokenLanguages.Contains(language, StringComparer.Ordinal))
-                        addSpoken = true;
-
-                    if (ev.UnderstoodLanguages.Contains(language, StringComparer.Ordinal))
-                        addUnderstood = true;
-                }
-            }
-        }
+        // The idea here is as follows:
+        // Required languages are languages that are required to operate the translator.
+        // The translator has a limited number of languages it can translate to and translate from.
+        // If the wielder understands the language of the translator, they will be able to understand translations provided by it
+        // If the wielder also speaks that language, they will be able to use it to translate their own speech by "speaking" in that language
+        var addSpoken = CheckLanguagesMatch(component.RequiredLanguages, speaker.SpokenLanguages, component.RequiresAllLanguages);
+        var addUnderstood = CheckLanguagesMatch(component.RequiredLanguages, speaker.UnderstoodLanguages, component.RequiresAllLanguages);
 
         if (addSpoken)
-        {
             foreach (var language in component.SpokenLanguages)
-                AddIfNotExists(ev.SpokenLanguages, language);
-
-            if (component.DefaultLanguageOverride != null && ev.CurrentLanguage.Length == 0)
-                ev.CurrentLanguage = component.DefaultLanguageOverride;
-        }
+                ev.SpokenLanguages.Add(language);
 
         if (addUnderstood)
             foreach (var language in component.UnderstoodLanguages)
-                AddIfNotExists(ev.UnderstoodLanguages, language);
+                ev.UnderstoodLanguages.Add(language);
     }
 
-    private void OnTranslatorInteract( EntityUid translator, HandheldTranslatorComponent component, InteractHandEvent args)
+    private void OnTranslatorInteract(EntityUid translator, HandheldTranslatorComponent component, InteractHandEvent args)
     {
         var holder = args.User;
         if (!EntityManager.HasComponent<LanguageSpeakerComponent>(holder))
@@ -100,7 +70,7 @@ private void OnTranslatorInteract( EntityUid translator, HandheldTranslatorCompo
         var intrinsic = EnsureComp<HoldsTranslatorComponent>(holder);
         UpdateBoundIntrinsicComp(component, intrinsic, component.Enabled);
 
-        RaiseLocalEvent(holder, new LanguagesUpdateEvent(), true);
+        _language.UpdateEntityLanguages(holder);
     }
 
     private void OnTranslatorDropped(EntityUid translator, HandheldTranslatorComponent component, DroppedEvent args)
@@ -115,59 +85,63 @@ private void OnTranslatorDropped(EntityUid translator, HandheldTranslatorCompone
             RemCompDeferred(holder, intrinsic);
         }
 
-        _language.EnsureValidLanguage(holder);
-
-        RaiseLocalEvent(holder, new LanguagesUpdateEvent(), true);
+        _language.UpdateEntityLanguages(holder);
     }
 
-    private void OnTranslatorToggle(EntityUid translator, HandheldTranslatorComponent component, ActivateInWorldEvent args)
+    private void OnTranslatorToggle(EntityUid translator, HandheldTranslatorComponent translatorComp, ActivateInWorldEvent args)
     {
-        if (!component.ToggleOnInteract)
+        if (!translatorComp.ToggleOnInteract)
             return;
 
+        // This will show a popup if false
         var hasPower = _powerCell.HasDrawCharge(translator);
 
         if (Transform(args.Target).ParentUid is { Valid: true } holder
-            && EntityManager.HasComponent<LanguageSpeakerComponent>(holder))
+            && TryComp<LanguageSpeakerComponent>(holder, out var languageComp))
         {
             // This translator is held by a language speaker and thus has an intrinsic counterpart bound to it.
             // Make sure it's up-to-date.
             var intrinsic = EnsureComp<HoldsTranslatorComponent>(holder);
-            var isEnabled = !component.Enabled;
-            if (intrinsic.Issuer != component)
+            var isEnabled = !translatorComp.Enabled;
+            if (intrinsic.Issuer != translatorComp)
             {
-                // The intrinsic comp wasn't owned by this handheld component, so this comp wasn't the active translator.
-                // Thus it needs to be turned on regardless of its previous state.
-                intrinsic.Issuer = component;
+                // The intrinsic comp wasn't owned by this handheld translator, so this wasn't the active translator.
+                // Thus, the intrinsic comp needs to be turned on regardless of its previous state.
+                intrinsic.Issuer = translatorComp;
                 isEnabled = true;
             }
-
             isEnabled &= hasPower;
-            UpdateBoundIntrinsicComp(component, intrinsic, isEnabled);
-            component.Enabled = isEnabled;
+
+            UpdateBoundIntrinsicComp(translatorComp, intrinsic, isEnabled);
+            translatorComp.Enabled = isEnabled;
             _powerCell.SetPowerCellDrawEnabled(translator, isEnabled);
 
-            _language.EnsureValidLanguage(holder);
-            RaiseLocalEvent(holder, new LanguagesUpdateEvent(), true);
+            // The first new spoken language added by this translator, or null
+            var firstNewLanguage = translatorComp.SpokenLanguages.FirstOrDefault(it => !languageComp.SpokenLanguages.Contains(it));
+
+            _language.UpdateEntityLanguages(holder, languageComp);
+
+            // Update the current language of the entity if necessary
+            if (isEnabled && translatorComp.SetLanguageOnInteract && firstNewLanguage is {})
+                _language.SetLanguage(holder, firstNewLanguage, languageComp);
         }
         else
         {
             // This is a standalone translator (e.g. lying on the ground), toggle its state.
-            component.Enabled = !component.Enabled && hasPower;
-            _powerCell.SetPowerCellDrawEnabled(translator, !component.Enabled && hasPower);
+            translatorComp.Enabled = !translatorComp.Enabled && hasPower;
+            _powerCell.SetPowerCellDrawEnabled(translator, !translatorComp.Enabled && hasPower);
         }
 
-        OnAppearanceChange(translator, component);
+        OnAppearanceChange(translator, translatorComp);
 
-        // HasPower shows a popup when there's no power, so we do not proceed in that case
         if (hasPower)
         {
             var message = Loc.GetString(
-                component.Enabled
+                translatorComp.Enabled
                     ? "translator-component-turnon"
                     : "translator-component-shutoff",
-                ("translator", component.Owner));
-            _popup.PopupEntity(message, component.Owner, args.User);
+                ("translator", translatorComp.Owner));
+            _popup.PopupEntity(message, translatorComp.Owner, args.User);
         }
     }
 
@@ -178,7 +152,7 @@ private void OnPowerCellSlotEmpty(EntityUid translator, HandheldTranslatorCompon
         OnAppearanceChange(translator, component);
 
         if (Transform(translator).ParentUid is { Valid: true } holder
-            && EntityManager.HasComponent<LanguageSpeakerComponent>(holder))
+            && TryComp<LanguageSpeakerComponent>(holder, out var languageComp))
         {
             if (!EntityManager.TryGetComponent<HoldsTranslatorComponent>(holder, out var intrinsic))
                 return;
@@ -186,11 +160,10 @@ private void OnPowerCellSlotEmpty(EntityUid translator, HandheldTranslatorCompon
             if (intrinsic.Issuer == component)
             {
                 intrinsic.Enabled = false;
-                EntityManager.RemoveComponent(holder, intrinsic);
+                RemComp(holder, intrinsic);
             }
 
-            _language.EnsureValidLanguage(holder);
-            RaiseLocalEvent(holder, new LanguagesUpdateEvent(), true);
+            _language.UpdateEntityLanguages(holder, languageComp);
         }
     }
 
@@ -201,25 +174,29 @@ private void UpdateBoundIntrinsicComp(HandheldTranslatorComponent comp, HoldsTra
     {
         if (isEnabled)
         {
-            intrinsic.SpokenLanguages = new List<string>(comp.SpokenLanguages);
-            intrinsic.UnderstoodLanguages = new List<string>(comp.UnderstoodLanguages);
-            intrinsic.DefaultLanguageOverride = comp.DefaultLanguageOverride;
+            intrinsic.SpokenLanguages = [..comp.SpokenLanguages];
+            intrinsic.UnderstoodLanguages = [..comp.UnderstoodLanguages];
         }
         else
         {
             intrinsic.SpokenLanguages.Clear();
             intrinsic.UnderstoodLanguages.Clear();
-            intrinsic.DefaultLanguageOverride = null;
         }
 
         intrinsic.Enabled = isEnabled;
         intrinsic.Issuer = comp;
     }
 
-    private static void AddIfNotExists(List<string> list, string item)
+    /// <summary>
+    ///     Checks whether any OR all required languages are provided. Used for utility purposes.
+    /// </summary>
+    public static bool CheckLanguagesMatch(ICollection<string> required, ICollection<string> provided, bool requireAll)
     {
-        if (list.Contains(item))
-            return;
-        list.Add(item);
+        if (required.Count == 0)
+            return true;
+
+        return requireAll
+            ? required.All(provided.Contains)
+            : required.Any(provided.Contains);
     }
 }
diff --git a/Content.Server/Mind/Commands/MakeSentientCommand.cs b/Content.Server/Mind/Commands/MakeSentientCommand.cs
index cacd499ab8d..b58d782d9c5 100644
--- a/Content.Server/Mind/Commands/MakeSentientCommand.cs
+++ b/Content.Server/Mind/Commands/MakeSentientCommand.cs
@@ -61,10 +61,11 @@ public static void MakeSentient(EntityUid uid, IEntityManager entityManager, boo
 
                 var language = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<LanguageSystem>();
                 var speaker = entityManager.EnsureComponent<LanguageSpeakerComponent>(uid);
-                // If the speaker knows any language (like monkey or robot), they keep those
-                // Otherwise, we give them the fallback
+
+                // If the entity already speaks some language (like monkey or robot), we do nothing else
+                // Otherwise, we give them the fallback language
                 if (speaker.SpokenLanguages.Count == 0)
-                    language.AddLanguage(speaker, SharedLanguageSystem.FallbackLanguagePrototype);
+                    language.AddLanguage(uid, SharedLanguageSystem.FallbackLanguagePrototype);
             }
 
             entityManager.EnsureComponent<ExaminerComponent>(uid);
diff --git a/Content.Server/Nyanotrasen/Carrying/CarryingSystem.cs b/Content.Server/Nyanotrasen/Carrying/CarryingSystem.cs
index bb071334fa1..103731b1b04 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 76cfe7d904b..6df387e6ba8 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/Item/ShockCollar/ShockCollarSystem.cs b/Content.Server/Nyanotrasen/Item/ShockCollar/ShockCollarSystem.cs
index 4b24f45401a..70e5ee65abd 100644
--- a/Content.Server/Nyanotrasen/Item/ShockCollar/ShockCollarSystem.cs
+++ b/Content.Server/Nyanotrasen/Item/ShockCollar/ShockCollarSystem.cs
@@ -33,7 +33,7 @@ private void OnTrigger(EntityUid uid, ShockCollarComponent component, TriggerEve
             && !_useDelay.TryResetDelay((uid, useDelay), true))
             return;
 
-        _electrocutionSystem.TryDoElectrocution(containerEnt, null, 5, TimeSpan.FromSeconds(2), true);
+        _electrocutionSystem.TryDoElectrocution(containerEnt, null, 1, TimeSpan.FromSeconds(2), true);
     }
 }
 
diff --git a/Content.Server/OfferItem/OfferItemSystem.cs b/Content.Server/OfferItem/OfferItemSystem.cs
new file mode 100644
index 00000000000..420df71ace7
--- /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/Radio/EntitySystems/HeadsetSystem.cs b/Content.Server/Radio/EntitySystems/HeadsetSystem.cs
index 53517da6cb4..2500138a238 100644
--- a/Content.Server/Radio/EntitySystems/HeadsetSystem.cs
+++ b/Content.Server/Radio/EntitySystems/HeadsetSystem.cs
@@ -106,7 +106,7 @@ private void OnHeadsetReceive(EntityUid uid, HeadsetComponent component, ref Rad
         var parent = Transform(uid).ParentUid;
         if (TryComp(parent, out ActorComponent? actor))
         {
-            var canUnderstand = _language.CanUnderstand(parent, args.Language);
+            var canUnderstand = _language.CanUnderstand(parent, args.Language.ID);
             var msg = new MsgChatMessage
             {
                 Message = canUnderstand ? args.OriginalChatMsg : args.LanguageObfuscatedChatMsg
diff --git a/Content.Server/Radio/EntitySystems/RadioSystem.cs b/Content.Server/Radio/EntitySystems/RadioSystem.cs
index 60aa7c2f4fb..bfdd49213ee 100644
--- a/Content.Server/Radio/EntitySystems/RadioSystem.cs
+++ b/Content.Server/Radio/EntitySystems/RadioSystem.cs
@@ -60,7 +60,7 @@ private void OnIntrinsicReceive(EntityUid uid, IntrinsicRadioReceiverComponent c
             // Einstein-Engines - languages mechanic
             var listener = component.Owner;
             var msg = args.OriginalChatMsg;
-            if (listener != null && !_language.CanUnderstand(listener, args.Language))
+            if (listener != null && !_language.CanUnderstand(listener, args.Language.ID))
                 msg = args.LanguageObfuscatedChatMsg;
 
             _netMan.ServerSendMessage(new MsgChatMessage { Message = msg}, actor.PlayerSession.Channel);
@@ -115,12 +115,12 @@ public void SendRadioMessage(EntityUid messageSource, string message, RadioChann
             ? FormattedMessage.EscapeText(message)
             : message;
 
-        var wrappedMessage = WrapRadioMessage(messageSource, channel, name, content);
+        var wrappedMessage = WrapRadioMessage(messageSource, channel, name, content, language);
         var msg = new ChatMessage(ChatChannel.Radio, content, wrappedMessage, NetEntity.Invalid, null);
 
         // ... you guess it
         var obfuscated = _language.ObfuscateSpeech(content, language);
-        var obfuscatedWrapped = WrapRadioMessage(messageSource, channel, name, obfuscated);
+        var obfuscatedWrapped = WrapRadioMessage(messageSource, channel, name, obfuscated, language);
         var notUdsMsg = new ChatMessage(ChatChannel.Radio, obfuscated, obfuscatedWrapped, NetEntity.Invalid, null);
 
         var ev = new RadioReceiveEvent(messageSource, channel, msg, notUdsMsg, language);
@@ -173,17 +173,18 @@ public void SendRadioMessage(EntityUid messageSource, string message, RadioChann
         _messages.Remove(message);
     }
 
-    private string WrapRadioMessage(EntityUid source, RadioChannelPrototype channel, string name, string message)
+    private string WrapRadioMessage(EntityUid source, RadioChannelPrototype channel, string name, string message, LanguagePrototype language)
     {
         var speech = _chat.GetSpeechVerb(source, message);
         return Loc.GetString(speech.Bold ? "chat-radio-message-wrap-bold" : "chat-radio-message-wrap",
             ("color", channel.Color),
-            ("fontType", speech.FontId),
-            ("fontSize", speech.FontSize),
+            ("languageColor", language.Color ?? channel.Color),
+            ("fontType", language.FontId ?? speech.FontId),
+            ("fontSize", language.FontSize ?? speech.FontSize),
             ("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 19b4abf7d0c..978e03d95f9 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 127db7d2b34..95a470e9093 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 00000000000..f499127031e
--- /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 3b38b65a19d..686570f7dca 100644
--- a/Content.Server/Strip/StrippableSystem.cs
+++ b/Content.Server/Strip/StrippableSystem.cs
@@ -36,6 +36,7 @@ public sealed class StrippableSystem : SharedStrippableSystem
         [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.
 
@@ -251,15 +252,17 @@ private void StartStripInsertInventory(
 
             var (time, stealth) = GetStripTimeModifiers(user, target, slotDef.StripTime);
 
-            if (!stealth)
-                _popupSystem.PopupEntity(Loc.GetString("strippable-component-alert-owner-insert", ("user", Identity.Entity(user, EntityManager)), ("item", user.Comp.ActiveHandEntity!.Value)), target, target, PopupType.Large);
+            bool hidden = stealth == ThievingStealth.Hidden;
 
-            var prefix = stealth ? "stealthily " : "";
+            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, time, new StrippableDoAfterEvent(true, true, slot), user, target, held)
             {
-                Hidden = stealth,
+                Hidden = hidden,
                 AttemptFrequency = AttemptFrequency.EveryTick,
                 BreakOnDamage = true,
                 BreakOnTargetMove = true,
@@ -340,20 +343,22 @@ private void StartStripRemoveInventory(
 
             var (time, stealth) = GetStripTimeModifiers(user, target, slotDef.StripTime);
 
-            if (!stealth)
+            bool hidden = stealth == ThievingStealth.Hidden;
+
+            if (!hidden)
             {
                 if (slotDef.StripHidden)
-                    _popupSystem.PopupEntity(Loc.GetString("strippable-component-alert-owner-hidden", ("slot", slot)), target, target, PopupType.Large);
+                    StripPopup("strippable-component-alert-owner-hidden", stealth, target, slot: slot);
                 else
-                    _popupSystem.PopupEntity(Loc.GetString("strippable-component-alert-owner", ("user", Identity.Entity(user, EntityManager)), ("item", item)), target, target, PopupType.Large);
+                    StripPopup("strippable-component-alert-owner", stealth, target, user: Identity.Entity(user, EntityManager), item: item);
             }
 
-            var prefix = stealth ? "stealthily " : "";
+            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, time, new StrippableDoAfterEvent(false, true, slot), user, target, item)
             {
-                Hidden = stealth,
+                Hidden = hidden,
                 AttemptFrequency = AttemptFrequency.EveryTick,
                 BreakOnDamage = true,
                 BreakOnTargetMove = true,
@@ -374,7 +379,7 @@ private void StripRemoveInventory(
             EntityUid target,
             EntityUid item,
             string slot,
-            bool stealth)
+            bool hidden)
         {
             if (!CanStripRemoveInventory(user, target, item, slot))
                 return;
@@ -384,7 +389,7 @@ private void StripRemoveInventory(
 
             RaiseLocalEvent(item, new DroppedEvent(user), true); // Gas tank internals etc.
 
-            _handsSystem.PickupOrDrop(user, item, animateUser: stealth, animate: stealth);
+            _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");
         }
 
@@ -446,12 +451,14 @@ private void StartStripInsertHand(
 
             var (time, stealth) = GetStripTimeModifiers(user, target, targetStrippable.HandStripDelay);
 
-            var prefix = stealth ? "stealthily " : "";
+            bool hidden = stealth == ThievingStealth.Hidden;
+
+            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)
             {
-                Hidden = stealth,
+                Hidden = hidden,
                 AttemptFrequency = AttemptFrequency.EveryTick,
                 BreakOnDamage = true,
                 BreakOnTargetMove = true,
@@ -471,7 +478,7 @@ private void StripInsertHand(
             Entity<HandsComponent?> target,
             EntityUid held,
             string handName,
-            bool stealth)
+            bool hidden)
         {
             if (!Resolve(user, ref user.Comp) ||
                 !Resolve(target, ref target.Comp))
@@ -481,7 +488,7 @@ private void StripInsertHand(
                 return;
 
             _handsSystem.TryDrop(user, checkActionBlocker: false, handsComp: user.Comp);
-            _handsSystem.TryPickup(target, held, handName, checkActionBlocker: false, animateUser: stealth, animate: stealth, handsComp: target.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.
@@ -543,15 +550,17 @@ private void StartStripRemoveHand(
 
             var (time, stealth) = GetStripTimeModifiers(user, target, targetStrippable.HandStripDelay);
 
-            if (!stealth)
-                _popupSystem.PopupEntity(Loc.GetString("strippable-component-alert-owner", ("user", Identity.Entity(user, EntityManager)), ("item", item)), target, target);
+            bool hidden = stealth == ThievingStealth.Hidden;
+
+            if (!hidden)
+                StripPopup("strippable-component-alert-owner", stealth, target, user: Identity.Entity(user, EntityManager), item: item);
 
-            var prefix = stealth ? "stealthily " : "";
+            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)
             {
-                Hidden = stealth,
+                Hidden = hidden,
                 AttemptFrequency = AttemptFrequency.EveryTick,
                 BreakOnDamage = true,
                 BreakOnTargetMove = true,
@@ -572,7 +581,7 @@ private void StripRemoveHand(
             Entity<HandsComponent?> target,
             EntityUid item,
             string handName,
-            bool stealth)
+            bool hidden)
         {
             if (!Resolve(user, ref user.Comp) ||
                 !Resolve(target, ref target.Comp))
@@ -582,7 +591,7 @@ private void StripRemoveHand(
                 return;
 
             _handsSystem.TryDrop(target, item, checkActionBlocker: false, handsComp: target.Comp);
-            _handsSystem.PickupOrDrop(user, item, animateUser: stealth, animate: stealth, handsComp: user.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.
diff --git a/Content.Shared/Alert/AlertType.cs b/Content.Shared/Alert/AlertType.cs
index b917dd692d7..941e908db6d 100644
--- a/Content.Shared/Alert/AlertType.cs
+++ b/Content.Shared/Alert/AlertType.cs
@@ -52,7 +52,8 @@ public enum AlertType : byte
         SuitPower,
         BorgHealth,
         BorgCrit,
-        BorgDead
+        BorgDead,
+        Offer,
     }
 
 }
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index 1ae78102cef..4486ff1883c 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/Chat/ChatChannel.cs b/Content.Shared/Chat/ChatChannel.cs
index d87fcbc075e..e80dcd82697 100644
--- a/Content.Shared/Chat/ChatChannel.cs
+++ b/Content.Shared/Chat/ChatChannel.cs
@@ -4,7 +4,7 @@ namespace Content.Shared.Chat
     ///     Represents chat channels that the player can filter chat tabs by.
     /// </summary>
     [Flags]
-    public enum ChatChannel : ushort
+    public enum ChatChannel : UInt32
     {
         None = 0,
 
@@ -90,10 +90,15 @@ public enum ChatChannel : ushort
         /// </summary>
         Telepathic = 1 << 15,
 
+        /// <summary>
+        ///     Subtle - Floofstation
+        /// </summary>
+        Subtle = 1 << 16,
+
         /// <summary>
         ///     Channels considered to be IC.
         /// </summary>
-        IC = Local | Whisper | Radio | Dead | Emotes | Damage | Visual | Telepathic | Notifications, //Nyano - Summary: Adds telepathic as an 'IC' labelled chat..
+        IC = Local | Whisper | Radio | Dead | Emotes | Subtle | Damage | Visual | Telepathic | Notifications, //Nyano - Summary: Adds telepathic as an 'IC' labelled chat..
 
         AdminRelated = Admin | AdminAlert | AdminChat,
     }
diff --git a/Content.Shared/Chat/ChatSelectChannel.cs b/Content.Shared/Chat/ChatSelectChannel.cs
index 5104bbc3068..16b7f61c41b 100644
--- a/Content.Shared/Chat/ChatSelectChannel.cs
+++ b/Content.Shared/Chat/ChatSelectChannel.cs
@@ -7,7 +7,7 @@
     ///     Maps to <see cref="ChatChannel"/>, giving better names.
     /// </remarks>
     [Flags]
-    public enum ChatSelectChannel : ushort
+    public enum ChatSelectChannel : UInt32
     {
         None = 0,
 
@@ -41,6 +41,11 @@ public enum ChatSelectChannel : ushort
         /// </summary>
         Emotes = ChatChannel.Emotes,
 
+        /// <summary>
+        ///     Subtle - Floofstation
+        /// </summary>
+        Subtle = ChatChannel.Subtle,
+
         /// <summary>
         ///     Deadchat
         /// </summary>
@@ -52,7 +57,7 @@ public enum ChatSelectChannel : ushort
         Admin = ChatChannel.AdminChat,
 
         /// <summary>
-        ///     Nyano - Summary:. Telepathic channel for all psionic entities. 
+        ///     Nyano - Summary:. Telepathic channel for all psionic entities.
         /// </summary>
         Telepathic = ChatChannel.Telepathic,
 
diff --git a/Content.Shared/Chat/SharedChatSystem.cs b/Content.Shared/Chat/SharedChatSystem.cs
index 8d14adcc24b..9904e4b5254 100644
--- a/Content.Shared/Chat/SharedChatSystem.cs
+++ b/Content.Shared/Chat/SharedChatSystem.cs
@@ -19,9 +19,10 @@ public abstract class SharedChatSystem : EntitySystem
     public const char OOCPrefix = '[';
     public const char EmotesPrefix = '@';
     public const char EmotesAltPrefix = '*';
+    public const char SubtlePrefix = '-';
     public const char AdminPrefix = ']';
     public const char WhisperPrefix = ',';
-    public const char TelepathicPrefix = '='; //Nyano - Summary: Adds the telepathic channel's prefix.  
+    public const char TelepathicPrefix = '='; //Nyano - Summary: Adds the telepathic channel's prefix.
     public const char DefaultChannelKey = 'h';
 
     [ValidatePrototypeId<RadioChannelPrototype>]
diff --git a/Content.Shared/Clothing/EntitySystems/ToggleableClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/ToggleableClothingSystem.cs
index 22a1d1a8f52..4abe7bc876a 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()
     {
@@ -97,6 +98,8 @@ private void StartDoAfter(EntityUid user, EntityUid item, EntityUid wearer, Togg
 
         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)
         {
             BreakOnDamage = true,
@@ -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/Input/ContentKeyFunctions.cs b/Content.Shared/Input/ContentKeyFunctions.cs
index 2940089746b..66f72e77b25 100644
--- a/Content.Shared/Input/ContentKeyFunctions.cs
+++ b/Content.Shared/Input/ContentKeyFunctions.cs
@@ -55,6 +55,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/Language/Components/LanguageKnowledgeComponent.cs b/Content.Shared/Language/Components/LanguageKnowledgeComponent.cs
new file mode 100644
index 00000000000..0632f5d9cb2
--- /dev/null
+++ b/Content.Shared/Language/Components/LanguageKnowledgeComponent.cs
@@ -0,0 +1,22 @@
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
+
+namespace Content.Shared.Language.Components;
+
+/// <summary>
+///     Stores data about entities' intrinsic language knowledge.
+/// </summary>
+[RegisterComponent]
+public sealed partial class LanguageKnowledgeComponent : Component
+{
+    /// <summary>
+    ///     List of languages this entity can speak without any external tools.
+    /// </summary>
+    [DataField("speaks", customTypeSerializer: typeof(PrototypeIdListSerializer<LanguagePrototype>), required: true)]
+    public List<string> SpokenLanguages = new();
+
+    /// <summary>
+    ///     List of languages this entity can understand without any external tools.
+    /// </summary>
+    [DataField("understands", customTypeSerializer: typeof(PrototypeIdListSerializer<LanguagePrototype>), required: true)]
+    public List<string> UnderstoodLanguages = new();
+}
diff --git a/Content.Shared/Language/Components/LanguageSpeakerComponent.cs b/Content.Shared/Language/Components/LanguageSpeakerComponent.cs
index 95232ffe6ff..e8ebccb3ddf 100644
--- a/Content.Shared/Language/Components/LanguageSpeakerComponent.cs
+++ b/Content.Shared/Language/Components/LanguageSpeakerComponent.cs
@@ -1,29 +1,32 @@
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
-
 namespace Content.Shared.Language;
 
-[RegisterComponent, AutoGenerateComponentState]
+// TODO: either move all language speaker-related components to server side, or make everything else shared.
+// The current approach leads to confusion, as the server never informs the client of updates in these components.
+
+/// <summary>
+///     Stores the current state of the languages the entity can speak and understand.
+/// </summary>
+/// <remarks>
+///     All fields of this component are populated during a DetermineEntityLanguagesEvent.
+///     They are not to be modified externally.
+/// </remarks>
+[RegisterComponent]
 public sealed partial class LanguageSpeakerComponent : Component
 {
     /// <summary>
-    ///     The current language the entity may use to speak.
+    ///     The current language the entity uses when speaking.
     ///     Other listeners will hear the entity speak in this language.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    [AutoNetworkedField]
-    public string CurrentLanguage = default!;
+    [DataField]
+    public string CurrentLanguage = ""; // The language system will override it on init  
 
     /// <summary>
-    ///     List of languages this entity can speak.
+    ///     List of languages this entity can speak at the current moment.
     /// </summary>
-    [ViewVariables]
-    [DataField("speaks", customTypeSerializer: typeof(PrototypeIdListSerializer<LanguagePrototype>), required: true)]
-    public List<string> SpokenLanguages = new();
+    public List<string> SpokenLanguages = [];
 
     /// <summary>
-    ///     List of languages this entity can understand.
+    ///     List of languages this entity can understand at the current moment.
     /// </summary>
-    [ViewVariables]
-    [DataField("understands", customTypeSerializer: typeof(PrototypeIdListSerializer<LanguagePrototype>), required: true)]
-    public List<string> UnderstoodLanguages = new();
+    public List<string> UnderstoodLanguages = [];
 }
diff --git a/Content.Shared/Language/Components/TranslatorImplantComponent.cs b/Content.Shared/Language/Components/TranslatorImplantComponent.cs
new file mode 100644
index 00000000000..cb8c666c82f
--- /dev/null
+++ b/Content.Shared/Language/Components/TranslatorImplantComponent.cs
@@ -0,0 +1,21 @@
+using Content.Shared.Language.Components.Translators;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
+
+namespace Content.Shared.Language.Components;
+
+/// <summary>
+///     An implant that allows the implantee to speak and understand other languages.
+/// </summary>
+[RegisterComponent]
+public sealed partial class TranslatorImplantComponent : BaseTranslatorComponent
+{
+    /// <summary>
+    ///     Whether the implantee knows the languages necessary to speak using this implant.
+    /// </summary>
+    public bool SpokenRequirementSatisfied = false;
+
+    /// <summary>
+    ///     Whether the implantee knows the languages necessary to understand translations of this implant.
+    /// </summary>
+    public bool UnderstoodRequirementSatisfied = false;
+}
diff --git a/Content.Shared/Language/Components/TranslatorImplanterComponent.cs b/Content.Shared/Language/Components/TranslatorImplanterComponent.cs
deleted file mode 100644
index 401e8a8b8aa..00000000000
--- a/Content.Shared/Language/Components/TranslatorImplanterComponent.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
-
-namespace Content.Shared.Language.Components;
-
-/// <summary>
-///   An item that, when used on a mob, adds an intrinsic translator to it.
-/// </summary>
-[RegisterComponent]
-public sealed partial class TranslatorImplanterComponent : Component
-{
-    [DataField("spoken", customTypeSerializer: typeof(PrototypeIdListSerializer<LanguagePrototype>))]
-    public List<string> SpokenLanguages = new();
-
-    [DataField("understood", customTypeSerializer: typeof(PrototypeIdListSerializer<LanguagePrototype>))]
-    public List<string> UnderstoodLanguages = new();
-
-    /// <summary>
-    ///   The list of languages the mob must understand in order for this translator to have effect.
-    ///   Knowing one language is enough.
-    /// </summary>
-    [DataField("requires", customTypeSerializer: typeof(PrototypeIdListSerializer<LanguagePrototype>))]
-    public List<string> RequiredLanguages = new();
-
-    /// <summary>
-    ///   If true, only allows to use this implanter on mobs.
-    /// </summary>
-    [DataField]
-    public bool MobsOnly = true;
-
-    /// <summary>
-    ///   Whether this implant has been used already.
-    /// </summary>
-    [DataField]
-    public bool Used = false;
-}
diff --git a/Content.Shared/Language/Components/Translators/BaseTranslatorComponent.cs b/Content.Shared/Language/Components/Translators/BaseTranslatorComponent.cs
index a66c9be082e..072480031d5 100644
--- a/Content.Shared/Language/Components/Translators/BaseTranslatorComponent.cs
+++ b/Content.Shared/Language/Components/Translators/BaseTranslatorComponent.cs
@@ -4,15 +4,6 @@ namespace Content.Shared.Language.Components.Translators;
 
 public abstract partial class BaseTranslatorComponent : Component
 {
-    // TODO may need to be removed completely, it's a part of legacy code that never ended up being used.
-    /// <summary>
-    ///   The language this translator changes the speaker's language to when they don't specify one.
-    ///   If null, does not modify the default language.
-    /// </summary>
-    [DataField("defaultLanguage")]
-    [ViewVariables(VVAccess.ReadWrite)]
-    public string? DefaultLanguageOverride = null;
-
     /// <summary>
     ///   The list of additional languages this translator allows the wielder to speak.
     /// </summary>
diff --git a/Content.Shared/Language/Components/Translators/HandheldTranslatorComponent.cs b/Content.Shared/Language/Components/Translators/HandheldTranslatorComponent.cs
index f900603f01d..7e3de0eca61 100644
--- a/Content.Shared/Language/Components/Translators/HandheldTranslatorComponent.cs
+++ b/Content.Shared/Language/Components/Translators/HandheldTranslatorComponent.cs
@@ -7,9 +7,18 @@ namespace Content.Shared.Language.Components.Translators;
 public sealed partial class HandheldTranslatorComponent : Translators.BaseTranslatorComponent
 {
     /// <summary>
-    ///   Whether or not interacting with this translator
-    ///   toggles it on or off.
+    ///   Whether interacting with this translator toggles it on and off.
     /// </summary>
-    [DataField("toggleOnInteract")]
+    [DataField]
     public bool ToggleOnInteract = true;
+
+    /// <summary>
+    ///     If true, when this translator is turned on, the entities' current spoken language will be set
+    ///     to the first new language added by this translator.
+    /// </summary>
+    /// <remarks>
+    ///      This should generally be used for translators that translate speech between two languages.
+    /// </remarks>
+    [DataField]
+    public bool SetLanguageOnInteract = true;
 }
diff --git a/Content.Shared/Language/LanguagePrototype.cs b/Content.Shared/Language/LanguagePrototype.cs
index 801ab8a393b..be54b45aa1f 100644
--- a/Content.Shared/Language/LanguagePrototype.cs
+++ b/Content.Shared/Language/LanguagePrototype.cs
@@ -1,4 +1,3 @@
-using System.Runtime.CompilerServices;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Language;
@@ -9,19 +8,20 @@ public sealed class LanguagePrototype : IPrototype
     [IdDataField]
     public string ID { get; private set;  } = default!;
 
-    /// <summary>
-    ///     If true, obfuscated phrases of creatures speaking this language will have their syllables replaced with "replacement" syllables.
-    ///     Otherwise entire sentences will be replaced.
-    /// </summary>
-    [DataField(required: true)]
-    public bool ObfuscateSyllables;
+    [DataField("color")]
+    public Color? Color;
+
+    [DataField("fontId")]
+    public string? FontId;
 
+    [DataField("fontSize")]
+    public int? FontSize;
+    
     /// <summary>
-    ///     Lists all syllables that are used to obfuscate a message a listener cannot understand if obfuscateSyllables is true.
-    ///     Otherwise uses all possible phrases the creature can make when trying to say anything.
+    ///     Obfuscation method used by this language. By default, uses <see cref="ObfuscationMethod.Default"/>
     /// </summary>
-    [DataField(required: true)]
-    public List<string> Replacement = [];
+    [DataField("obfuscation")]
+    public ObfuscationMethod Obfuscation = ObfuscationMethod.Default;
 
     #region utility
     /// <summary>
diff --git a/Content.Shared/Language/ObfuscationMethods.cs b/Content.Shared/Language/ObfuscationMethods.cs
new file mode 100644
index 00000000000..51230c47970
--- /dev/null
+++ b/Content.Shared/Language/ObfuscationMethods.cs
@@ -0,0 +1,184 @@
+using System.Text;
+using Content.Shared.Language.Systems;
+
+namespace Content.Shared.Language;
+
+[ImplicitDataDefinitionForInheritors]
+public abstract partial class ObfuscationMethod
+{
+    /// <summary>
+    ///     The fallback obfuscation method, replaces the message with the string "&lt;?&gt;".
+    /// </summary>
+    public static readonly ObfuscationMethod Default = new ReplacementObfuscation
+    {
+        Replacement = new List<string> { "<?>" }
+    };
+
+    /// <summary>
+    ///     Obfuscates the provided message and writes the result into the provided StringBuilder.
+    ///     Implementations should use the context's pseudo-random number generator and provide stable obfuscations.
+    /// </summary>
+    internal abstract void Obfuscate(StringBuilder builder, string message, SharedLanguageSystem context);
+
+    /// <summary>
+    ///     Obfuscates the provided message. This method should only be used for debugging purposes.
+    ///     For all other purposes, use <see cref="SharedLanguageSystem.ObfuscateSpeech"/> instead.
+    /// </summary>
+    public string Obfuscate(string message)
+    {
+        var builder = new StringBuilder();
+        Obfuscate(builder, message, IoCManager.Resolve<EntitySystemManager>().GetEntitySystem<SharedLanguageSystem>());
+        return builder.ToString();
+    }
+}
+
+/// <summary>
+///     The most primitive method of obfuscation - replaces the entire message with one random replacement phrase.
+///     Similar to ReplacementAccent. Base for all replacement-based obfuscation methods.
+/// </summary>
+public partial class ReplacementObfuscation : ObfuscationMethod
+{
+    /// <summary>
+    ///     A list of replacement phrases used in the obfuscation process.
+    /// </summary>
+    [DataField(required: true)]
+    public List<string> Replacement = [];
+
+    internal override void Obfuscate(StringBuilder builder, string message, SharedLanguageSystem context)
+    {
+        var idx = context.PseudoRandomNumber(message.GetHashCode(), 0, Replacement.Count - 1);
+        builder.Append(Replacement[idx]);
+    }
+}
+
+/// <summary>
+///     Obfuscates the provided message by replacing each word with a random number of syllables in the range (min, max),
+///     preserving the original punctuation to a resonable extent.
+/// </summary>
+/// <remarks>
+///     The words are obfuscated in a stable manner, such that every particular word will be obfuscated the same way throughout one round.
+///     This means that particular words can be memorized within a round, but not across rounds.
+/// </remarks>
+public sealed partial class SyllableObfuscation : ReplacementObfuscation
+{
+    [DataField]
+    public int MinSyllables = 1;
+
+    [DataField]
+    public int MaxSyllables = 4;
+
+    internal override void Obfuscate(StringBuilder builder, string message, SharedLanguageSystem context)
+    {
+        const char eof = (char) 0; // Special character to mark the end of the message in the code below
+
+        var wordBeginIndex = 0;
+        var hashCode = 0;
+
+        for (var i = 0; i <= message.Length; i++)
+        {
+            var ch = i < message.Length ? char.ToLower(message[i]) : eof;
+            var isWordEnd = char.IsWhiteSpace(ch) || IsPunctuation(ch) || ch == eof;
+
+            // If this is a normal char, add it to the hash sum
+            if (!isWordEnd)
+                hashCode = hashCode * 31 + ch;
+
+            // If a word ends before this character, construct a new word and append it to the new message.
+            if (isWordEnd)
+            {
+                var wordLength = i - wordBeginIndex;
+                if (wordLength > 0)
+                {
+                    var newWordLength = context.PseudoRandomNumber(hashCode, MinSyllables, MaxSyllables);
+
+                    for (var j = 0; j < newWordLength; j++)
+                    {
+                        var index = context.PseudoRandomNumber(hashCode + j, 0, Replacement.Count - 1);
+                        builder.Append(Replacement[index]);
+                    }
+                }
+
+                hashCode = 0;
+                wordBeginIndex = i + 1;
+            }
+
+            // If this message concludes a word (i.e. is a whitespace or a punctuation mark), append it to the message
+            if (isWordEnd && ch != eof)
+                builder.Append(ch);
+        }
+    }
+
+    private static bool IsPunctuation(char ch)
+    {
+        return ch is '.' or '!' or '?' or ',' or ':';
+    }
+}
+
+/// <summary>
+///     Obfuscates each sentence in the message by concatenating a number of obfuscation phrases.
+///     The number of phrases in the obfuscated message is proportional to the length of the original message.
+/// </summary>
+public sealed partial class PhraseObfuscation : ReplacementObfuscation
+{
+    [DataField]
+    public int MinPhrases = 1;
+
+    [DataField]
+    public int MaxPhrases = 4;
+
+    /// <summary>
+    ///     A string used to separate individual phrases within one sentence. Default is a space.
+    /// </summary>
+    [DataField]
+    public string Separator = " ";
+
+    /// <summary>
+    ///     A power to which the number of characters in the original message is raised to determine the number of phrases in the result.
+    ///     Default is 1/3, i.e. the cubic root of the original number.
+    /// </summary>
+    /// <remarks>
+    ///     Using the default proportion, you will need at least 27 characters for 2 phrases, at least 64 for 3, at least 125 for 4, etc.
+    ///     Increasing the proportion to 1/4 will result in the numbers changing to 81, 256, 625, etc.
+    /// </remarks>
+    [DataField]
+    public float Proportion = 1f / 3;
+
+    internal override void Obfuscate(StringBuilder builder, string message, SharedLanguageSystem context)
+    {
+        var sentenceBeginIndex = 0;
+        var hashCode = 0;
+
+        for (var i = 0; i < message.Length; i++)
+        {
+            var ch = char.ToLower(message[i]);
+            if (!IsPunctuation(ch) && i != message.Length - 1)
+            {
+                hashCode = hashCode * 31 + ch;
+                continue;
+            }
+
+            var length = i - sentenceBeginIndex;
+            if (length > 0)
+            {
+                var newLength = (int) Math.Clamp(Math.Pow(length, Proportion) - 1, MinPhrases, MaxPhrases);
+
+                for (var j = 0; j < newLength; j++)
+                {
+                    var phraseIdx = context.PseudoRandomNumber(hashCode + j, 0, Replacement.Count - 1);
+                    var phrase = Replacement[phraseIdx];
+                    builder.Append(phrase);
+                    builder.Append(Separator);
+                }
+            }
+            sentenceBeginIndex = i + 1;
+
+            if (IsPunctuation(ch))
+                builder.Append(ch).Append(' '); // TODO: this will turn '...' into '. . . '
+        }
+    }
+
+    private static bool IsPunctuation(char ch)
+    {
+        return ch is '.' or '!' or '?'; // Doesn't include mid-sentence punctuation like the comma
+    }
+}
diff --git a/Content.Shared/Language/Systems/SharedLanguageSystem.cs b/Content.Shared/Language/Systems/SharedLanguageSystem.cs
index e2eeb8bb493..0a03086ebe1 100644
--- a/Content.Shared/Language/Systems/SharedLanguageSystem.cs
+++ b/Content.Shared/Language/Systems/SharedLanguageSystem.cs
@@ -1,6 +1,6 @@
-using Content.Shared.Actions;
+using System.Text;
+using Content.Shared.GameTicking;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
 
 namespace Content.Shared.Language.Systems;
 
@@ -24,7 +24,7 @@ public abstract class SharedLanguageSystem : EntitySystem
     public static LanguagePrototype Universal { get; private set; } = default!;
 
     [Dependency] protected readonly IPrototypeManager _prototype = default!;
-    [Dependency] protected readonly IRobustRandom _random = default!;
+    [Dependency] protected readonly SharedGameTicker _ticker = default!;
 
     public override void Initialize()
     {
@@ -36,4 +36,32 @@ public override void Initialize()
         _prototype.TryIndex<LanguagePrototype>(id, out var proto);
         return proto;
     }
+
+    /// <summary>
+    ///     Obfuscate a message using the given language.
+    /// </summary>
+    public string ObfuscateSpeech(string message, LanguagePrototype language)
+    {
+        var builder = new StringBuilder();
+        var method = language.Obfuscation;
+        method.Obfuscate(builder, message, this);
+
+        return builder.ToString();
+    }
+
+    /// <summary>
+    ///     Generates a stable pseudo-random number in the range (min, max) (inclusively) for the given seed.
+    ///     One seed always corresponds to one number, however the resulting number also depends on the current round number.
+    ///     This method is meant to be used in <see cref="ObfuscationMethod"/> to provide stable obfuscation.
+    /// </summary>
+    internal int PseudoRandomNumber(int seed, int min, int max)
+    {
+        // Using RobustRandom or System.Random here is a bad idea because this method can get called hundreds of times per message.
+        // Each call would require us to allocate a new instance of random, which would lead to lots of unnecessary calculations.
+        // Instead, we use a simple but effective algorithm derived from the C language.
+        // It does not produce a truly random number, but for the purpose of obfuscating messages in an RP-based game it's more than alright.
+        seed = seed ^ (_ticker.RoundId * 127);
+        var random = seed * 1103515245 + 12345;
+        return min + Math.Abs(random) % (max - min + 1);
+    }
 }
diff --git a/Content.Shared/Language/Systems/SharedTranslatorImplanterSystem.cs b/Content.Shared/Language/Systems/SharedTranslatorImplanterSystem.cs
deleted file mode 100644
index a13225378cd..00000000000
--- a/Content.Shared/Language/Systems/SharedTranslatorImplanterSystem.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using Content.Shared.Examine;
-using Content.Shared.Implants.Components;
-using Content.Shared.Language.Components;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Language.Systems;
-
-public abstract class SharedTranslatorImplanterSystem : EntitySystem
-{
-    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<TranslatorImplanterComponent, ExaminedEvent>(OnExamined);
-    }
-
-    private void OnExamined(EntityUid uid, TranslatorImplanterComponent component, ExaminedEvent args)
-    {
-        if (!args.IsInDetailsRange)
-            return;
-
-        var text = !component.Used
-            ? Loc.GetString("translator-implanter-ready")
-            : Loc.GetString("translator-implanter-used");
-
-        args.PushText(text);
-    }
-
-    protected void OnAppearanceChange(EntityUid implanter, TranslatorImplanterComponent component)
-    {
-        var used = component.Used;
-        _appearance.SetData(implanter, ImplanterVisuals.Full, !used);
-    }
-}
diff --git a/Content.Shared/Nyanotrasen/Item/PseudoItem/AllowsSleepInsideComponent.cs b/Content.Shared/Nyanotrasen/Item/PseudoItem/AllowsSleepInsideComponent.cs
new file mode 100644
index 00000000000..a28c7698fcd
--- /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 d3774439d36..458b514b969 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 7000c654048..906503b3707 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 4b7910746f1..5f4e6184346 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 00000000000..eb4d84932e5
--- /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 00000000000..230f59a380c
--- /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 00000000000..c9d7dc5abc1
--- /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 65bbe9e4d23..c8d7521eb01 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 00000000000..834569195ee
--- /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/Resist/EscapeInventoryCancelEvent.cs b/Content.Shared/Resist/EscapeInventoryCancelEvent.cs
new file mode 100644
index 00000000000..75ee09ff045
--- /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 4faca4d8f21..00725808297 100644
--- a/Content.Shared/Strip/Components/StrippableComponent.cs
+++ b/Content.Shared/Strip/Components/StrippableComponent.cs
@@ -32,12 +32,12 @@ public sealed class StrippingSlotButtonPressed(string slot, bool isHand) : Bound
     public sealed class StrippingEnsnareButtonPressed : BoundUserInterfaceMessage;
 
     [ByRefEvent]
-    public abstract class BaseBeforeStripEvent(TimeSpan initialTime, bool stealth = false) : EntityEventArgs, IInventoryRelayEvent
+    public abstract class BaseBeforeStripEvent(TimeSpan initialTime, ThievingStealth stealth = ThievingStealth.Obvious) : EntityEventArgs, IInventoryRelayEvent
     {
         public readonly TimeSpan InitialTime = initialTime;
         public float Multiplier = 1f;
         public TimeSpan Additive = TimeSpan.Zero;
-        public bool Stealth = stealth;
+        public ThievingStealth Stealth = stealth;
 
         public TimeSpan Time => TimeSpan.FromSeconds(MathF.Max(InitialTime.Seconds * Multiplier + Additive.Seconds, 0f));
 
@@ -51,7 +51,7 @@ public abstract class BaseBeforeStripEvent(TimeSpan initialTime, bool stealth =
     ///     This is also used by some stripping related interactions, i.e., interactions with items that are currently equipped by another player.
     /// </remarks>
     [ByRefEvent]
-    public sealed class BeforeStripEvent(TimeSpan initialTime, bool stealth = false) : BaseBeforeStripEvent(initialTime, stealth);
+    public sealed class BeforeStripEvent(TimeSpan initialTime, ThievingStealth stealth = ThievingStealth.Obvious) : BaseBeforeStripEvent(initialTime, stealth);
 
     /// <summary>
     ///     Used to modify strip times. Raised directed at the target.
@@ -60,7 +60,7 @@ public sealed class BeforeStripEvent(TimeSpan initialTime, bool stealth = false)
     ///     This is also used by some stripping related interactions, i.e., interactions with items that are currently equipped by another player.
     /// </remarks>
     [ByRefEvent]
-    public sealed class BeforeGettingStrippedEvent(TimeSpan initialTime, bool stealth = false) : BaseBeforeStripEvent(initialTime, stealth);
+    public sealed class BeforeGettingStrippedEvent(TimeSpan initialTime, ThievingStealth stealth = ThievingStealth.Obvious) : BaseBeforeStripEvent(initialTime, stealth);
 
     /// <summary>
     ///     Organizes the behavior of DoAfters for <see cref="StrippableSystem">.
diff --git a/Content.Shared/Strip/Components/ThievingComponent.cs b/Content.Shared/Strip/Components/ThievingComponent.cs
index a851dd5ef63..1d584627727 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")]
+    [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 7afd4f245a1..64dd6a81f3a 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,7 +17,7 @@ public override void Initialize()
         SubscribeLocalEvent<StrippableComponent, DragDropDraggedEvent>(OnDragDrop);
     }
 
-    public (TimeSpan Time, bool Stealth) GetStripTimeModifiers(EntityUid user, EntityUid target, TimeSpan initialTime)
+    public (TimeSpan Time, ThievingStealth Stealth) GetStripTimeModifiers(EntityUid user, EntityUid target, TimeSpan initialTime)
     {
         var userEv = new BeforeStripEvent(initialTime);
         RaiseLocalEvent(user, ref userEv);
@@ -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 2b3d3b38a00..8f523accfea 100644
--- a/Content.Shared/Strip/ThievingSystem.cs
+++ b/Content.Shared/Strip/ThievingSystem.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Inventory;
-using Content.Shared.Strip;
+using Content.Shared.Popups;
 using Content.Shared.Strip.Components;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Strip;
 
@@ -17,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 00000000000..442bb6f0084
--- /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 00000000000..ee25bf364b9
--- /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 c4056561c9c..3d0a73d62df 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -4051,7 +4051,7 @@ Entries:
     - type: Add
       message: >-
         Glass/Crystal shards and floor tiles now deal damage and embed in
-        victims when colliding with them. 
+        victims when colliding with them.
   id: 6107
   time: '2024-05-11T01:23:00.0000000+00:00'
 - author: FoxxoTrystan
@@ -4262,7 +4262,7 @@ Entries:
     - type: Fix
       message: >-
         Spent bullet casings now fly away from a shooter in a cinematic manner,
-        rather than fall at their feet. 
+        rather than fall at their feet.
   id: 6133
   time: '2024-07-01T22:37:29.0000000+00:00'
 - author: WarMechanic
@@ -4285,3 +4285,85 @@ Entries:
       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/Changelog/Floof.yml b/Resources/Changelog/Floof.yml
new file mode 100644
index 00000000000..b7424c8c0a8
--- /dev/null
+++ b/Resources/Changelog/Floof.yml
@@ -0,0 +1,7 @@
+Name: Floof
+Order: 1
+Entries:
+- author: FoxxoTrystan
+  changes:
+  - {message: 'Created the Floof Station changelog.', type: Add}
+  time: '2024-7-12T00:00:00.0000000+00:00'
diff --git a/Resources/Fonts/Copperplate.otf b/Resources/Fonts/Copperplate.otf
new file mode 100644
index 00000000000..40d45aa46b6
Binary files /dev/null and b/Resources/Fonts/Copperplate.otf differ
diff --git a/Resources/Fonts/Mangat.ttf b/Resources/Fonts/Mangat.ttf
new file mode 100644
index 00000000000..de4c11beba5
Binary files /dev/null and b/Resources/Fonts/Mangat.ttf differ
diff --git a/Resources/Fonts/Noganas.ttf b/Resources/Fonts/Noganas.ttf
new file mode 100644
index 00000000000..afa0c82f03e
Binary files /dev/null and b/Resources/Fonts/Noganas.ttf differ
diff --git a/Resources/Fonts/RubikBubbles.ttf b/Resources/Fonts/RubikBubbles.ttf
new file mode 100644
index 00000000000..a653715c6cd
Binary files /dev/null and b/Resources/Fonts/RubikBubbles.ttf differ
diff --git a/Resources/FurryServers/Blepstation.txt b/Resources/FurryServers/Blepstation.txt
new file mode 100644
index 00000000000..9c6001052b2
--- /dev/null
+++ b/Resources/FurryServers/Blepstation.txt
@@ -0,0 +1,10 @@
+Looking for faster paced rounds that are more focused on gameplay?  Check out our friends at [italic]BlepStation[/italic], a furry server with unique content and features.  (Adults/18+ Only)
+
+ • Furry kinks & species.
+ • Shorter, [bold]gameplay-focused[/bold] rounds.
+ • Low role timer requirements.
+ • [bold]LRP[/bold] -- Simple rules, less serious vibe.
+ • Based on vanilla upstream (but also brings back popular removed mechanics like cloning, vehicles, list inventory, etc).
+ • No whitelist requirement.
+
+Check out the website for more information!  We hope to play with you soon :)
diff --git a/Resources/Locale/en-US/Floof/chat/ui/chat-box.ftl b/Resources/Locale/en-US/Floof/chat/ui/chat-box.ftl
new file mode 100644
index 00000000000..affb4d3f20e
--- /dev/null
+++ b/Resources/Locale/en-US/Floof/chat/ui/chat-box.ftl
@@ -0,0 +1,2 @@
+hud-chatbox-channel-Subtle = Subtle
+hud-chatbox-select-channel-Subtle = Subtle
diff --git a/Resources/Locale/en-US/actions/actions/sleep.ftl b/Resources/Locale/en-US/actions/actions/sleep.ftl
index fd833fd4a5c..6188e1639fe 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 795d740141b..5f880e8dacd 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/changelog/changelog-window.ftl b/Resources/Locale/en-US/changelog/changelog-window.ftl
index b8b8ac18824..9c5ba5ba89b 100644
--- a/Resources/Locale/en-US/changelog/changelog-window.ftl
+++ b/Resources/Locale/en-US/changelog/changelog-window.ftl
@@ -10,5 +10,7 @@ changelog-version-tag = version v{ $version }
 changelog-button = Changelog
 changelog-button-new-entries = Changelog (new!)
 
-changelog-tab-title-Changelog = Floof Station
-changelog-tab-title-Admin = Floof Station Admin
+changelog-tab-title-Changelog = Einstein Engines
+changelog-tab-title-Admin = Einstein Engines Admin
+
+changelog-tab-title-Floof = Floof Station
diff --git a/Resources/Locale/en-US/chat/managers/chat-manager.ftl b/Resources/Locale/en-US/chat/managers/chat-manager.ftl
index fab815b4f90..b2a150b0cc2 100644
--- a/Resources/Locale/en-US/chat/managers/chat-manager.ftl
+++ b/Resources/Locale/en-US/chat/managers/chat-manager.ftl
@@ -21,11 +21,11 @@ chat-manager-whisper-headset-on-message = You can't whisper on the radio!
 chat-manager-server-wrap-message = [bold]{$message}[/bold]
 chat-manager-sender-announcement-wrap-message = [font size=14][bold]{$sender} Announcement:[/font][font size=12]
                                                 {$message}[/bold][/font]
-chat-manager-entity-say-wrap-message = [BubbleHeader][Name]{$entityName}[/Name][/BubbleHeader] {$verb}, [font={$fontType} size={$fontSize}]"[BubbleContent]{$message}[/BubbleContent]"[/font]
-chat-manager-entity-say-bold-wrap-message = [BubbleHeader][Name]{$entityName}[/Name][/BubbleHeader] {$verb}, [font={$fontType} size={$fontSize}]"[BubbleContent][bold]{$message}[/bold][/BubbleContent]"[/font]
+chat-manager-entity-say-wrap-message = [BubbleHeader][Name]{$entityName}[/Name][/BubbleHeader] {$verb}, [font="{$fontType}" size={$fontSize}]"[color={$color}][BubbleContent]{$message}[/BubbleContent][/color]"[/font]
+chat-manager-entity-say-bold-wrap-message = [BubbleHeader][Name]{$entityName}[/Name][/BubbleHeader] {$verb}, [font="{$fontType}" size={$fontSize}]"[color={$color}][BubbleContent][bold]{$message}[/bold][/BubbleContent][/color]"[/font]
 
-chat-manager-entity-whisper-wrap-message = [font size=11][italic][BubbleHeader][Name]{$entityName}[/Name][/BubbleHeader] whispers,"[BubbleContent]{$message}[/BubbleContent]"[/italic][/font]
-chat-manager-entity-whisper-unknown-wrap-message = [font size=11][italic][BubbleHeader]Someone[/BubbleHeader] whispers, "[BubbleContent]{$message}[/BubbleContent]"[/italic][/font]
+chat-manager-entity-whisper-wrap-message = [font size=11][italic][BubbleHeader][Name]{$entityName}[/Name][/BubbleHeader] whispers,"[color={$color}][BubbleContent]{$message}[/BubbleContent][/color]"[/italic][/font]
+chat-manager-entity-whisper-unknown-wrap-message = [font size=11][italic][BubbleHeader]Someone[/BubbleHeader] whispers, "[color={$color}][BubbleContent]{$message}[/BubbleContent][/color]"[/italic][/font]
 
 # THE() is not used here because the entity and its name can technically be disconnected if a nameOverride is passed...
 chat-manager-entity-me-wrap-message = [italic]{ PROPER($entity) ->
@@ -33,6 +33,11 @@ chat-manager-entity-me-wrap-message = [italic]{ PROPER($entity) ->
      [true] {$entityName} {$message}[/italic]
     }
 
+chat-manager-entity-subtle-wrap-message = [italic]{ PROPER($entity) ->
+    *[false] the {$entityName} subtly {$message}[/italic]
+     [true] {$entityName} subtly {$message}[/italic]
+    }
+
 chat-manager-entity-looc-wrap-message = LOOC: {$entityName}: {$message}
 chat-manager-send-ooc-wrap-message = OOC: {$playerName}: {$message}
 chat-manager-send-ooc-patron-wrap-message = OOC: [color={$patronColor}]{$playerName}[/color]: {$message}
diff --git a/Resources/Locale/en-US/customization/character-requirements.ftl b/Resources/Locale/en-US/customization/character-requirements.ftl
index e7bcf0669f7..efa1b7e7677 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/paper/signature.ftl b/Resources/Locale/en-US/deltav/paper/signature.ftl
new file mode 100644
index 00000000000..87741c962c0
--- /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 46f5df48ad6..f76d1c04784 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/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
index 35de5555a29..b69f4934a92 100644
--- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl
+++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
@@ -210,6 +210,7 @@ flavor-complex-milk = like milk
 flavor-complex-tea = like tea
 flavor-complex-ice = like ice
 flavor-complex-mopwata = like stagnant, dirty water
+flavor-complex-nikkonectar = like creamy blueberries.
 
 ## Cocktails
 flavor-complex-long-island = suspiciously like iced tea
diff --git a/Resources/Locale/en-US/headset/headset-component.ftl b/Resources/Locale/en-US/headset/headset-component.ftl
index a220737f18a..75c83643d6d 100644
--- a/Resources/Locale/en-US/headset/headset-component.ftl
+++ b/Resources/Locale/en-US/headset/headset-component.ftl
@@ -1,6 +1,6 @@
 # Chat window radio wrap (prefix and postfix)
-chat-radio-message-wrap = [color={$color}]{$channel} {$name} {$verb}, [font={$fontType} size={$fontSize}]"{$message}"[/font][/color]
-chat-radio-message-wrap-bold = [color={$color}]{$channel} {$name} {$verb}, [font={$fontType} size={$fontSize}][bold]"{$message}"[/bold][/font][/color]
+chat-radio-message-wrap = [color={$color}]{$channel} {$name} {$verb}, [font="{$fontType}" size={$fontSize}]"[/color][color={$languageColor}]{$message}[/color][color={$color}]"[/font][/color]
+chat-radio-message-wrap-bold = [color={$color}]{$channel} {$name} {$verb}, [font="{$fontType}" size={$fontSize}][bold]"[/color][color={$languageColor}]{$message}[/color][color={$color}]"[/bold][/font][/color]
 
 examine-headset-default-channel = Use {$prefix} for the default channel ([color={$color}]{$channel}[/color]).
 
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 00000000000..718c94cb0e9
--- /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/language/commands.ftl b/Resources/Locale/en-US/language/commands.ftl
index 32fa5415b8c..ba2b3160094 100644
--- a/Resources/Locale/en-US/language/commands.ftl
+++ b/Resources/Locale/en-US/language/commands.ftl
@@ -1,8 +1,16 @@
 command-list-langs-desc = List languages your current entity can speak at the current moment.
 command-list-langs-help = Usage: {$command}
 
-command-saylang-desc = Send a message in a specific language.
-command-saylang-help = Usage: {$command} <language id> <message>. Example: {$command} GalacticCommon "Hello World!"
+command-saylang-desc = Send a message in a specific language. To choose a language, you can use either the name of the language, or its position in the list of languages.
+command-saylang-help = Usage: {$command} <language id> <message>. Example: {$command} GalacticCommon "Hello World!". Example: {$command} 1 "Hello World!"
 
-command-language-select-desc = Select the currently spoken language of your entity.
-command-language-select-help = Usage: {$command} <language id>. Example: {$command} GalacticCommon
+command-language-select-desc = Select the currently spoken language of your entity. You can use either the name of the language, or its position in the list of languages.
+command-language-select-help = Usage: {$command} <language id>. Example: {$command} 1. Example: {$command} GalacticCommon
+
+command-language-spoken = Spoken:
+command-language-understood = Understood:
+command-language-current-entry = {$id}. {$language} - {$name} (current)
+command-language-entry = {$id}. {$language} - {$name}
+
+command-language-invalid-number = The language number must be between 0 and {$total}. Alternatively, use the language name.
+command-language-invalid-language = The language {$id} does not exist or you cannot speak it.
diff --git a/Resources/Locale/en-US/loadouts/categories.ftl b/Resources/Locale/en-US/loadouts/categories.ftl
index 685c5cbcbd9..9770bd8bafd 100644
--- a/Resources/Locale/en-US/loadouts/categories.ftl
+++ b/Resources/Locale/en-US/loadouts/categories.ftl
@@ -2,7 +2,14 @@
 
 loadout-category-Uncategorized = Uncategorized
 loadout-category-Accessories = Accessories
+loadout-category-Eyes = Eyes
+loadout-category-Hands = Hands
+loadout-category-Head = Head
 loadout-category-Items = Items
 loadout-category-Jobs = Jobs
+loadout-category-Mask = Mask
+loadout-category-Neck = Neck
 loadout-category-Outer = Outer
+loadout-category-Shoes = Shoes
+loadout-category-Species = Species
 loadout-category-Uniform = Uniform
diff --git a/Resources/Locale/en-US/loadouts/items.ftl b/Resources/Locale/en-US/loadouts/items.ftl
index a4819011262..b92f56bc7cb 100644
--- a/Resources/Locale/en-US/loadouts/items.ftl
+++ b/Resources/Locale/en-US/loadouts/items.ftl
@@ -11,3 +11,5 @@ loadout-description-LoadoutItemPlushieSharkBlue = Dive into battle with your ver
 loadout-description-LoadoutItemPlushieSharkPink = Unleash the power of pink with the Pink Shark Plushie! This rosy-hued predator might not have real teeth, but its sheer adorableness is enough to take a bite out of anyone's resolve. Watch as foes melt away in the face of its cottony charm.
 loadout-description-LoadoutItemPlushieSharkGrey = Introducing the Grey Shark Plushie, the apex predator of snuggles! With its sleek and understated design, this plushie strikes the perfect balance between cuddle companion and imaginary ocean guardian. Beware; opponents may be mesmerized by its dorsal fin's hypnotic sway!
 loadout-description-LoadoutItemPlushieCarp = Brace for extraterrestrial antics with the Purple Space Carp Plushie! A fishy invader from the cosmic deep, this plushie brings a splash of humor to zero-gravity escapades. From hostile waters to interstellar giggles, it's a cuddly contradiction that's out of this world
+loadout-description-LoadoutSolCommonTranslator = The most common of all translators, such that it can be purchased in any civilized station.
+                                                 This device translates Sol Common speech into Galactic Common.
diff --git a/Resources/Locale/en-US/nyanotrasen/carrying/carry.ftl b/Resources/Locale/en-US/nyanotrasen/carrying/carry.ftl
index 4fa1abae8bd..490daced3f2 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/reagents/floofstation/aphrodisiacs/aphrodisiacs.ftl b/Resources/Locale/en-US/reagents/floofstation/aphrodisiacs/aphrodisiacs.ftl
new file mode 100644
index 00000000000..d02640f1200
--- /dev/null
+++ b/Resources/Locale/en-US/reagents/floofstation/aphrodisiacs/aphrodisiacs.ftl
@@ -0,0 +1,28 @@
+reagent-effect-aphrodisiac-mild1 = You feel a tingling in your chest.
+reagent-effect-aphrodisiac-mild2 = Your body feels warm.
+reagent-effect-aphrodisiac-mild3 = You feel slightly aroused.
+reagent-effect-aphrodisiac-mild4 = You can feel your southern blood pumping.
+reagent-effect-aphrodisiac-mild5 = You begin to have inklings of fantasies.
+reagent-effect-aphrodisiac-mildoverdose = You feel nauseous.
+
+reagent-effect-aphrodisiac-normal1 = Your entire body is hot.
+reagent-effect-aphrodisiac-normal2 = Everyone is looking at you. They want you.
+reagent-effect-aphrodisiac-normal3 = You feel incredibly lustful.
+reagent-effect-aphrodisiac-normal4 = Your body buzzes with pleasure.
+reagent-effect-aphrodisiac-normal5 = Your clothes feel tight. Why not take them off...
+reagent-effect-aphrodisiac-normaloverdose1 = You forget what you were doing.
+reagent-effect-aphrodisiac-normaloverdose2 = Your mind feels clouded.
+reagent-effect-aphrodisiac-normaloverdose3 = Your heart is pounding.
+reagent-effect-aphrodisiac-normaloverdose4 = You feel the need for a nap
+reagent-effect-aphrodisiac-normaloverdose5 = Your eyes feel heavy.
+reagent-effect-aphrodisiac-normaloverdose6 = You lose your train of thought.
+
+reagent-effect-aphrodisiac-strong1 = You can't look at someone without wanting to fuck them.
+reagent-effect-aphrodisiac-strong2 = You need someone to breed with.
+reagent-effect-aphrodisiac-strong3 = Fuck them. Now.
+reagent-effect-aphrodisiac-strongoverdose1 = STRIP STRIP STRIP
+reagent-effect-aphrodisiac-strongoverdose2 = YOU NEED IT.
+reagent-effect-aphrodisiac-strongoverdose3 = FUCK THEM ALL.
+reagent-effect-aphrodisiac-strongoverdose4 = YOU HAVE TO BREED AT ALL COSTS.
+
+reagent-effect-aphrodisiac-fade = Your inhibitions begin to normalize...
diff --git a/Resources/Locale/en-US/reagents/floofstation/aphrodisiacs/meta/medicine.ftl b/Resources/Locale/en-US/reagents/floofstation/aphrodisiacs/meta/medicine.ftl
new file mode 100644
index 00000000000..20cd4df96ff
--- /dev/null
+++ b/Resources/Locale/en-US/reagents/floofstation/aphrodisiacs/meta/medicine.ftl
@@ -0,0 +1,5 @@
+reagent-name-pomelustine = pomelustine
+reagent-desc-pomelustine = A mild aphrodisiac, present naturally within certain fruits such as pomegranate, usually in too small of a dose to do too much harm.
+
+reagent-name-philterex = philterex
+reagent-desc-philterex = A strong aphrodisiac, not yet regulated by Space Law. It is known for its high use in particular sectors.
diff --git a/Resources/Locale/en-US/reagents/floofstation/aphrodisiacs/meta/narcotics.ftl b/Resources/Locale/en-US/reagents/floofstation/aphrodisiacs/meta/narcotics.ftl
new file mode 100644
index 00000000000..627d6137252
--- /dev/null
+++ b/Resources/Locale/en-US/reagents/floofstation/aphrodisiacs/meta/narcotics.ftl
@@ -0,0 +1,2 @@
+reagent-name-libidozenithizine = libidozenithizine
+reagent-desc-libidozenithizine = An incredibly potent aphrodisiac. A controlled substance under space law, with ample punishment if abused. It will cause even the most reserved to lose their inhibition. Overdose is known to cause Nymphomania.
diff --git a/Resources/Locale/en-US/reagents/floofstation/drinks.ftl b/Resources/Locale/en-US/reagents/floofstation/drinks.ftl
new file mode 100644
index 00000000000..0f77ef58b6b
--- /dev/null
+++ b/Resources/Locale/en-US/reagents/floofstation/drinks.ftl
@@ -0,0 +1,2 @@
+reagent-name-NNN = Nikko's Naughty Nectar
+reagent-desc-NNN = A sticky, musky white liquid that tastes of blueberries.
diff --git a/Resources/Locale/en-US/seeds/seeds.ftl b/Resources/Locale/en-US/seeds/seeds.ftl
index b3983782883..6d843d73403 100644
--- a/Resources/Locale/en-US/seeds/seeds.ftl
+++ b/Resources/Locale/en-US/seeds/seeds.ftl
@@ -77,6 +77,8 @@ seeds-lily-name = lily
 seeds-lily-display-name = lily
 seeds-lingzhi-name = lingzhi
 seeds-lingzhi-display-name = lingzhi
+seeds-pomegranate-name = pomegranate
+seeds-pomegranate-display-name = pomegranate
 seeds-ambrosiavulgaris-name = ambrosia vulgaris
 seeds-ambrosiavulgaris-display-name = ambrosia vulgaris
 seeds-ambrosiadeus-name = ambrosia deus
diff --git a/Resources/Locale/en-US/strip/strippable-component.ftl b/Resources/Locale/en-US/strip/strippable-component.ftl
index 7654b20b03f..65d7844ee22 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 dc3d407e5e8..2f59d322282 100644
--- a/Resources/Locale/en-US/traits/traits.ftl
+++ b/Resources/Locale/en-US/traits/traits.ftl
@@ -32,19 +32,13 @@ trait-description-SocialAnxiety = You are anxious when you speak and stutter.
 trait-name-Snoring = Snoring
 trait-description-Snoring = You will snore while sleeping.
 
-trait-name-LatentPsychic = Latent Psychic
-trait-description-LatentPsychic = Your mind and soul are open to the noosphere, allowing for a limited use of Telepathy.
-                                  Thus, you are eligible for potentially receiving psychic powers.
-                                  It is possible that you may be hunted by otherworldly forces, so consider keeping your powers a secret.
-
-trait-name-PsionicInsulation = χ Waveform Misalignment
-trait-description-PsionicInsulation = Through a quirk of fate, your brainwaves are permanently out of phase with the noösphere
-                                      You are immune to both positive and negative effects of nearly all psychic powers,
-                                      But you can never be a psionic yourself in this life. This trait is incompatible with
-                                      all other psychic traits.
-
-trait-name-NaturalTelepath = Natural Telepath
-trait-description-NaturalTelepath = As a naturally occuring Telepath, you are capable of fluent telepathic communication, regardless of
-                                    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-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 f040d58253d..7b968b5c13d 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 00000000000..60fec699210
--- /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 2d1c9062e61..24f34bc5182 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/Crates/botany.yml b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml
index f10fd010f64..3b47eb99353 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml
@@ -95,3 +95,4 @@
       - id: GrapeSeeds
       - id: WatermelonSeeds
       - id: PeaSeeds
+      - id: PomegranateSeeds
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
index 2c4c27137f0..aadb05df8e7 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
@@ -111,6 +111,7 @@
     ClothingHandsGlovesColorOrange: 2
     ClothingHandsGlovesColorPurple: 2
     ClothingEyesGlassesCheapSunglasses: 3
+    ClothingUniformLoinCloth: 5 # FloofStation
   contrabandInventory:
     ClothingMaskNeckGaiter: 2
     ClothingUniformJumpsuitTacticool: 1
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml
index 05e3ae0eb0e..2f9b8d529ec 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml
@@ -22,6 +22,7 @@
     OnionSeeds: 5
     OnionRedSeeds: 5
     OrangeSeeds: 5
+    PomegranateSeeds: 3
     PoppySeeds: 3
     PotatoSeeds: 5
     PumpkinSeeds: 5
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml
index 494f05f6a31..d3de4d8dd8d 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml
@@ -1,4 +1,4 @@
-- type: vendingMachineInventory
+- type: vendingMachineInventory
   id: SodaInventory
   startingInventory:
     DrinkColaCan: 3
@@ -7,6 +7,7 @@
     DrinkIcedTeaCan: 3
     DrinkLemonLimeCan: 3
     DrinkFourteenLokoCan: 3
+    DrinkNNNCan: 3 #Floofstation
   emaggedInventory:
     DrinkNukieCan: 3
     DrinkChangelingStingCan: 3
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/animals.yml
index e932974a0f4..dd59d74d3f0 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/animals.yml
@@ -66,7 +66,7 @@
   - type: Tag
     tags:
     - VimPilot
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Fox
     understands:
@@ -179,7 +179,7 @@
     tags:
     - DoorBumpOpener
     - VimPilot
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Dog
     understands:
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml
index 003c899fc5c..e455d1ce9cc 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml
@@ -98,7 +98,7 @@
     factions:
     - PsionicInterloper
     - NanoTrasen
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - GalacticCommon
     understands:
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/nukiemouse.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/nukiemouse.yml
index c2ae33ec0ba..8968f0e77ad 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/nukiemouse.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/nukiemouse.yml
@@ -96,7 +96,7 @@
     spawned:
     - id: FoodMeat
       amount: 1
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Mouse
     understands:
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/pets.yml
index 2d1a1d72c48..e3859bf32ae 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/pets.yml
@@ -1,8 +1,8 @@
 - type: entity
-  name: Siobhan
+  name: Seb
   parent: MobArcticFox
   id: MobArcticFoxSiobhan
-  description: Her name is pronounced "Shivahn", but she is known as Shivs by her associates. A fluffy, adorable arctic fox.
+  description: His name is "Sebastien de Lys", but he is known as Seb by his friends. A fluffy, adorable arctic fox.
   components:
   - type: InteractionPopup
     successChance: 1
@@ -13,7 +13,7 @@
   - type: Grammar
     attributes:
       proper: true
-      gender: female
+      gender: male
   - type: Tag
     tags:
     - CannotSuicide
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml
index e51ae91d12c..9b851ffa522 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml
@@ -133,7 +133,7 @@
     - FootstepSound
     - DoorBumpOpener
     - ShoesRequiredStepTriggerImmune
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - GalacticCommon
     - SolCommon
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml
index 52853d696a2..9e4f80bfb52 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml
@@ -97,7 +97,7 @@
       Female: FemaleVulpkanin
       Unsexed: MaleVulpkanin
   - type: DogVision
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - GalacticCommon
     - Canilunzt
diff --git a/Resources/Prototypes/DeltaV/Traits/altvision.yml b/Resources/Prototypes/DeltaV/Traits/altvision.yml
index d1980bc23ad..1257c1eeb09 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 fbd5a02fa08..d72006f6c41 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/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
index 1f90b421526..e6c08bf90b9 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -607,6 +607,20 @@
   - type: Clothing
     sprite: Clothing/Belt/securitywebbing.rsi
 
+- type: entity
+  parent: ClothingBeltSecurityWebbing
+  id: ClothingBeltSecurityWebbingFilled
+  name: security webbing
+  description: Unique and versatile chest rig, can hold security gear.
+  components:
+  - type: StorageFill
+    contents:
+      - id: GrenadeFlashBang
+      - id: TearGasGrenade
+      - id: Stunbaton
+      - id: Handcuffs
+      - id: Handcuffs
+
 - type: entity
   parent: ClothingBeltStorageBase
   id: ClothingBeltMercWebbing
diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
index bf08db78f71..4cd0c04e2be 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 e6a57319999..db34297b42a 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/Markers/Spawners/Random/Food_Drinks/food_produce.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml
index 6edf341e108..d1e7d9f6d42 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml
@@ -38,6 +38,7 @@
       - FoodAloe
       - FoodPoppy
       - FoodLingzhi
+      - FoodPomegranate
       - FoodAmbrosiaVulgaris
       - RiceBushel
       - FoodSoybeans
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
index 0645e451af2..196abcfab76 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -213,7 +213,7 @@
     visMask:
       - PsionicInvisibility
       - Normal
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - GalacticCommon
     - RobotTalk
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index e311681ce5f..ec917607abc 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
@@ -48,7 +49,7 @@
     flavorKind: station-event-random-sentience-flavor-organic
   - type: Bloodstream
     bloodMaxVolume: 50
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Mouse
     understands:
@@ -188,6 +189,8 @@
     noMovementLayers:
       movement:
         state: chicken-0
+  - type: Carriable
+    freeHandsRequired: 1
   - type: Fixtures
     fixtures:
       fix1:
@@ -240,7 +243,7 @@
   - type: EggLayer
     eggSpawn:
     - id: FoodEgg
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Chicken
     understands:
@@ -519,7 +522,7 @@
       prob: 0.5
   - type: Extractable
     grindableSolutionName: food
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Moffic
     understands:
@@ -580,6 +583,8 @@
         - MobMask
         layer:
         - MobLayer
+  - type: Carriable
+    freeHandsRequired: 1
   - type: Tag
     tags:
     - DoorBumpOpener
@@ -619,7 +624,7 @@
   - type: EggLayer
     eggSpawn:
     - id: FoodEgg
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Duck
     understands:
@@ -840,6 +845,8 @@
     noMovementLayers:
       movement:
         state: crab
+  - type: Carriable
+    freeHandsRequired: 1
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -872,7 +879,7 @@
     interactSuccessSpawn: EffectHearts
     interactSuccessSound:
       path: /Audio/Voice/Arachnid/arachnid_chitter.ogg
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Crab
     understands:
@@ -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:
@@ -1118,7 +1127,7 @@
   - type: Inventory
     speciesId: kangaroo
     templateId: kangaroo
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Kangaroo
     understands:
@@ -1245,6 +1254,7 @@
       sprite: "Effects/creampie.rsi"
       state: "creampie_human"
       visible: false
+  - type: Carriable
   - type: Hands
   - type: GenericVisualizer
     visuals:
@@ -1311,7 +1321,7 @@
   - type: Speech
     speechSounds: Monkey
     speechVerb: Monkey
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Monkey
     understands:
@@ -1350,7 +1360,7 @@
   - type: Speech
     speechSounds: Monkey
     speechVerb: Monkey
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Monkey
     understands:
@@ -1395,7 +1405,7 @@
   - type: NameIdentifier
     group: Kobold
   - type: LizardAccent
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Kobold
     understands:
@@ -1630,7 +1640,7 @@
     spawned:
     - id: FoodMeatRat
       amount: 1
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Mouse
     understands:
@@ -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:
@@ -1973,7 +1989,7 @@
       path: /Audio/Animals/parrot_raught.ogg
   - type: Bloodstream
     bloodMaxVolume: 50
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - GalacticCommon
     understands:
@@ -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:
@@ -2236,7 +2255,7 @@
   - type: MeleeChemicalInjector
     transferAmount: 0.75
     solution: melee
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Xeno
     understands:
@@ -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:
@@ -2572,7 +2594,7 @@
   - type: Tag
     tags:
     - VimPilot
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Fox
     understands:
@@ -2590,6 +2612,7 @@
     layers:
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: corgi
+  - type: Carriable
   - type: Physics
   - type: Speech
     speechVerb: Canine
@@ -2623,7 +2646,7 @@
     spawned:
     - id: FoodMeat
       amount: 2
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Dog
     understands:
@@ -2746,6 +2769,7 @@
     layers:
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: cat
+  - type: Carriable
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -2780,7 +2804,7 @@
     spawned:
     - id: FoodMeat
       amount: 3
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Cat
     understands:
@@ -2852,7 +2876,7 @@
   - type: NpcFactionMember
     factions:
     - Syndicate
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Xeno
     understands:
@@ -2925,6 +2949,8 @@
         Base: kitten_dead
       Dead:
         Base: kitten_dead
+  - type: Carriable
+    freeHandsRequired: 1
   - type: Butcherable
     spawned:
     - id: FoodMeat
@@ -2955,6 +2981,7 @@
     layers:
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: sloth
+  - type: Carriable
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -3016,6 +3043,7 @@
     layers:
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: ferret
+  - type: Carriable
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -3157,7 +3185,7 @@
     spawned:
     - id: FoodMeat
       amount: 1
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Mouse
     understands:
@@ -3217,6 +3245,7 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: pig
       sprite: Mobs/Animals/pig.rsi
+  - type: Carriable
   - type: Fixtures
     fixtures:
       fix1:
@@ -3269,7 +3298,7 @@
     interactSuccessSpawn: EffectHearts
     interactSuccessSound:
       path: /Audio/Animals/pig_oink.ogg
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Pig
     understands:
@@ -3292,6 +3321,7 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: nymph
       sprite: Mobs/Animals/nymph.rsi
+  - type: Carriable
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -3359,7 +3389,7 @@
     reformTime: 10
     popupText: diona-reform-attempt
     reformPrototype: MobDionaReformed
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - RootSpeak
     understands:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml b/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml
index 3bcf8e7a16f..f8d0497b971 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml
@@ -15,7 +15,7 @@
   - type: Sprite
     sprite: Mobs/Aliens/Argocyte/argocyte_common.rsi
   - type: SolutionContainerManager
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Xeno
     understands:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
index 3e6c603626b..2aae27d31ef 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/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
index 5141811a8ea..6eb43fb89ae 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -36,7 +36,7 @@
     - VimPilot
   - type: StealTarget
     stealGroup: AnimalIan
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Dog
     understands:
@@ -127,7 +127,7 @@
     tags:
     - CannotSuicide
     - VimPilot
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Cat
     understands:
@@ -151,7 +151,7 @@
     tags:
     - CannotSuicide
     - VimPilot
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Cat
     understands:
@@ -306,7 +306,7 @@
     spawned:
     - id: FoodMeat
       amount: 2
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Dog
     understands:
@@ -411,7 +411,7 @@
     spawned:
     - id: FoodMeat
       amount: 3
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Dog
     understands:
@@ -576,7 +576,7 @@
     - VimPilot
   - type: StealTarget
     stealGroup: AnimalRenault
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Fox
     understands:
@@ -629,7 +629,7 @@
     - CannotSuicide
     - Hamster
     - VimPilot
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Mouse
     understands:
@@ -807,7 +807,7 @@
     attributes:
       proper: true
       gender: female
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Bubblish
     understands:
@@ -847,7 +847,7 @@
     attributes:
       proper: true
       gender: male
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Monkey
     understands:
@@ -881,7 +881,7 @@
 #  - type: AlwaysRevolutionaryConvertible
   - type: StealTarget
     stealGroup: AnimalTropico
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Crab
     understands:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
index 50fe3b6765e..42da84323f6 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
@@ -119,7 +119,7 @@
     attributes:
       gender: male
   - type: PotentialPsionic # Nyano
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - GalacticCommon
     - Mouse
@@ -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
@@ -296,7 +298,7 @@
   - type: Food
   - type: Item
     size: Tiny # Delta V - Make them eatable and pickable.
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Mouse
     understands:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/shadows.yml b/Resources/Prototypes/Entities/Mobs/NPCs/shadows.yml
index 9559ae3a0c0..08cb776c530 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/shadows.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/shadows.yml
@@ -50,7 +50,7 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: cat
   - type: Physics
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Cat
     understands:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
index e3166c15f6e..f9cf0db5f6f 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -107,7 +107,7 @@
   - type: TypingIndicator
     proto: robot
   - type: ZombieImmune
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - GalacticCommon
     - RobotTalk
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
index 901bf149cbc..c4d88e80705 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:
@@ -111,7 +112,7 @@
     successChance: 0.5
     interactSuccessString: petting-success-slimes
     interactFailureString: petting-failure-generic
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Bubblish
     understands:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
index 9ea2d784dbb..adf3af93eab 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
@@ -165,7 +165,7 @@
   - type: FootstepModifier
     footstepSoundCollection:
       collection: FootstepBounce
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Kangaroo
     understands:
@@ -251,7 +251,7 @@
   - type: MeleeChemicalInjector
     solution: melee
     transferAmount: 4
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Xeno
     understands:
@@ -357,7 +357,7 @@
     - type: MeleeChemicalInjector
       solution: melee
       transferAmount: 6
-    - type: LanguageSpeaker
+    - type: LanguageKnowledge
       speaks:
       - Xeno
       understands:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
index 26553a2f1f2..397989643e6 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
@@ -125,7 +125,7 @@
     chance: -2
   - type: Psionic #Nyano - Summary: makes psionic by default.
     removable: false
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Xeno
     understands:
@@ -239,7 +239,7 @@
   - type: Tag
     tags:
     - CannotSuicide
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - GalacticCommon
     - Xeno
diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
index 80e87d3670c..9bdfb18830e 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 67212d416fe..eeb6dfc852c 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -219,7 +219,7 @@
     price: 1500 # Kidnapping a living person and selling them for cred is a good move.
     deathPenalty: 0.01 # However they really ought to be living and intact, otherwise they're worth 100x less.
   - type: CanEscapeInventory # Carrying system from nyanotrasen.
-  - type: LanguageSpeaker # This is here so all with no LanguageSpeaker at least spawn with the default languages.
+  - type: LanguageKnowledge # This is here so even if species doesn't have a defined language, they at least speak GC
     speaks:
     - GalacticCommon
     understands:
@@ -309,6 +309,7 @@
         Asphyxiation: -1.0
   - type: FireVisuals
     alternateState: Standing
+  - type: OfferItem
 
 - type: entity
   save: false
diff --git a/Resources/Prototypes/Entities/Mobs/Species/diona.yml b/Resources/Prototypes/Entities/Mobs/Species/diona.yml
index 5cb3de6f168..de9928f0d67 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/diona.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/diona.yml
@@ -102,7 +102,7 @@
     actionPrototype: DionaGibAction
     allowedStates:
     - Dead
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - GalacticCommon
     - RootSpeak
diff --git a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
index c5395360187..b38ea2634fd 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
@@ -51,7 +51,7 @@
     accent: dwarf
   - type: Speech
     speechSounds: Bass
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - GalacticCommon
     - SolCommon
diff --git a/Resources/Prototypes/Entities/Mobs/Species/human.yml b/Resources/Prototypes/Entities/Mobs/Species/human.yml
index 5874e180a5e..e00e06279e5 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/human.yml
@@ -16,12 +16,14 @@
     spawned:
     - id: FoodMeatHuman
       amount: 5
-  - type: LanguageSpeaker
+  - type: PotentialPsionic #Nyano - Summary: makes potentially psionic.
+  - type: LanguageKnowledge
     speaks:
     - GalacticCommon
     - SolCommon
     understands:
     - GalacticCommon
+    - SolCommon
 
 - type: entity
   parent: BaseSpeciesDummy
diff --git a/Resources/Prototypes/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/Entities/Mobs/Species/moth.yml
index 5959c497186..1c55dcf0df1 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/moth.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/moth.yml
@@ -23,7 +23,7 @@
     accent: zombieMoth
   - type: Speech
     speechVerb: Moth
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - GalacticCommon
     - Moffic
diff --git a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
index bdea4499ed1..35f9e9fa393 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
@@ -59,7 +59,7 @@
       types:
         Heat : 1.5 #per second, scales with temperature & other constants
   - type: Wagging
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - GalacticCommon
     - Draconic
diff --git a/Resources/Prototypes/Entities/Mobs/Species/slime.yml b/Resources/Prototypes/Entities/Mobs/Species/slime.yml
index a601010ef94..6c3dc952957 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/slime.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/slime.yml
@@ -74,7 +74,7 @@
       types:
         Asphyxiation: -1.0
     maxSaturation: 15
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - GalacticCommon
     - Bubblish
diff --git a/Resources/Prototypes/Entities/Mobs/base.yml b/Resources/Prototypes/Entities/Mobs/base.yml
index d5be77eef1c..40cb0da95a1 100644
--- a/Resources/Prototypes/Entities/Mobs/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/base.yml
@@ -43,6 +43,7 @@
   - type: MovementSpeedModifier
   - type: Polymorphable
   - type: StatusIcon
+  - type: LanguageSpeaker # Einstein Engines. This component is required to support speech, although it does not define known languages.
   - type: RequireProjectileTarget
     active: False
 
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
index 38ebc132c9f..f8ada34e648 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
@@ -499,3 +499,22 @@
     sprite: Objects/Consumable/Drinks/wine_can.rsi
   - type: Item
     sprite: Objects/Consumable/Drinks/wine_can.rsi
+
+#Floof
+- type: entity
+  parent: DrinkCanBaseFull
+  id: DrinkNNNCan
+  name: Nikkos Naughty Nectar
+  description: A can of Nikko's Naughty Nectar! Best not to ask how it's made...
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: NikkosNaughtyNectar
+          Quantity: 30
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/nnn_can.rsi
+  - type: Item
+    sprite: Objects/Consumable/Drinks/nnn_can.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
index eec7711d4af..95687811ed9 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -1822,3 +1822,32 @@
   - type: Tag
     tags:
     - ClothMade
+
+- type: entity
+  name: pomegranate
+  parent: FoodProduceBase
+  id: FoodPomegranate
+  description: A delicious, sweet fruit, believed to have special properties.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - sweet
+      - spooky
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 40
+        reagents:
+        - ReagentId: Pomelustine
+          Quantity: 30
+        - ReagentId: Nutriment
+          Quantity: 10
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/pomegranate.rsi
+  - type: Produce
+    seedId: pomegranate
+  - type: Extractable
+    grindableSolutionName: food
+  - type: Tag
+    tags:
+    - Fruit
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
index 659cbaa28a2..18ea198697e 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
@@ -80,7 +80,7 @@
           - ReagentId: Nicotine
             Quantity: 10
           - ReagentId: Omnizine
-            Quantity: 30
+            Quantity: 5
 
 - type: entity
   id: CigaretteOmnizine
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
index bc9079fb2db..eb8e0a1ffe6 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
@@ -182,7 +182,7 @@
   id: CigPackSyndicate
   parent: CigPackBase
   name: Interdyne herbals packet
-  description: Elite cigarettes for elite syndicate agents. Infused with medicine for when you need to do more than calm your nerves.
+  description: Premium medicinal cigarettes from the Interdyne Corporation. Not endorsed by the Terra-Gov Surgeon General.
   components:
   - type: Sprite
     sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Devices/translator_implants.yml b/Resources/Prototypes/Entities/Objects/Devices/translator_implants.yml
index fc947efe9a3..da42b2774b1 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/translator_implants.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/translator_implants.yml
@@ -1,132 +1,128 @@
 - type: entity
-  abstract: true
-  id: BaseTranslatorImplanter
-  parent: [ BaseItem ]
-  name: basic translator implant
-  description: Translates speech.
+  parent: BaseSubdermalImplant
+  id: BasicGalacticCommonTranslatorImplant
+  name: basic common translator implant
+  description: Provides your illiterate friends the ability to understand the common galactic tongue.
+  noSpawn: true
   components:
-  - type: Sprite
-    sprite: Objects/Specific/Medical/implanter.rsi
-    state: implanter0
-    layers:
-    - state: implanter1
-      map: [ "implantFull" ]
-      visible: true
-    - state: implanter0
-      map: [ "implantBroken" ]
-  - type: Appearance
-  - type: GenericVisualizer
-    visuals:
-      enum.ImplanterVisuals.Full:
-        implantFull:
-          True: {visible: true}
-          False: {visible: false}
-        implantBroken:
-          True: {visible: false}
-          False: {visible: true}
-
-- type: entity
-  id: BasicGalaticCommonTranslatorImplanter
-  parent: [ BaseTranslatorImplanter ]
-  name: basic Galactic Common translator implant
-  description: An implant giving the ability to understand Galactic Common.
-  components:
-  - type: TranslatorImplanter
+  - type: TranslatorImplant
     understood:
     - GalacticCommon
 
 - type: entity
-  id: AdvancedGalaticCommonTranslatorImplanter
-  parent: [ BaseTranslatorImplanter ]
-  name: advanced Galactic Common translator implant
-  description: An implant giving the ability to understand and speak Galactic Common.
+  parent: BaseSubdermalImplant
+  id: GalacticCommonTranslatorImplant
+  name: advanced common translator implant
+  description: A more advanced version of the translator implant, teaches your illiterate friends the ability to both speak and understand the galactic tongue!
+  noSpawn: true
   components:
-  - type: TranslatorImplanter
-    spoken:
-    - GalacticCommon
+  - type: TranslatorImplant
     understood:
     - GalacticCommon
+    spoken:
+    - GalacticCommon
 
 - type: entity
-  id: BubblishTranslatorImplanter
-  parent: [ BaseTranslatorImplanter ]
-  name: Bubblish translator implant
-  description: An implant giving the ability to understand and speak Bubblish.
+  parent: BaseSubdermalImplant
+  id: BubblishTranslatorImplant
+  name: bubblish translator implant
+  description: An implant that helps you speak and understand the language of slimes! Special vocal chords not included.
+  noSpawn: true
   components:
-  - type: TranslatorImplanter
-    spoken:
-    - Bubblish
+  - type: TranslatorImplant
     understood:
     - Bubblish
+    spoken:
+    - Bubblish
+    requires:
+    - GalacticCommon
 
 - type: entity
-  id: NekomimeticTranslatorImplanter
-  parent: [ BaseTranslatorImplanter ]
-  name: Nekomimetic translator implant
-  description: An implant giving the ability to understand and speak Nekomimetic. Nya~!
+  parent: BaseSubdermalImplant
+  id: NekomimeticTranslatorImplant
+  name: nekomimetic translator implant
+  description: A translator implant intially designed to help domestic cat owners understand their pets, now granting the ability to understand and speak to Felinids!
+  noSpawn: true
   components:
-  - type: TranslatorImplanter
-    spoken:
-    - Nekomimetic
+  - type: TranslatorImplant
     understood:
     - Nekomimetic
+    spoken:
+    - Nekomimetic
+    requires:
+    - GalacticCommon
 
 - type: entity
-  id: DraconicTranslatorImplanter
-  parent: [ BaseTranslatorImplanter ]
-  name: Draconic translator implant
-  description: An implant giving the ability to understand and speak Draconic.
+  parent: BaseSubdermalImplant
+  id: DraconicTranslatorImplant
+  name: draconic translator implant
+  description: A translator implant giving the ability to speak to dragons! Subsequently, also allows to communicate with the Unathi.
+  noSpawn: true
   components:
-  - type: TranslatorImplanter
-    spoken:
-    - Draconic
+  - type: TranslatorImplant
     understood:
     - Draconic
+    spoken:
+    - Draconic
+    requires:
+    - GalacticCommon
 
 - type: entity
-  id: CanilunztTranslatorImplanter
-  parent: [ BaseTranslatorImplanter ]
-  name: Canilunzt translator implant
-  description: An implant giving the ability to understand and speak Canilunzt. Yeeps!
+  parent: BaseSubdermalImplant
+  id: CanilunztTranslatorImplant
+  name: canilunzt translator implant
+  description: A translator implant that helps you communicate with your local yeepers. Yeep!
+  noSpawn: true
   components:
-  - type: TranslatorImplanter
-    spoken:
-    - Canilunzt
+  - type: TranslatorImplant
     understood:
     - Canilunzt
+    spoken:
+    - Canilunzt
+    requires:
+    - GalacticCommon
 
 - type: entity
-  id: SolCommonTranslatorImplanter
-  parent: [ BaseTranslatorImplanter ]
-  name: SolCommon translator implant
+  parent: BaseSubdermalImplant
+  id: SolCommonTranslatorImplant
+  name: sol-common translator implant
   description: An implant giving the ability to understand and speak SolCommon. Raaagh!
+  noSpawn: true
   components:
-  - type: TranslatorImplanter
-    spoken:
-    - SolCommon
+  - type: TranslatorImplant
     understood:
     - SolCommon
+    spoken:
+    - SolCommon
+    requires:
+    - GalacticCommon
 
 - type: entity
-  id: RootSpeakTranslatorImplanter
-  parent: [ BaseTranslatorImplanter ]
-  name: RootSpeak translator implant
-  description: An implant giving the ability to understand and speak RootSpeak.
+  parent: BaseSubdermalImplant
+  id: RootSpeakTranslatorImplant
+  name: root-speak translator implant
+  description: An implant that lets you speak for the trees. Or to the trees.
+  noSpawn: true
   components:
-  - type: TranslatorImplanter
-    spoken:
-    - RootSpeak
+  - type: TranslatorImplant
     understood:
     - RootSpeak
+    spoken:
+    - RootSpeak
+    requires:
+    - GalacticCommon
 
 - type: entity
-  id: MofficTranslatorImplanter
-  parent: [ BaseTranslatorImplanter ]
+  parent: BaseSubdermalImplant
+  id: MofficTranslatorImplant
   name: Moffic translator implant
-  description: An implant giving the ability to understand and speak Moffic.
+  description: An implant designed to help domesticate mothroaches. Subsequently, allows you to communicate with the moth people.
+  noSpawn: true
   components:
-  - type: TranslatorImplanter
-    spoken:
-    - Moffic
+  - type: TranslatorImplant
     understood:
     - Moffic
+    spoken:
+    - Moffic
+    requires:
+    - GalacticCommon
diff --git a/Resources/Prototypes/Entities/Objects/Devices/translators.yml b/Resources/Prototypes/Entities/Objects/Devices/translators.yml
index e5ad824c5d9..664626ea4b4 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/translators.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/translators.yml
@@ -1,7 +1,7 @@
 - type: entity
   abstract: true
   id: TranslatorUnpowered
-  parent: [ BaseItem ]
+  parent: BaseItem
   name: translator
   description: Translates speech.
   components:
@@ -36,7 +36,7 @@
 - type: entity
   abstract: true
   id: TranslatorEmpty
-  parent: [ Translator ]
+  parent: Translator
   suffix: Empty
   components:
   - type: ItemSlots
@@ -49,7 +49,7 @@
   id: CanilunztTranslator
   parent: [ TranslatorEmpty ]
   name: Canilunzt translator
-  description: Translates speech between Canilunzt and Galactic Common.
+  description: Translates speech between Canilunzt and Galactic Common, allowing your local yeepers to communicate with the locals and vice versa!
   components:
   - type: HandheldTranslator
     spoken:
@@ -66,7 +66,7 @@
   id: BubblishTranslator
   parent: [ TranslatorEmpty ]
   name: Bubblish translator
-  description: Translates speech between Bubblish and Galactic Common.
+  description: Translates speech between Bubblish and Galactic Common, helping communicate with slimes and slime people.
   components:
   - type: HandheldTranslator
     spoken:
@@ -83,7 +83,7 @@
   id: NekomimeticTranslator
   parent: [ TranslatorEmpty ]
   name: Nekomimetic translator
-  description: Translates speech between Nekomimetic and Galactic Common. Why would you want that?
+  description: Translates speech between Nekomimetic and Galactic Common, enabling you to communicate with your pet cats.
   components:
   - type: HandheldTranslator
     spoken:
@@ -100,7 +100,7 @@
   id: DraconicTranslator
   parent: [ TranslatorEmpty ]
   name: Draconic translator
-  description: Translates speech between Draconic and Galactic Common.
+  description: Translates speech between Draconic and Galactic Common, making it easier to understand your local Uniathi.
   components:
   - type: HandheldTranslator
     spoken:
@@ -134,7 +134,7 @@
   id: RootSpeakTranslator
   parent: [ TranslatorEmpty ]
   name: RootSpeak translator
-  description: Translates speech between RootSpeak and Galactic Common. Like a true plant?
+  description: Translates speech between RootSpeak and Galactic Common. You may now speak for the trees.
   components:
   - type: HandheldTranslator
     spoken:
@@ -151,7 +151,7 @@
   id: MofficTranslator
   parent: [ TranslatorEmpty ]
   name: Moffic translator
-  description: Translates speech between Moffic and Galactic Common. Like a true moth... or bug?
+  description: Translates speech between Moffic and Galactic Common, helping you understand the buzzes of your pet mothroach!
   components:
   - type: HandheldTranslator
     spoken:
@@ -168,7 +168,7 @@
   id: XenoTranslator
   parent: [ TranslatorEmpty ]
   name: Xeno translator
-  description: Translates speech between Xeno and Galactic Common. Not sure if that will help.
+  description: Translates speech between Xeno and Galactic Common. This will probably not help you survive an encounter, though.
   components:
   - type: HandheldTranslator
     spoken:
@@ -184,7 +184,7 @@
   id: AnimalTranslator
   parent: [ TranslatorEmpty ]
   name: Animal translator
-  description: Translates all the cutes noises that animals make into a more understandable form!
+  description: Translates all the cutes noises that most animals make into a more understandable form!
   components:
   - type: HandheldTranslator
     understood:
@@ -203,3 +203,4 @@
     - Kobold
     requires:
     - GalacticCommon
+    setLanguageOnInteract: false
diff --git a/Resources/Prototypes/Entities/Objects/Misc/translator_implanters.yml b/Resources/Prototypes/Entities/Objects/Misc/translator_implanters.yml
new file mode 100644
index 00000000000..8b5b262ff8a
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Misc/translator_implanters.yml
@@ -0,0 +1,77 @@
+- type: entity
+  id: BaseTranslatorImplanter
+  abstract: true
+  parent: BaseImplantOnlyImplanter
+  name: basic translator implanter
+
+- type: entity
+  id: BasicGalaticCommonTranslatorImplanter
+  parent: BaseTranslatorImplanter
+  name: basic common translator implanter
+  components:
+  - type: Implanter
+    implant: BasicGalacticCommonTranslatorImplant
+
+- type: entity
+  id: AdvancedGalaticCommonTranslatorImplanter
+  parent: BaseTranslatorImplanter
+  name: advanced common translator implanter
+  components:
+  - type: Implanter
+    implant: GalacticCommonTranslatorImplant
+
+- type: entity
+  id: BubblishTranslatorImplanter
+  parent: BaseTranslatorImplanter
+  name: bubblish translator implant
+  components:
+  - type: Implanter
+    implant: BubblishTranslatorImplant
+
+- type: entity
+  id: NekomimeticTranslatorImplanter
+  parent: [ BaseTranslatorImplanter ]
+  name: nekomimetic translator implant
+  components:
+  - type: Implanter
+    implant: NekomimeticTranslatorImplant
+
+- type: entity
+  id: DraconicTranslatorImplanter
+  parent: [ BaseTranslatorImplanter ]
+  name: draconic translator implant
+  components:
+  - type: Implanter
+    implant: DraconicTranslatorImplant
+
+- type: entity
+  id: CanilunztTranslatorImplanter
+  parent: [ BaseTranslatorImplanter ]
+  name: canilunzt translator implant
+  components:
+  - type: Implanter
+    implant: CanilunztTranslatorImplant
+
+- type: entity
+  id: SolCommonTranslatorImplanter
+  parent: [ BaseTranslatorImplanter ]
+  name: sol-common translator implant
+  components:
+  - type: Implanter
+    implant: SolCommonTranslatorImplant
+
+- type: entity
+  id: RootSpeakTranslatorImplanter
+  parent: [ BaseTranslatorImplanter ]
+  name: root-speak translator implant
+  components:
+  - type: Implanter
+    implant: RootSpeakTranslatorImplant
+
+- type: entity
+  id: MofficTranslatorImplanter
+  parent: [ BaseTranslatorImplanter ]
+  name: moffic translator implant
+  components:
+  - type: Implanter
+    implant: MofficTranslatorImplant
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
index 2b232d643d3..f5306b1653c 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
@@ -373,6 +373,17 @@
     - type: Sprite
       sprite: Objects/Specific/Hydroponics/lingzhi.rsi
 
+- type: entity
+  parent: SeedBase
+  name: packet of pomegranate seeds
+  description: "The Fruit of the Underworld"
+  id: PomegranateSeeds
+  components:
+    - type: Seed
+      seedId: pomegranate
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/pomegranate.rsi
+
 - type: entity
   parent: SeedBase
   name: packet of ambrosia vulgaris seeds
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 2a10abf3b34..6b478a646e6 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -84,6 +84,7 @@
     idleState: icon
     runningState: building
     staticRecipes:
+      - ShockCollar # FloofStation
       - Wirecutter
       - Igniter
       - Signaller
@@ -742,6 +743,7 @@
       - ShellShotgunPractice
       - WeaponLaserCarbinePractice
       - WeaponDisablerPractice
+      - ShockCollar # Nyanotrasen - Shock Collar
       # DeltaV - .38 special ammo - Add various .38 special ammo to security techfab
       - MagazineBoxSpecial
       - MagazineBoxSpecialPractice
@@ -798,7 +800,6 @@
       - WeaponLaserCarbine
       - ClothingHeadHelmetInsulated # Nyanotrasen - Insulative headgear
       - ClothingHeadCage # Nyanotrasen - Insulative headgear
-      - ShockCollar # Nyanotrasen - Shock Collar
       - WeaponXrayCannon
       - PowerCageSmall
       - PowerCageMedium
diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
index 380f7e012d1..2c4fccb8b3e 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@@ -104,7 +104,7 @@
     price: 100
   - type: Appearance
   - type: WiresVisuals
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - GalacticCommon
     - RobotTalk
diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml b/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml
new file mode 100644
index 00000000000..e5c76890ba5
--- /dev/null
+++ b/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml
@@ -0,0 +1,14 @@
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformLoinCloth
+  name: loin cloth
+  description: A piece of cloth wrapped around the waist.
+  components:
+  - type: Item
+    size: Small
+  - type: Sprite
+    sprite: Floof/Clothing/Uniforms/loincloth.rsi
+  - type: Clothing
+    sprite: Floof/Clothing/Uniforms/loincloth.rsi
+    equipDelay: 0
+    unequipDelay: 0
diff --git a/Resources/Prototypes/Floof/Loadouts/uniform.yml b/Resources/Prototypes/Floof/Loadouts/uniform.yml
new file mode 100644
index 00000000000..35c197603f9
--- /dev/null
+++ b/Resources/Prototypes/Floof/Loadouts/uniform.yml
@@ -0,0 +1,7 @@
+- type: loadout
+  id: LoadoutUniformLoinCloth
+  category: Uniform
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingUniformLoinCloth
diff --git a/Resources/Prototypes/FloofStation/Flavors/flavors.yml b/Resources/Prototypes/FloofStation/Flavors/flavors.yml
new file mode 100644
index 00000000000..e9a75f2231f
--- /dev/null
+++ b/Resources/Prototypes/FloofStation/Flavors/flavors.yml
@@ -0,0 +1,4 @@
+- type: flavor
+  id: nikkonectar
+  flavorType: Complex
+  description: flavor-complex-nikkonectar
diff --git a/Resources/Prototypes/FloofStation/Reactions/chemicals.yml b/Resources/Prototypes/FloofStation/Reactions/chemicals.yml
new file mode 100644
index 00000000000..e0e9caed66f
--- /dev/null
+++ b/Resources/Prototypes/FloofStation/Reactions/chemicals.yml
@@ -0,0 +1,15 @@
+- type: reaction
+  minTemp: 369
+  id: Libidozenithizine
+  impact: High
+  reactants:
+    Pomelustine:
+      amount: 5
+    Philterex:
+      amount: 5
+    Impedrezene:
+      amount: 5
+    Silicon:
+      amount: 5
+  products:
+    Libidozenithizine: 5
diff --git a/Resources/Prototypes/FloofStation/Reactions/medicine.yml b/Resources/Prototypes/FloofStation/Reactions/medicine.yml
new file mode 100644
index 00000000000..858a56a8e28
--- /dev/null
+++ b/Resources/Prototypes/FloofStation/Reactions/medicine.yml
@@ -0,0 +1,14 @@
+- type: reaction
+  id: Philterex
+  impact: Medium
+  reactants:
+    Inaprovaline:
+      amount: 2
+    Saline:
+      amount: 1
+    Ephedrine:
+      amount: 1
+    Benzene:
+      amount: 1
+  products:
+      Philterex: 5
diff --git a/Resources/Prototypes/FloofStation/Reagents/Aphrodisiacs/medicine.yml b/Resources/Prototypes/FloofStation/Reagents/Aphrodisiacs/medicine.yml
new file mode 100644
index 00000000000..10e77d2fdaf
--- /dev/null
+++ b/Resources/Prototypes/FloofStation/Reagents/Aphrodisiacs/medicine.yml
@@ -0,0 +1,130 @@
+- type: reagent
+  id: Pomelustine
+  name: reagent-name-pomelustine
+  group: Medicine
+  desc: reagent-desc-pomelustine
+  physicalDesc: reagent-physical-desc-sticky
+  flavor: fruity
+  color: "#45072f"
+  metabolisms:
+    Medicine:
+      metabolismRate : 0.03
+      effects:
+      - !type:PopupMessage
+        type: Local
+        visualType: Medium
+        messages:
+          - "reagent-effect-aphrodisiac-mild1"
+          - "reagent-effect-aphrodisiac-mild2"
+          - "reagent-effect-aphrodisiac-mild3"
+          - "reagent-effect-aphrodisiac-mild4"
+          - "reagent-effect-aphrodisiac-mild5"
+        probability: 0.035
+        conditions:
+          - !type:ReagentThreshold
+            max: 50
+      - !type:PopupMessage # Overdose causes nausea and vomiting
+        type: Local
+        visualType: Medium
+        messages:
+          - "reagent-effect-aphrodisiac-mildoverdose"
+        probablity: 0.06
+        conditions:
+          - !type:ReagentThreshold
+            min: 50
+      - !type:Drunk
+        conditions:
+        - !type:ReagentThreshold
+          min: 50
+      - !type:ChemVomit
+        conditions:
+        - !type:ReagentThreshold
+          min: 60
+        probability: 0.05
+      - !type:PopupMessage
+        type: Local
+        visualType: Small
+        messages:
+          - "reagent-effect-aphrodisiac-fade" # A decent chance to notify the player when their meds run out, but could happen silently.
+        probability: 0.35
+        conditions:
+          - !type:ReagentThreshold
+            max: 0.1
+
+- type: reagent
+  id: Philterex
+  name: reagent-name-philterex
+  group: Medicine
+  desc: reagent-desc-philterex
+  physicalDesc: reagent-physical-desc-syrupy
+  flavor: sweet
+  color: "#ae0072"
+  metabolisms:
+    Medicine:
+      metabolismRate : 0.02
+      effects:
+      - !type:PopupMessage
+        type: Local
+        visualType: Large
+        messages:
+          - "reagent-effect-aphrodisiac-normal1"
+          - "reagent-effect-aphrodisiac-normal2"
+          - "reagent-effect-aphrodisiac-normal3"
+          - "reagent-effect-aphrodisiac-normal4"
+          - "reagent-effect-aphrodisiac-normal5"
+        probability: 0.04
+        conditions:
+        - !type:ReagentThreshold
+          max: 16.5
+      - !type:PopupMessage
+        type: Local
+        visualType: MediumCaution
+        messages:
+          - "reagent-effect-aphrodisiac-normaloverdose1" # overdose makes you tired and forgetful
+          - "reagent-effect-aphrodisiac-normaloverdose2"
+          - "reagent-effect-aphrodisiac-normaloverdose3"
+          - "reagent-effect-aphrodisiac-normaloverdose4"
+          - "reagent-effect-aphrodisiac-normaloverdose5"
+          - "reagent-effect-aphrodisiac-normaloverdose6"
+        probability: 0.06
+        conditions:
+        - !type:ReagentThreshold
+          min: 16.5
+      - !type:Emote
+        conditions:
+        - !type:ReagentThreshold
+          min: 16.5
+        emote: Yawn
+        showInChat: true
+        probability: 0.02
+      - !type:MovespeedModifier
+        walkSpeedModifier: 0.8
+        sprintSpeedModifier: 0.8
+        conditions:
+        - !type:ReagentThreshold
+          min: 16.5
+      - !type:GenericStatusEffect
+        conditions:
+        - !type:ReagentThreshold
+          min: 30.0
+        key: ForcedSleep
+        component: ForcedSleeping
+        refresh: false
+        type: Add
+        probability: 0.1
+      - !type:HealthChange # poisons you if you take way too much
+        conditions:
+        - !type:ReagentThreshold
+          min: 30
+        damage:
+          types:
+            Poison: 1
+      - !type:PopupMessage
+        type: Local
+        visualType: Small
+        messages:
+          - "reagent-effect-aphrodisiac-fade" # A decent chance to notify the player when their meds run out, but could happen silently.
+        probability: 0.32
+        conditions:
+          - !type:ReagentThreshold
+            max: 0.1
diff --git a/Resources/Prototypes/FloofStation/Reagents/Aphrodisiacs/narcotics.yml b/Resources/Prototypes/FloofStation/Reagents/Aphrodisiacs/narcotics.yml
new file mode 100644
index 00000000000..702bd1593a3
--- /dev/null
+++ b/Resources/Prototypes/FloofStation/Reagents/Aphrodisiacs/narcotics.yml
@@ -0,0 +1,50 @@
+- type: reagent
+  id: Libidozenithizine
+  name: reagent-name-libidozenithizine
+  group: Narcotics
+  desc: reagent-desc-libidozenithizine
+  physicalDesc: reagent-physical-desc-milky
+  flavor: spooky
+  color: "#c90084"
+  metabolisms:
+    Narcotic:
+      effects:
+      - !type:PopupMessage
+        type: Local
+        visualType: Medium
+        probability: 0.10
+        messages:
+        - reagent-effect-aphrodisiac-strong1
+        - reagent-effect-aphrodisiac-strong2
+        - reagent-effect-aphrodisiac-strong3
+        conditions:
+        - !type:ReagentThreshold
+          max: 10.0
+      - !type:HealthChange
+        conditions:
+        - !type:ReagentThreshold
+          min: 10.0
+        damage:
+          types:
+            Poison: 0.05
+      - !type:PopupMessage
+        type: Local
+        visualType: LargeCaution
+        probability: 0.2
+        messages:
+        - reagent-effect-aphrodisiac-strongoverdose1
+        - reagent-effect-aphrodisiac-strongoverdose2
+        - reagent-effect-aphrodisiac-strongoverdose3
+        - reagent-effect-aphrodisiac-strongoverdose4
+        conditions:
+        - !type:ReagentThreshold
+          min: 10.0
+      - !type:PopupMessage
+        type: Local
+        visualType: Small
+        probability: 0.2
+        messages:
+          - "reagent-effect-aphrodisiac-fade"
+        conditions:
+          - !type:ReagentThreshold
+            max: 0.1
diff --git a/Resources/Prototypes/FloofStation/Reagents/Drinks/drinks.yml b/Resources/Prototypes/FloofStation/Reagents/Drinks/drinks.yml
new file mode 100644
index 00000000000..cf39c6e3191
--- /dev/null
+++ b/Resources/Prototypes/FloofStation/Reagents/Drinks/drinks.yml
@@ -0,0 +1,20 @@
+- type: reagent
+  id: NikkosNaughtyNectar
+  name: reagent-name-NNN
+  parent: BaseDrink
+  desc: reagent-desc-NNN
+  physicalDesc: reagent-physical-desc-creamy
+  flavor: nikkonectar
+  color: "#deebff"
+  recognizable: true
+  viscosity: 0.15
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+       #TO-DO Lust+
+  footstepSound:
+    collection: FootstepSticky
+    params:
+      volume: 3
diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml
index 82a3fba5b41..c61c85ae86b 100644
--- a/Resources/Prototypes/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Hydroponics/seeds.yml
@@ -1032,6 +1032,33 @@
       Max: 20
       PotencyDivisor: 5
 
+- type: seed
+  id: pomegranate
+  name: seeds-pomegranate-name
+  noun: seeds-noun-seeds
+  displayName: seeds-pomegranate-display-name
+  plantRsi: Objects/Specific/Hydroponics/pomegranate.rsi
+  packetPrototype: PomegranateSeeds
+  productPrototypes:
+    - FoodPomegranate
+  harvestRepeat: Repeat
+  lifespan: 55
+  maturation: 6
+  production: 6
+  yield: 3
+  potency: 10
+  idealLight: 6
+  waterConsumption: 0.60
+  chemicals:
+    Pomelustine:
+      Min: 5
+      Max: 30
+      PotencyDivisor: 10
+    Nutriment:
+      Min: 1
+      Max: 10
+      PotencyDivisor: 25
+
 - type: seed
   id: ambrosiaVulgaris
   name: seeds-ambrosiavulgaris-name
diff --git a/Resources/Prototypes/Language/languages.yml b/Resources/Prototypes/Language/languages.yml
index 90bce1baed2..048fdc6f24c 100644
--- a/Resources/Prototypes/Language/languages.yml
+++ b/Resources/Prototypes/Language/languages.yml
@@ -1,493 +1,569 @@
 # The universal language, assumed if the entity has a UniversalLanguageSpeakerComponent.
-# Do not use otherwise. Try to use the respective component instead of this language.
+# Do not use otherwise. Making an entity explicitly understand/speak this language will NOT have the desired effect.
 - type: language
   id: Universal
-  obfuscateSyllables: false
-  replacement:
-  - "*incomprehensible*"
+  obfuscation:
+    !type:ReplacementObfuscation
+    replacement:
+    - "*incomprehensible*" # Never actually used
 
 # The common galactic tongue.
 - type: language
   id: GalacticCommon
-  obfuscateSyllables: true
-  replacement:
-  - Blah
-  - Blah
-  - Blah
-  - dingle-doingle
-  - dingle
-  - dangle
-  - jibber-jabber
-  - jubber
-  - bleh
-  - zippity
-  - zoop
-  - wibble
-  - wobble
-  - wiggle
-  - yada
-  - meh
-  - neh
-  - nah
-  - wah
+  obfuscation:
+    !type:SyllableObfuscation
+    minSyllables: 1
+    maxSyllables: 3
+    replacement:
+    - blah
+    - blah
+    - blah
+    - dingle-doingle
+    - dingle
+    - dangle
+    - jibber-jabber
+    - jubber
+    - bleh
+    - zippity
+    - zoop
+    - wibble
+    - wobble
+    - wiggle
+    - yada
+    - meh
+    - neh
+    - nah
+    - wah
 
 # Spoken by slimes.
 - type: language
   id: Bubblish
-  obfuscateSyllables: true
-  replacement:
-  - blob
-  - plop
-  - pop
-  - bop
-  - boop
+  color: "#0077aa"
+  fontId: RubikBubbles
+  obfuscation:
+    !type:SyllableObfuscation
+    minSyllables: 1
+    maxSyllables: 3
+    replacement:
+    - blob
+    - plop
+    - pop
+    - bop
+    - boop
 
 # Spoken by moths.
 - type: language
   id: Moffic
-  obfuscateSyllables: true
-  replacement:
-  - år
-  - i
-  - går
-  - sek
-  - mo
-  - ff
-  - ok
-  - gj
-  - ø
-  - gå
-  - la
-  - le
-  - lit
-  - ygg
-  - van
-  - dår
-  - næ
-  - møt
-  - idd
-  - hvo
-  - ja
-  - på
-  - han
-  - så
-  - ån
-  - det
-  - att
-  - nå
-  - gö
-  - bra
-  - int
-  - tyc
-  - om
-  - när
-  - två
-  - må
-  - dag
-  - sjä
-  - vii
-  - vuo
-  - eil
-  - tun
-  - käyt
-  - teh
-  - vä
-  - hei
-  - huo
-  - suo
-  - ää
-  - ten
-  - ja
-  - heu
-  - stu
-  - uhr
-  - kön
-  - we
-  - hön
+  color: "#869b29"
+  fontId: Copperplate
+  obfuscation:
+    !type:SyllableObfuscation
+    minSyllables: 2 # Replacements are really short
+    maxSyllables: 4
+    replacement:
+    - år
+    - i
+    - går
+    - sek
+    - mo
+    - ff
+    - ok
+    - gj
+    - ø
+    - gå
+    - la
+    - le
+    - lit
+    - ygg
+    - van
+    - dår
+    - næ
+    - møt
+    - idd
+    - hvo
+    - ja
+    - på
+    - han
+    - så
+    - ån
+    - det
+    - att
+    - nå
+    - gö
+    - bra
+    - int
+    - tyc
+    - om
+    - när
+    - två
+    - må
+    - dag
+    - sjä
+    - vii
+    - vuo
+    - eil
+    - tun
+    - käyt
+    - teh
+    - vä
+    - hei
+    - huo
+    - suo
+    - ää
+    - ten
+    - ja
+    - heu
+    - stu
+    - uhr
+    - kön
+    - we
+    - hön
 
-  # Spoken by dionas.
+# Spoken by dionas.
 - type: language
   id: RootSpeak
-  obfuscateSyllables: true
-  replacement:
-  - hs
-  - zt
-  - kr
-  - st
-  - sh
+  color: "#804000"
+  fontId: Noganas
+  obfuscation:
+    !type:SyllableObfuscation
+    minSyllables: 1
+    maxSyllables: 5
+    replacement:
+    - hs
+    - zt
+    - kr
+    - st
+    - sh
 
 # A mess of broken Japanese, spoken by Felinds and Oni
 - type: language
   id: Nekomimetic
-  obfuscateSyllables: true
-  replacement:
-  - neko
-  - nyan
-  - mimi
-  - moe
-  - mofu
-  - fuwa
-  - kyaa
-  - kawaii
-  - poka
-  - munya
-  - puni
-  - munyu
-  - ufufu
-  - icha
-  - doki
-  - kyun
-  - kusu
-  - nya
-  - nyaa
-  - desu
-  - kis
-  - ama
-  - chuu
-  - baka
-  - hewo
-  - boop
-  - gato
-  - kit
-  - sune
-  - yori
-  - sou
-  - baka
-  - chan
-  - san
-  - kun
-  - mahou
-  - yatta
-  - suki
-  - usagi
-  - domo
-  - ori
-  - uwa
-  - zaazaa
-  - shiku
-  - puru
-  - ira
-  - heto
-  - etto
+  color: "#803B56"
+  fontId: Manga
+  obfuscation:
+    !type:SyllableObfuscation
+    minSyllables: 1
+    maxSyllables: 3 # May be too long even, we'll see.
+    replacement:
+    - neko
+    - nyan
+    - mimi
+    - moe
+    - mofu
+    - fuwa
+    - kyaa
+    - kawaii
+    - poka
+    - munya
+    - puni
+    - munyu
+    - ufufu
+    - icha
+    - doki
+    - kyun
+    - kusu
+    - nya
+    - nyaa
+    - desu
+    - kis
+    - ama
+    - chuu
+    - baka
+    - hewo
+    - boop
+    - gato
+    - kit
+    - sune
+    - yori
+    - sou
+    - baka
+    - chan
+    - san
+    - kun
+    - mahou
+    - yatta
+    - suki
+    - usagi
+    - domo
+    - ori
+    - uwa
+    - zaazaa
+    - shiku
+    - puru
+    - ira
+    - heto
+    - etto
 
 # Spoken by the Lizard race.
 - type: language
   id: Draconic
-  obfuscateSyllables: true
-  replacement:
-  - za
-  - az
-  - ze
-  - ez
-  - zi
-  - iz
-  - zo
-  - oz
-  - zu
-  - uz
-  - zs
-  - sz
-  - ha
-  - ah
-  - he
-  - eh
-  - hi
-  - ih
-  - ho
-  - oh
-  - hu
-  - uh
-  - hs
-  - sh
-  - la
-  - al
-  - le
-  - el
-  - li
-  - il
-  - lo
-  - ol
-  - lu
-  - ul
-  - ls
-  - sl
-  - ka
-  - ak
-  - ke
-  - ek
-  - ki
-  - ik
-  - ko
-  - ok
-  - ku
-  - uk
-  - ks
-  - sk
-  - sa
-  - as
-  - se
-  - es
-  - si
-  - is
-  - so
-  - os
-  - su
-  - us
-  - ss
-  - ss
-  - ra
-  - ar
-  - re
-  - er
-  - ri
-  - ir
-  - ro
-  - or
-  - ru
-  - ur
-  - rs
-  - sr
-  - a
-  - a
-  - e
-  - e
-  - i
-  - i
-  - o
-  - o
-  - u
-  - u
-  - s
-  - s
+  color: "#228b22"
+  obfuscation:
+    !type:SyllableObfuscation
+    minSyllables: 2
+    maxSyllables: 4
+    replacement:
+    - za
+    - az
+    - ze
+    - ez
+    - zi
+    - iz
+    - zo
+    - oz
+    - zu
+    - uz
+    - zs
+    - sz
+    - ha
+    - ah
+    - he
+    - eh
+    - hi
+    - ih
+    - ho
+    - oh
+    - hu
+    - uh
+    - hs
+    - sh
+    - la
+    - al
+    - le
+    - el
+    - li
+    - il
+    - lo
+    - ol
+    - lu
+    - ul
+    - ls
+    - sl
+    - ka
+    - ak
+    - ke
+    - ek
+    - ki
+    - ik
+    - ko
+    - ok
+    - ku
+    - uk
+    - ks
+    - sk
+    - sa
+    - as
+    - se
+    - es
+    - si
+    - is
+    - so
+    - os
+    - su
+    - us
+    - ss
+    - ss
+    - ra
+    - ar
+    - re
+    - er
+    - ri
+    - ir
+    - ro
+    - or
+    - ru
+    - ur
+    - rs
+    - sr
+    - a
+    - a
+    - e
+    - e
+    - i
+    - i
+    - o
+    - o
+    - u
+    - u
+    - s
+    - s
 
 # Spoken by the Vulpkanin race.
 - type: language
   id: Canilunzt
-  obfuscateSyllables: true
-  replacement:
-  - rur
-  - ya
-  - cen
-  - rawr
-  - bar
-  - kuk
-  - tek
-  - qat
-  - uk
-  - wu
-  - vuh
-  - tah
-  - tch
-  - schz
-  - auch
-  - ist
-  - ein
-  - entch
-  - zwichs
-  - tut
-  - mir
-  - wo
-  - bis
-  - es
-  - vor
-  - nic
-  - gro
-  - lll
-  - enem
-  - zandt
-  - tzch
-  - noch
-  - hel
-  - ischt
-  - far
-  - wa
-  - baram
-  - iereng
-  - tech
-  - lach
-  - sam
-  - mak
-  - lich
-  - gen
-  - or
-  - ag
-  - eck
-  - gec
-  - stag
-  - onn
-  - bin
-  - ket
-  - jarl
-  - vulf
-  - einech
-  - cresthz
-  - azunein
-  - ghzth
+  color: "#b97a57"
+  obfuscation:
+    !type:SyllableObfuscation
+    minSyllables: 1
+    maxSyllables: 4
+    replacement:
+    - rur
+    - ya
+    - cen
+    - rawr
+    - bar
+    - kuk
+    - tek
+    - qat
+    - uk
+    - wu
+    - vuh
+    - tah
+    - tch
+    - schz
+    - auch
+    - ist
+    - ein
+    - entch
+    - zwichs
+    - tut
+    - mir
+    - wo
+    - bis
+    - es
+    - vor
+    - nic
+    - gro
+    - enem
+    - zandt
+    - tzch
+    - noch
+    - hel
+    - ischt
+    - far
+    - wa
+    - baram
+    - iereng
+    - tech
+    - lach
+    - sam
+    - mak
+    - lich
+    - gen
+    - or
+    - ag
+    - eck
+    - gec
+    - stag
+    - onn
+    - bin
+    - ket
+    - jarl
+    - vulf
+    - einech
+    - cresthz
+    - azunein
+    - ghzth
 
 # The common language of the Sol system.
 - type: language
   id: SolCommon
-  obfuscateSyllables: true
-  replacement:
-  - tao
-  - shi
-  - tzu
-  - yi
-  - com
-  - be
-  - is
-  - i
-  - op
-  - vi
-  - ed
-  - lec
-  - mo
-  - cle
-  - te
-  - dis
-  - e
+  color: "#8282fb"
+  obfuscation:
+    !type:SyllableObfuscation
+    minSyllables: 1
+    maxSyllables: 4
+    replacement:
+    - tao
+    - shi
+    - tzu
+    - yi
+    - com
+    - be
+    - is
+    - i
+    - op
+    - vi
+    - ed
+    - lec
+    - mo
+    - cle
+    - te
+    - dis
+    - e
 
 - type: language
   id: RobotTalk
-  obfuscateSyllables: true
-  replacement:
-  - 0
-  - 1
-  - 01
-  - 10
-  - 001
-  - 100
-  - 011
-  - 110
-  - 101
-  - 010
+  fontId: Monospace
+  obfuscation:
+    !type:SyllableObfuscation
+    minSyllables: 1
+    maxSyllables: 10 # Crazy
+    replacement:
+    - 0
+    - 1
 
 # Languages spoken by various critters.
 - type: language
   id: Cat
-  obfuscateSyllables: true
-  replacement:
-  - murr
-  - meow
-  - purr
-  - mrow
+  obfuscation:
+    !type:SyllableObfuscation
+    minSyllables: 1
+    maxSyllables: 2
+    replacement:
+    - murr
+    - meow
+    - purr
+    - mrow
 
 - type: language
   id: Dog
-  obfuscateSyllables: true
-  replacement:
-  - woof
-  - bark
-  - ruff
-  - bork
-  - raff
-  - garr
+  obfuscation:
+    !type:SyllableObfuscation
+    minSyllables: 1
+    maxSyllables: 2
+    replacement:
+    - woof
+    - bark
+    - ruff
+    - bork
+    - raff
+    - garr
 
 - type: language
   id: Fox
-  obfuscateSyllables: true
-  replacement:
-  - bark
-  - gecker
-  - ruff
-  - raff
-  - garr
+  obfuscation:
+    !type:SyllableObfuscation
+    minSyllables: 1
+    maxSyllables: 2
+    replacement:
+    - ruff
+    - raff
+    - garr
+    - yip
+    - yap
+    - myah
 
 - type: language
   id: Xeno
-  obfuscateSyllables: true
-  replacement:
-  - sss
-  - sSs
-  - SSS
+  obfuscation:
+    !type:SyllableObfuscation
+    minSyllables: 1
+    maxSyllables: 8 # I was crazy once
+    replacement:
+    - s
+    - S
 
 - type: language
   id: Monkey
-  obfuscateSyllables: true
-  replacement:
-  - ok
-  - ook
-  - oook
-  - ooook
-  - oooook
+  obfuscation:
+    !type:SyllableObfuscation
+    minSyllables: 1
+    maxSyllables: 8 # They locked me in a room...
+    replacement:
+    - o
+    - k
 
 - type: language
   id: Mouse
-  obfuscateSyllables: true
-  replacement:
-  - Squeak
-  - Piep
-  - Chuu
-  - Eeee
-  - Pip
-  - Fwiep
-  - Heep
+  obfuscation:
+    !type:SyllableObfuscation
+    minSyllables: 2
+    maxSyllables: 3
+    replacement:
+    - squ
+    - eak
+    - pi
+    - ep
+    - chuu
+    - ee
+    - fwi
+    - he
 
 - type: language
   id: Chicken
-  obfuscateSyllables: true
-  replacement:
-  - Coo
-  - Coot
-  - Cooot
+  obfuscation:
+    !type:SyllableObfuscation
+    minSyllables: 1
+    maxSyllables: 3
+    replacement:
+    - co
+    - coo
+    - ot
 
 - type: language
   id: Duck
-  obfuscateSyllables: true
-  replacement:
-  - Quack
-  - Quack quack
+  obfuscation:
+    !type:SyllableObfuscation
+    minSyllables: 1
+    maxSyllables: 3
+    replacement:
+    - qu
+    - ack
+    - quack
 
 - type: language
   id: Cow
-  obfuscateSyllables: true
-  replacement:
-  - Moo
-  - Mooo
+  obfuscation:
+    !type:SyllableObfuscation
+    minSyllables: 1
+    maxSyllables: 3
+    replacement:
+    - moo
+    - mooo
 
 - type: language
   id: Sheep
-  obfuscateSyllables: true
-  replacement:
-  - Ba
-  - Baa
-  - Baaa
+  obfuscation:
+    !type:SyllableObfuscation
+    minSyllables: 1
+    maxSyllables: 3
+    replacement:
+    - ba
+    - baa
+    - aa
 
 - type: language
   id: Kangaroo
-  obfuscateSyllables: true
-  replacement:
-  - Shreak
-  - Chuu
+  obfuscation:
+    !type:SyllableObfuscation
+    minSyllables: 1
+    maxSyllables: 3
+    replacement:
+    - shre
+    - ack
+    - chuu
+    - choo
 
 - type: language
   id: Pig
-  obfuscateSyllables: true
-  replacement:
-  - Oink
-  - Oink oink
+  obfuscation:
+    !type:SyllableObfuscation
+    minSyllables: 1
+    maxSyllables: 3
+    replacement:
+    - oink # Please someone come up with something better
 
 - type: language
   id: Crab
-  obfuscateSyllables: true
-  replacement:
-  - Click
-  - Click-clack
-  - Clack
-  - Tipi-tap
-  - Clik-tap
-  - Cliliick
+  obfuscation:
+    !type:SyllableObfuscation
+    minSyllables: 1
+    maxSyllables: 3
+    replacement:
+    - click
+    - clack
+    - ti
+    - pi
+    - tap
+    - cli
+    - ick
 
 - type: language
   id: Kobold
-  obfuscateSyllables: true
-  replacement:
-  - Yip
-  - Grrar.
-  - Yap
-  - Bip
-  - Screet
-  - Gronk
-  - Hiss
-  - Eeee
-  - Yip
+  obfuscation:
+    !type:SyllableObfuscation
+    minSyllables: 2
+    maxSyllables: 4
+    replacement:
+    - yip
+    - yap
+    - gar
+    - grr
+    - ar
+    - scre
+    - et
+    - gronk
+    - hiss
+    - ss
+    - ee
diff --git a/Resources/Prototypes/Loadouts/Jobs/medical.yml b/Resources/Prototypes/Loadouts/Jobs/medical.yml
index 5e88006fcee..6dcce11d09f 100644
--- a/Resources/Prototypes/Loadouts/Jobs/medical.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/medical.yml
@@ -9,6 +9,8 @@
         - MedicalDoctor
         - Paramedic
         - ChiefMedicalOfficer
+        - MedicalIntern
+        - Chemist
   items:
     - ClothingHandsGlovesNitrile
 
@@ -35,6 +37,7 @@
       jobs:
         - MedicalDoctor
         - ChiefMedicalOfficer
+        - MedicalIntern
   items:
     - ClothingNeckStethoscope
 
@@ -47,6 +50,9 @@
     - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
+        - Chemist
+        - Paramedic
+        - MedicalIntern
   items:
     - UniformScrubsColorBlue
 
@@ -59,6 +65,9 @@
     - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
+        - Chemist
+        - Paramedic
+        - MedicalIntern
   items:
     - UniformScrubsColorGreen
 
@@ -71,9 +80,85 @@
     - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
+        - Chemist
+        - Paramedic
+        - MedicalIntern
   items:
     - UniformScrubsColorPurple
 
+- type: loadout
+  id: LoadoutMedicalUniformScrubsCyan
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - MedicalDoctor
+        - Chemist
+        - Paramedic
+        - MedicalIntern
+  items:
+    - UniformScrubsColorCyan
+
+- type: loadout
+  id: LoadoutMedicalUniformScrubsBlack
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - MedicalDoctor
+        - Chemist
+        - Paramedic
+        - MedicalIntern
+  items:
+    - UniformScrubsColorBlack
+
+- type: loadout
+  id: LoadoutMedicalUniformScrubsPink
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - MedicalDoctor
+        - Chemist
+        - Paramedic
+        - MedicalIntern
+  items:
+    - UniformScrubsColorPink
+
+- type: loadout
+  id: LoadoutMedicalUniformScrubsCybersun
+  category: Jobs
+  cost: 3
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - MedicalDoctor
+        - Chemist
+        - Paramedic
+  items:
+    - UniformScrubsColorCybersun
+
+- type: loadout
+  id: LoadoutMedicalOuterCybersunWindbreaker
+  category: Jobs
+  cost: 5
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - MedicalDoctor
+        - Chemist
+        - Paramedic
+  items:
+    - ClothingOuterCoatCybersunWindbreaker
+
 - type: loadout
   id: LoadoutMedicalOuterLabcoatChem
   category: Jobs
@@ -130,6 +215,9 @@
     - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
+        - Chemist
+        - Paramedic
+        - ChiefMedicalOfficer
     - !type:CharacterPlaytimeRequirement
       tracker: JobChemist
       min: 21600 # 6 hours
@@ -151,6 +239,9 @@
     - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
+        - Chemist
+        - Paramedic
+        - ChiefMedicalOfficer
     - !type:CharacterPlaytimeRequirement
       tracker: JobChemist
       min: 21600 # 6 hours
@@ -184,6 +275,9 @@
     - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
+        - Chemist
+        - Paramedic
+        - ChiefMedicalOfficer
     - !type:CharacterPlaytimeRequirement
       tracker: JobChemist
       min: 21600 # 6 hours
@@ -195,3 +289,173 @@
       min: 216000 # 60 hours
   items:
     - ClothingHeadHatBeretSeniorPhysician
+
+- type: loadout
+  id: LoadoutMedicalHeadSurgcapBlue
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - MedicalDoctor
+        - Chemist
+        - Paramedic
+        - MedicalIntern
+  items:
+    - ClothingHeadHatSurgcapBlue
+
+- type: loadout
+  id: LoadoutMedicalHeadSurgcapPurple
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - MedicalDoctor
+        - Chemist
+        - Paramedic
+        - MedicalIntern
+  items:
+    - ClothingHeadHatSurgcapPurple
+
+- type: loadout
+  id: LoadoutMedicalHeadSurgcapGreen
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - MedicalDoctor
+        - Chemist
+        - Paramedic
+        - MedicalIntern
+  items:
+    - ClothingHeadHatSurgcapGreen
+
+- type: loadout
+  id: LoadoutMedicalHeadSurgcapCyan
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - MedicalDoctor
+        - Chemist
+        - Paramedic
+        - MedicalIntern
+  items:
+    - ClothingHeadHatSurgcapCyan
+
+- type: loadout
+  id: LoadoutMedicalHeadSurgcapBlack
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - MedicalDoctor
+        - Chemist
+        - Paramedic
+        - MedicalIntern
+  items:
+    - ClothingHeadHatSurgcapBlack
+
+- type: loadout
+  id: LoadoutMedicalHeadSurgcapPink
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - MedicalDoctor
+        - Chemist
+        - Paramedic
+        - MedicalIntern
+  items:
+    - ClothingHeadHatSurgcapPink
+
+- type: loadout
+  id: LoadoutMedicalHeadSurgcapWhite
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - MedicalDoctor
+        - Chemist
+        - Paramedic
+        - MedicalIntern
+  items:
+    - ClothingHeadHatSurgcapWhite
+
+- type: loadout
+  id: LoadoutMedicalHeadSurgcapCybersun
+  category: Jobs
+  cost: 3
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - MedicalDoctor
+        - Chemist
+        - Paramedic
+  items:
+    - ClothingHeadHatSurgcapCybersun
+
+- type: loadout
+  id: LoadoutMedicalEyesHudMedical
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - MedicalDoctor
+        - Paramedic
+        - ChiefMedicalOfficer
+        - MedicalIntern
+        - Brigmedic
+  items:
+    - ClothingEyesHudMedical
+
+- type: loadout
+  id: LoadoutMedicalEyesEyepatchHudMedical
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - MedicalDoctor
+        - Paramedic
+        - ChiefMedicalOfficer
+        - MedicalIntern
+        - Brigmedic
+  items:
+    - ClothingEyesEyepatchHudMedical
+
+- type: loadout
+  id: LoadoutMedicalEyesHudMedicalPrescription
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - MedicalDoctor
+        - Paramedic
+        - ChiefMedicalOfficer
+        - MedicalIntern
+        - Brigmedic
+    - !type:CharacterTraitRequirement
+      traits:
+        - Nearsighted
+  items:
+    - ClothingEyesPrescriptionMedHud
diff --git a/Resources/Prototypes/Loadouts/Jobs/science.yml b/Resources/Prototypes/Loadouts/Jobs/science.yml
index ad6f02e589e..b9c815a15b0 100644
--- a/Resources/Prototypes/Loadouts/Jobs/science.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/science.yml
@@ -84,3 +84,59 @@
         - ResearchDirector
   items:
     - ClothingHeadHatBeretRND
+
+- type: loadout
+  id: LoadoutScienceEyesHudDiagnostic
+  category: Jobs
+  cost: 3
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Scientist
+        - ResearchAssistant
+        - ResearchDirector
+  items:
+    - ClothingEyesHudDiagnostic
+
+- type: loadout
+  id: LoadoutScienceEyesEyepatchHudDiag
+  category: Jobs
+  cost: 3
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Scientist
+        - ResearchAssistant
+        - ResearchDirector
+  items:
+    - ClothingEyesEyepatchHudDiag
+
+## Robes
+- type: loadout
+  id: LoadoutOuterRobeTechPriest
+  category: Outer
+  cost: 2
+  items:
+    - ClothingOuterRobeTechPriest
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Scientist
+        - ResearchAssistant
+        - ResearchDirector
+
+- type: loadout
+  id: LoadoutHeadHoodTechPriest
+  category: Head
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHeadTechPriest
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Scientist
+        - ResearchAssistant
+        - ResearchDirector
diff --git a/Resources/Prototypes/Loadouts/Jobs/security.yml b/Resources/Prototypes/Loadouts/Jobs/security.yml
index ecf7e4893a2..e6a6693ec18 100644
--- a/Resources/Prototypes/Loadouts/Jobs/security.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/security.yml
@@ -1,7 +1,22 @@
+## Uniforms
 - type: loadout
-  id: LoadoutSecurityUniformGrey
+  id: LoadoutSecurityUniformJumpsuitBlue
   category: Jobs
-  cost: 2
+  cost: 1
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - SecurityOfficer
+        - SecurityCadet
+        - Warden
+  items:
+    - ClothingUniformJumpsuitSecBlue
+
+- type: loadout
+  id: LoadoutSecurityUniformJumpsuitGrey
+  category: Jobs
+  cost: 1
   exclusive: true
   requirements:
     - !type:CharacterJobRequirement
@@ -12,6 +27,34 @@
   items:
     - ClothingUniformJumpsuitSecGrey
 
+- type: loadout
+  id: LoadoutSecurityUniformJumpskirtGrey
+  category: Jobs
+  cost: 1
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - SecurityOfficer
+        - SecurityCadet
+        - Warden
+  items:
+    - ClothingUniformJumpskirtSecGrey
+
+- type: loadout
+  id: LoadoutSecurityUniformJumpskirtBlue
+  category: Jobs
+  cost: 1
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - SecurityOfficer
+        - SecurityCadet
+        - Warden
+  items:
+    - ClothingUniformJumpskirtSecBlue
+
 - type: loadout
   id: LoadoutSecurityUniformJumpskirtSenior
   category: Jobs
@@ -60,6 +103,108 @@
   items:
     - ClothingUniformJumpsuitSeniorOfficer
 
+- type: loadout
+  id: LoadoutUniformJumpsuitWardenBlue
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Warden
+  items:
+    - ClothingUniformJumpsuitWardenBlue
+
+- type: loadout
+  id: LoadoutUniformJumpsuitWardenGrey
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Warden
+  items:
+    - ClothingUniformJumpsuitWardenGrey
+
+- type: loadout
+  id: LoadoutUniformJumpskirtWardenBlue
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Warden
+  items:
+    - ClothingUniformJumpskirtWardenBlue
+
+- type: loadout
+  id: LoadoutUniformJumpskirtWardenGrey
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Warden
+  items:
+    - ClothingUniformJumpskirtWardenGrey
+
+- type: loadout
+  id: LoadoutUniformJumpskirtHoSBlue
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - HeadOfSecurity
+  items:
+    - ClothingUniformJumpskirtHoSBlue
+
+- type: loadout
+  id: LoadoutUniformJumpskirtHoSGrey
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - HeadOfSecurity
+  items:
+    - ClothingUniformJumpskirtHoSGrey
+
+- type: loadout
+  id: LoadoutUniformJumpsuitSecFormal
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Detective
+        - SecurityOfficer
+        - Warden
+        - HeadOfSecurity
+  items:
+    - ClothingUniformJumpsuitSecFormal
+
+- type: loadout
+  id: LoadoutUniformJumpsuitSecSummer
+  category: Jobs
+  cost: 1
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Detective
+        - SecurityOfficer
+        - Warden
+        - HeadOfSecurity
+  items:
+    - ClothingUniformJumpsuitSecSummer
+## Mask
 - type: loadout
   id: LoadoutSecurityMaskGasSwat
   category: Jobs
@@ -73,6 +218,7 @@
   items:
     - ClothingMaskGasSwat
 
+## Shoes
 - type: loadout
   id: LoadoutSecurityShoesJackboots
   category: Jobs
@@ -87,3 +233,119 @@
         - HeadOfSecurity
   items:
     - ClothingShoesBootsJack
+
+## Eyes
+- type: loadout
+  id: LoadoutSecurityEyesHudSecurity
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - SecurityOfficer
+        - Warden
+        - HeadOfSecurity
+        - Brigmedic
+  items:
+    - ClothingEyesHudSecurity
+
+- type: loadout
+  id: LoadoutSecurityEyesEyepatchHudSecurity
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - SecurityOfficer
+        - Warden
+        - HeadOfSecurity
+        - Brigmedic
+  items:
+    - ClothingEyesEyepatchHudSecurity
+
+- type: loadout
+  id: LoadoutSecurityEyesHudSecurityPrescription
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - SecurityOfficer
+        - Warden
+        - HeadOfSecurity
+        - Brigmedic
+    - !type:CharacterTraitRequirement
+      traits:
+        - Nearsighted
+  items:
+    - ClothingEyesPrescriptionHudSecurity
+
+## Head
+- type: loadout
+  id: LoadoutSecurityHeadHatBeret
+  category: Jobs
+  cost: 1
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - SecurityOfficer
+        - Warden
+        - HeadOfSecurity
+        - Brigmedic
+  items:
+    - ClothingHeadHatBeretSecurity
+
+- type: loadout
+  id: LoadoutSecurityHeadHelmetInsulated
+  category: Jobs
+  cost: 3
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - SecurityOfficer
+        - Warden
+        - HeadOfSecurity
+        - Brigmedic
+  items:
+    - ClothingHeadHelmetInsulated
+
+## Belt
+- type: loadout
+  id: LoadoutSecurityBeltWebbing
+  category: Jobs
+  cost: 1
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Detective
+        - SecurityOfficer
+        - SecurityCadet
+        - Warden
+        - HeadOfSecurity
+  items:
+    - ClothingBeltSecurityWebbingFilled
+
+## Species
+#- type: loadout ##Uncomment this and reassess points when we can make it replace the secoff duty pistol
+#  id: LoadoutSecurityEquipmentTruncheon
+#  category: Jobs
+#  cost: 8 ## TODO: Make this replace the secoff handgun, and thus also make it cheaper
+#  requirements:
+#    - !type:CharacterJobRequirement
+#      jobs:
+#        - SecurityOfficer
+#        - Warden
+#        - HeadOfSecurity
+#        - Brigmedic
+#    - !type:CharacterPlaytimeRequirement
+#      tracker: JobSecurityOfficer
+#      min: 36000 # 10 hours
+#    - !type:CharacterSpeciesRequirement
+#      species: Oni
+#  items:
+#    - Truncheon
diff --git a/Resources/Prototypes/Loadouts/Jobs/service.yml b/Resources/Prototypes/Loadouts/Jobs/service.yml
index 6ef3c3ad485..63b6bf22d04 100644
--- a/Resources/Prototypes/Loadouts/Jobs/service.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/service.yml
@@ -1,3 +1,4 @@
+## Clown
 - type: loadout
   id: LoadoutServiceClownOutfitJester
   category: Jobs
@@ -26,6 +27,7 @@
     - ClothingHeadHatJesterAlt
     - ClothingShoesJester
 
+## Bartender
 - type: loadout
   id: LoadoutServiceBartenderUniformPurple
   category: Jobs
@@ -38,6 +40,31 @@
   items:
     - ClothingUniformJumpsuitBartenderPurple
 
+## Botanist
+- type: loadout
+  id: LoadoutServiceBartenderBunnyEars
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Bartender
+  items:
+    - ClothingHeadHatBunny
+
+- type: loadout
+  id: LoadoutServiceBartenderBunnySuit
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Bartender
+  items:
+    - ClothingCostumeBunnySuit
+
 - type: loadout
   id: LoadoutServiceBotanistUniformOveralls
   category: Jobs
@@ -50,6 +77,7 @@
   items:
     - ClothingUniformOveralls
 
+## Lawyer
 - type: loadout
   id: LoadoutServiceLawyerUniformBlueSuit
   category: Jobs
@@ -158,6 +186,7 @@
   items:
     - ClothingUniformJumpsuitJournalist
 
+## Reporter
 - type: loadout
   id: LoadoutServiceReporterUniformDetectivesuit
   category: Jobs
@@ -181,3 +210,15 @@
         - Reporter
   items:
     - ClothingUniformJumpskirtDetective
+
+## Musician
+- type: loadout
+  id: LoadoutItemSynthesizerInstrument
+  category: Jobs
+  cost: 8
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Musician
+  items:
+    - SynthesizerInstrument
diff --git a/Resources/Prototypes/Loadouts/categories.yml b/Resources/Prototypes/Loadouts/categories.yml
index a4381941acc..79d2d7fe2bf 100644
--- a/Resources/Prototypes/Loadouts/categories.yml
+++ b/Resources/Prototypes/Loadouts/categories.yml
@@ -4,7 +4,13 @@
   id: Uncategorized
 
 - type: loadoutCategory
-  id: Accessories
+  id: Eyes
+
+- type: loadoutCategory
+  id: Hands
+
+- type: loadoutCategory
+  id: Head
 
 - type: loadoutCategory
   id: Items
@@ -12,8 +18,17 @@
 - type: loadoutCategory
   id: Jobs
 
+- type: loadoutCategory
+  id: Neck
+
 - type: loadoutCategory
   id: Outer
 
+- type: loadoutCategory
+  id: Shoes
+
+- type: loadoutCategory
+  id: Species
+
 - type: loadoutCategory
   id: Uniform
diff --git a/Resources/Prototypes/Loadouts/eyes.yml b/Resources/Prototypes/Loadouts/eyes.yml
index a7a8cbd7736..74226604e92 100644
--- a/Resources/Prototypes/Loadouts/eyes.yml
+++ b/Resources/Prototypes/Loadouts/eyes.yml
@@ -1,13 +1,21 @@
 - type: loadout
   id: LoadoutEyesEyepatch
-  category: Accessories
+  category: Eyes
   cost: 1
   items:
     - ClothingEyesEyepatch
 
 - type: loadout
   id: LoadoutEyesBlindfold
-  category: Accessories
+  category: Eyes
   cost: 2
   items:
     - ClothingEyesBlindfold
+
+- type: loadout
+  id: LoadoutItemSunglasses
+  category: Eyes
+  cost: 5
+  exclusive: true
+  items:
+    - ClothingEyesGlassesSunglasses
diff --git a/Resources/Prototypes/Loadouts/hands.yml b/Resources/Prototypes/Loadouts/hands.yml
new file mode 100644
index 00000000000..3604678d387
--- /dev/null
+++ b/Resources/Prototypes/Loadouts/hands.yml
@@ -0,0 +1,115 @@
+- type: loadout
+  id: LoadoutHandsColorPurple
+  category: Hands
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHandsGlovesColorPurple
+
+- type: loadout
+  id: LoadoutHandsColorRed
+  category: Hands
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHandsGlovesColorRed
+
+- type: loadout
+  id: LoadoutHandsColorBlack
+  category: Hands
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHandsGlovesColorBlack
+
+- type: loadout
+  id: LoadoutHandsColorBlue
+  category: Hands
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHandsGlovesColorBlue
+
+- type: loadout
+  id: LoadoutHandsColorBrown
+  category: Hands
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHandsGlovesColorBrown
+
+- type: loadout
+  id: LoadoutHandsColorGray
+  category: Hands
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHandsGlovesColorGray
+
+- type: loadout
+  id: LoadoutHandsColorGreen
+  category: Hands
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHandsGlovesColorGreen
+
+- type: loadout
+  id: LoadoutHandsColorLightBrown
+  category: Hands
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHandsGlovesColorLightBrown
+
+- type: loadout
+  id: LoadoutHandsColorOrange
+  category: Hands
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHandsGlovesColorOrange
+
+- type: loadout
+  id: LoadoutHandsColorWhite
+  category: Hands
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHandsGlovesColorWhite
+
+- type: loadout
+  id: LoadoutHandsColorYellowBudget
+  category: Hands
+  cost: 4
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
+  items:
+    - ClothingHandsGlovesColorYellowBudget
+
+- type: loadout
+  id: LoadoutHandsGlovesLeather
+  category: Hands
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHandsGlovesLeather
+
+- type: loadout
+  id: LoadoutHandsGlovesPowerglove
+  category: Hands
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingHandsGlovesPowerglove
+
+- type: loadout
+  id: LoadoutHandsGlovesRobohands
+  category: Hands
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHandsGlovesRobohands
diff --git a/Resources/Prototypes/Loadouts/head.yml b/Resources/Prototypes/Loadouts/head.yml
index 33a2f0b19bc..25cb4dadf11 100644
--- a/Resources/Prototypes/Loadouts/head.yml
+++ b/Resources/Prototypes/Loadouts/head.yml
@@ -1,125 +1,273 @@
+## Hats
 - type: loadout
   id: LoadoutHeadBeaverHat
-  category: Accessories
+  category: Head
   cost: 2
+  exclusive: true
   items:
     - ClothingHeadHatBeaverHat
 
 - type: loadout
   id: LoadoutHeadTophat
-  category: Accessories
+  category: Head
   cost: 2
+  exclusive: true
   items:
     - ClothingHeadHatTophat
 
+- type: loadout
+  id: LoadoutHeadFedoraBlack
+  category: Head
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingHeadHatFedoraBlack
+
+- type: loadout
+  id: LoadoutHeadFedoraChoc
+  category: Head
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingHeadHatFedoraChoc
+
+- type: loadout
+  id: LoadoutHeadFedoraWhite
+  category: Head
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingHeadHatFedoraWhite
+
+- type: loadout
+  id: LoadoutHeadFlatBlack
+  category: Head
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingHeadHatFlatBlack
+
+- type: loadout
+  id: LoadoutHeadFlatBrown
+  category: Head
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingHeadHatFlatBrown
+
+- type: loadout
+  id: LoadoutHeadTinfoil
+  category: Head
+  cost: 3
+  exclusive: true
+  items:
+    - ClothingHeadTinfoil
+
+- type: loadout
+  id: LoadoutHeadBellhop
+  category: Head
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingHeadHatBellhop
+## Color Hats
 - type: loadout
   id: LoadoutHeadHatBluesoft
-  category: Accessories
+  category: Head
   cost: 1
+  exclusive: true
   items:
     - ClothingHeadHatBluesoft
 
 - type: loadout
   id: LoadoutHeadHatBluesoftFlipped
-  category: Accessories
+  category: Head
   cost: 1
+  exclusive: true
   items:
     - ClothingHeadHatBluesoftFlipped
 
 - type: loadout
   id: LoadoutHeadHatCorpsoft
-  category: Accessories
+  category: Head
   cost: 1
+  exclusive: true
   items:
     - ClothingHeadHatCorpsoft
 
 - type: loadout
   id: LoadoutHeadHatCorpsoftFlipped
-  category: Accessories
+  category: Head
   cost: 1
+  exclusive: true
   items:
     - ClothingHeadHatCorpsoftFlipped
 
 - type: loadout
   id: LoadoutHeadHatGreensoft
-  category: Accessories
+  category: Head
   cost: 1
+  exclusive: true
   items:
     - ClothingHeadHatGreensoft
 
 - type: loadout
   id: LoadoutHeadHatGreensoftFlipped
-  category: Accessories
+  category: Head
   cost: 1
+  exclusive: true
   items:
     - ClothingHeadHatGreensoftFlipped
 
 - type: loadout
   id: LoadoutHeadHatGreysoft
-  category: Accessories
+  category: Head
   cost: 1
+  exclusive: true
   items:
     - ClothingHeadHatGreysoft
 
 - type: loadout
   id: LoadoutHeadHatGreysoftFlipped
-  category: Accessories
+  category: Head
   cost: 1
+  exclusive: true
   items:
     - ClothingHeadHatGreysoftFlipped
 
 - type: loadout
   id: LoadoutHeadHatOrangesoft
-  category: Accessories
+  category: Head
   cost: 1
+  exclusive: true
   items:
     - ClothingHeadHatOrangesoft
 
 - type: loadout
   id: LoadoutHeadHatOrangesoftFlipped
-  category: Accessories
+  category: Head
   cost: 1
+  exclusive: true
   items:
     - ClothingHeadHatOrangesoftFlipped
 
 - type: loadout
   id: LoadoutHeadHatPurplesoft
-  category: Accessories
+  category: Head
   cost: 1
+  exclusive: true
   items:
     - ClothingHeadHatPurplesoft
 
 - type: loadout
   id: LoadoutHeadHatPurplesoftFlipped
-  category: Accessories
+  category: Head
   cost: 1
+  exclusive: true
   items:
     - ClothingHeadHatPurplesoftFlipped
 
 - type: loadout
   id: LoadoutHeadHatRedsoft
-  category: Accessories
+  category: Head
   cost: 1
+  exclusive: true
   items:
     - ClothingHeadHatRedsoft
 
 - type: loadout
   id: LoadoutHeadHatRedsoftFlipped
-  category: Accessories
+  category: Head
   cost: 1
+  exclusive: true
   items:
     - ClothingHeadHatRedsoftFlipped
 
 - type: loadout
   id: LoadoutHeadHatYellowsoft
-  category: Accessories
+  category: Head
   cost: 1
+  exclusive: true
   items:
     - ClothingHeadHatYellowsoft
 
 - type: loadout
   id: LoadoutHeadHatYellowsoftFlipped
-  category: Accessories
+  category: Head
   cost: 1
+  exclusive: true
   items:
     - ClothingHeadHatYellowsoftFlipped
+
+## Headbands
+- type: loadout
+  id: LoadoutHeadBandBlack
+  category: Head
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHeadBandBlack
+
+- type: loadout
+  id: LoadoutHeadBandBlue
+  category: Head
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHeadBandBlue
+
+- type: loadout
+  id: LoadoutHeadBandGold
+  category: Head
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHeadBandGold
+
+- type: loadout
+  id: LoadoutHeadBandGreen
+  category: Head
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHeadBandGreen
+
+- type: loadout
+  id: LoadoutHeadBandGrey
+  category: Head
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHeadBandGrey
+
+- type: loadout
+  id: LoadoutHeadBandRed
+  category: Head
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHeadBandRed
+
+- type: loadout
+  id: LoadoutHeadBandSkull
+  category: Head
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHeadBandSkull
+
+- type: loadout
+  id: LoadoutHeadBandMerc
+  category: Head
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingHeadBandMerc
+
+- type: loadout
+  id: LoadoutHeadBandBrown
+  category: Head
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHeadBandBrown
diff --git a/Resources/Prototypes/Loadouts/items.yml b/Resources/Prototypes/Loadouts/items.yml
index 6ce8d260613..072061d2e28 100644
--- a/Resources/Prototypes/Loadouts/items.yml
+++ b/Resources/Prototypes/Loadouts/items.yml
@@ -1,3 +1,4 @@
+#Smokes
 - type: loadout
   id: LoadoutItemCig
   category: Items
@@ -34,11 +35,18 @@
     - CigPackBlack
 
 - type: loadout
-  id: LoadoutItemPAI
+  id: LoadoutItemCigsMixed
   category: Items
   cost: 3
   items:
-    - PersonalAI
+    - CigPackMixed
+
+- type: loadout
+  id: LoadoutItemCigsSyndicate
+  category: Items
+  cost: 4
+  items:
+    - CigPackSyndicate
 
 - type: loadout
   id: LoadoutItemLighter
@@ -61,30 +69,138 @@
   items:
     - Matchbox
 
+## Instruments
 - type: loadout
-  id: LoadoutItemPlushieSharkBlue
+  id: LoadoutItemMicrophoneInstrument
   category: Items
-  cost: 2
+  cost: 4
   items:
-    - PlushieSharkBlue
+    - MicrophoneInstrument
 
 - type: loadout
-  id: LoadoutItemPlushieSharkPink
+  id: LoadoutItemKalimbaInstrument
   category: Items
-  cost: 2
+  cost: 4
+  items:
+    - KalimbaInstrument
+
+- type: loadout
+  id: LoadoutItemTrumpetInstrument
+  category: Items
+  cost: 6
+  items:
+    - TrumpetInstrument
+
+- type: loadout
+  id: LoadoutItemElectricGuitar
+  category: Items
+  cost: 7
+  items:
+    - ElectricGuitarInstrument
+
+- type: loadout
+  id: LoadoutItemBassGuitar
+  category: Items
+  cost: 7
+  items:
+    - BassGuitarInstrument
+
+- type: loadout
+  id: LoadoutItemRockGuitar
+  category: Items
+  cost: 7
+  items:
+    - RockGuitarInstrument
+
+- type: loadout
+  id: LoadoutItemAcousticGuitar
+  category: Items
+  cost: 7
+  items:
+    - AcousticGuitarInstrument
+
+- type: loadout
+  id: LoadoutItemViolin
+  category: Items
+  cost: 6
+  items:
+    - ViolinInstrument
+
+- type: loadout
+  id: LoadoutItemHarmonica
+  category: Items
+  cost: 3
+  items:
+    - HarmonicaInstrument
+
+- type: loadout
+  id: LoadoutItemAccordion
+  category: Items
+  cost: 6
+  items:
+    - AccordionInstrument
+
+- type: loadout
+  id: LoadoutItemFlute
+  category: Items
+  cost: 4
   items:
-    - PlushieSharkPink
+    - FluteInstrument
 
 - type: loadout
-  id: LoadoutItemPlushieSharkGrey
+  id: LoadoutItemOcarina
+  category: Items
+  cost: 3
+  items:
+    - OcarinaInstrument
+
+# Survival Kit
+- type: loadout
+  id: LoadoutItemsEmergencyOxygenTank
+  category: Items
+  cost: 1
+  items:
+    - EmergencyOxygenTankFilled
+
+- type: loadout
+  id: LoadoutItemsExtendedEmergencyOxygenTank
   category: Items
   cost: 2
   items:
-    - PlushieSharkGrey
+    - ExtendedEmergencyOxygenTankFilled
+
+- type: loadout
+  id: LoadoutItemsDoubleEmergencyOxygenTank
+  category: Items
+  cost: 4
+  items:
+    - DoubleEmergencyOxygenTankFilled
+
+- type: loadout
+  id: LoadoutItemsEmergencyCrowbar
+  category: Items
+  cost: 3
+  items:
+    - CrowbarRed
 
+#Misc Items
 - type: loadout
-  id: LoadoutItemPlushieCarp
+  id: LoadoutItemPAI
+  category: Items
+  cost: 3
+  items:
+    - PersonalAI
+
+- type: loadout
+  id: LoadoutItemWaistbag
   category: Items
   cost: 2
   items:
-    - PlushieCarp
+    - ClothingBeltStorageWaistbag
+
+- type: loadout
+  id: LoadoutSolCommonTranslator
+  category: Items
+  cost: 3
+  items:
+    - SolCommonTranslator
diff --git a/Resources/Prototypes/Loadouts/neck.yml b/Resources/Prototypes/Loadouts/neck.yml
index 7e5526f966a..eb933de29ee 100644
--- a/Resources/Prototypes/Loadouts/neck.yml
+++ b/Resources/Prototypes/Loadouts/neck.yml
@@ -1,27 +1,104 @@
 - type: loadout
   id: LoadoutNeckScarfStripedRed
-  category: Accessories
+  category: Neck
   cost: 1
+  exclusive: true
   items:
     - ClothingNeckScarfStripedRed
 
 - type: loadout
   id: LoadoutNeckScarfStripedBlue
-  category: Accessories
+  category: Neck
   cost: 1
+  exclusive: true
   items:
     - ClothingNeckScarfStripedBlue
 
 - type: loadout
   id: LoadoutNeckScarfStripedGreen
-  category: Accessories
+  category: Neck
   cost: 1
+  exclusive: true
   items:
     - ClothingNeckScarfStripedGreen
 
 - type: loadout
   id: LoadoutNeckScarfStripedZebra
-  category: Accessories
+  category: Neck
   cost: 1
+  exclusive: true
   items:
     - ClothingNeckScarfStripedZebra
+
+#Pride Accessories
+- type: loadout
+  id: LoadoutItemsPrideLGBTPin
+  category: Neck
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingNeckLGBTPin
+
+- type: loadout
+  id: LoadoutItemsPrideAromanticPin
+  category: Neck
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingNeckAromanticPin
+
+- type: loadout
+  id: LoadoutItemsPrideAsexualPin
+  category: Neck
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingNeckAsexualPin
+
+- type: loadout
+  id: LoadoutItemsPrideBisexualPin
+  category: Neck
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingNeckBisexualPin
+
+- type: loadout
+  id: LoadoutItemsPrideIntersexPin
+  category: Neck
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingNeckIntersexPin
+
+- type: loadout
+  id: LoadoutItemsPrideLesbianPin
+  category: Neck
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingNeckLesbianPin
+
+- type: loadout
+  id: LoadoutItemsPrideNonBinaryPin
+  category: Neck
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingNeckNonBinaryPin
+
+- type: loadout
+  id: LoadoutItemsPridePansexualPin
+  category: Neck
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingNeckPansexualPin
+
+- type: loadout
+  id: LoadoutItemsPrideTransPin
+  category: Neck
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingNeckTransPin
diff --git a/Resources/Prototypes/Loadouts/outerClothing.yml b/Resources/Prototypes/Loadouts/outerClothing.yml
index 078cf530ba2..a5932214ce9 100644
--- a/Resources/Prototypes/Loadouts/outerClothing.yml
+++ b/Resources/Prototypes/Loadouts/outerClothing.yml
@@ -1,10 +1,3 @@
-- type: loadout
-  id: LoadoutOuterGhostSheet
-  category: Outer
-  cost: 2
-  items:
-    - ClothingOuterGhostSheet
-
 - type: loadout
   id: LoadoutOuterCoatBomberjacket
   category: Outer
@@ -33,6 +26,72 @@
   items:
     - ClothingOuterWinterCoat
 
+- type: loadout
+  id: LoadoutOuterCoatHyenhSweater
+  category: Outer
+  cost: 3
+  items:
+    - ClothingOuterCoatHyenhSweater
+
+- type: loadout
+  id: LoadoutOuterWinterCoatLong
+  category: Outer
+  cost: 3
+  items:
+    - ClothingOuterWinterCoatLong
+
+- type: loadout
+  id: LoadoutOuterWinterCoatPlaid
+  category: Outer
+  cost: 3
+  items:
+    - ClothingOuterWinterCoatPlaid
+
+- type: loadout
+  id: LoadoutOuterVestValet
+  category: Outer
+  cost: 1
+  items:
+    - ClothingOuterVestValet
+
+## Letterman Jackets
+- type: loadout
+  id: LoadoutOuterCoatLettermanBlue
+  category: Outer
+  cost: 3
+  items:
+    - ClothingOuterCoatLettermanBlue
+
+- type: loadout
+  id: LoadoutOuterCoatLettermanRed
+  category: Outer
+  cost: 3
+  items:
+    - ClothingOuterCoatLettermanRed
+
+## MNK
+- type: loadout
+  id: LoadoutOuterCoatMNKWhiteHoodie
+  category: Outer
+  cost: 3
+  items:
+    - ClothingOuterCoatMNKWhiteHoodie
+
+- type: loadout
+  id: LoadoutOuterCoatMNKBlackTopCoat
+  category: Outer
+  cost: 3
+  items:
+    - ClothingOuterCoatMNKBlackTopCoat
+
+- type: loadout
+  id: LoadoutOuterCoatMNKBlackJacket
+  category: Outer
+  cost: 3
+  items:
+    - ClothingOuterCoatMNKBlackJacket
+
+## Contractor Jackets
 - type: loadout
   id: LoadoutOuterCorporateJacket
   category: Outer
diff --git a/Resources/Prototypes/Loadouts/shoes.yml b/Resources/Prototypes/Loadouts/shoes.yml
index 4a1880b5e21..3c2e21e631b 100644
--- a/Resources/Prototypes/Loadouts/shoes.yml
+++ b/Resources/Prototypes/Loadouts/shoes.yml
@@ -1,7 +1,7 @@
 # Colored
 - type: loadout
   id: LoadoutShoesBlack
-  category: Accessories
+  category: Shoes
   cost: 1
   exclusive: true
   items:
@@ -9,7 +9,7 @@
 
 - type: loadout
   id: LoadoutShoesBlue
-  category: Accessories
+  category: Shoes
   cost: 1
   exclusive: true
   items:
@@ -17,7 +17,7 @@
 
 - type: loadout
   id: LoadoutShoesBrown
-  category: Accessories
+  category: Shoes
   cost: 1
   exclusive: true
   items:
@@ -25,7 +25,7 @@
 
 - type: loadout
   id: LoadoutShoesGreen
-  category: Accessories
+  category: Shoes
   cost: 1
   exclusive: true
   items:
@@ -33,7 +33,7 @@
 
 - type: loadout
   id: LoadoutShoesOrange
-  category: Accessories
+  category: Shoes
   cost: 1
   exclusive: true
   items:
@@ -41,7 +41,7 @@
 
 - type: loadout
   id: LoadoutShoesPurple
-  category: Accessories
+  category: Shoes
   cost: 1
   exclusive: true
   items:
@@ -49,7 +49,7 @@
 
 - type: loadout
   id: LoadoutShoesRed
-  category: Accessories
+  category: Shoes
   cost: 1
   exclusive: true
   items:
@@ -57,7 +57,7 @@
 
 - type: loadout
   id: LoadoutShoesWhite
-  category: Accessories
+  category: Shoes
   cost: 1
   exclusive: true
   items:
@@ -65,25 +65,93 @@
 
 - type: loadout
   id: LoadoutShoesYellow
-  category: Accessories
+  category: Shoes
   cost: 1
   exclusive: true
   items:
     - ClothingShoesColorYellow
 
+- type: loadout
+  id: LoadoutShoesGeta
+  category: Shoes
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingShoesGeta
+
+## Boots
+- type: loadout
+  id: LoadoutShoesBootsWork
+  category: Shoes
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingShoesBootsWork
+
+- type: loadout
+  id: LoadoutShoesBootsLaceup
+  category: Shoes
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingShoesBootsLaceup
+
+- type: loadout
+  id: LoadoutShoesBootsWinter
+  category: Shoes
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingShoesBootsWinter
+
+- type: loadout
+  id: LoadoutShoesBootsCowboyBrown
+  category: Shoes
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingShoesBootsCowboyBrown
+
+- type: loadout
+  id: LoadoutShoesBootsCowboyBlack
+  category: Shoes
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingShoesBootsCowboyBlack
+
+- type: loadout
+  id: LoadoutShoesBootsCowboyWhite
+  category: Shoes
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingShoesBootsCowboyWhite
+
+- type: loadout
+  id: LoadoutShoesBootsCowboyFancy
+  category: Shoes
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingShoesBootsCowboyFancy
 
 # Miscellaneous
 - type: loadout
   id: LoadoutShoesSlippersDuck
-  category: Accessories
-  cost: 1
+  category: Shoes
+  cost: 2
   exclusive: true
   items:
     - ClothingShoeSlippersDuck
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Clown
 
 - type: loadout
   id: LoadoutShoesLeather
-  category: Accessories
+  category: Shoes
   cost: 1
   exclusive: true
   items:
@@ -91,7 +159,7 @@
 
 - type: loadout
   id: LoadoutShoesMiscWhite
-  category: Accessories
+  category: Shoes
   cost: 1
   exclusive: true
   items:
diff --git a/Resources/Prototypes/Loadouts/species.yml b/Resources/Prototypes/Loadouts/species.yml
new file mode 100644
index 00000000000..1d2fb58dc0a
--- /dev/null
+++ b/Resources/Prototypes/Loadouts/species.yml
@@ -0,0 +1,35 @@
+- type: loadout
+  id: LoadoutSpeciesEmergencyNitrogenTank
+  category: Species
+  cost: 0
+  requirements:
+    - !type:CharacterSpeciesRequirement
+      species: SlimePerson
+    - !type:CharacterSpeciesRequirement
+      species: Vox
+  items:
+    - EmergencyNitrogenTankFilled
+
+- type: loadout
+  id: LoadoutSpeciesExtendedEmergencyNitrogenTank
+  category: Species
+  cost: 1
+  requirements:
+    - !type:CharacterSpeciesRequirement
+      species: SlimePerson
+    - !type:CharacterSpeciesRequirement
+      species: Vox
+  items:
+    - ExtendedEmergencyNitrogenTankFilled
+
+- type: loadout
+  id: LoadoutSpeciesDoubleEmergencyNitrogenTank
+  category: Species
+  cost: 3
+  requirements:
+    - !type:CharacterSpeciesRequirement
+      species: SlimePerson
+    - !type:CharacterSpeciesRequirement
+      species: Vox
+  items:
+    - DoubleEmergencyNitrogenTankFilled
diff --git a/Resources/Prototypes/Loadouts/uniform.yml b/Resources/Prototypes/Loadouts/uniform.yml
index 5afdd303c0b..20c5b42c7c2 100644
--- a/Resources/Prototypes/Loadouts/uniform.yml
+++ b/Resources/Prototypes/Loadouts/uniform.yml
@@ -19,6 +19,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorBlack
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorBlack
@@ -27,6 +31,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorBlack
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorBlue
@@ -35,6 +43,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorBlue
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorBlue
@@ -43,6 +55,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorBlue
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorGreen
@@ -51,6 +67,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorGreen
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorGreen
@@ -59,6 +79,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorGreen
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorOrange
@@ -67,6 +91,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorOrange
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorOrange
@@ -75,6 +103,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorOrange
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorPink
@@ -83,6 +115,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorPink
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorPink
@@ -91,6 +127,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorPink
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorRed
@@ -99,6 +139,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorRed
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorRed
@@ -107,6 +151,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorRed
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorWhite
@@ -115,6 +163,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorWhite
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorWhite
@@ -123,6 +175,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorWhite
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorYellow
@@ -131,6 +187,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorYellow
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorYellow
@@ -139,6 +199,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorYellow
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorDarkBlue
@@ -147,6 +211,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorDarkBlue
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorDarkBlue
@@ -155,6 +223,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorDarkBlue
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorTeal
@@ -163,6 +235,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorTeal
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorTeal
@@ -171,6 +247,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorTeal
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorPurple
@@ -179,6 +259,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorPurple
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorPurple
@@ -187,6 +271,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorPurple
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorDarkGreen
@@ -195,6 +283,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorDarkGreen
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorDarkGreen
@@ -203,6 +295,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorDarkGreen
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorLightBrown
@@ -211,6 +307,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorLightBrown
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorLightBrown
@@ -219,6 +319,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorLightBrown
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorBrown
@@ -227,6 +331,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorBrown
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorBrown
@@ -235,6 +343,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorBrown
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorMaroon
@@ -243,6 +355,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorMaroon
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorMaroon
@@ -251,11 +367,131 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorMaroon
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
+
+## Kendo
+- type: loadout
+  id: LoadoutUniformKendoHakama
+  category: Uniform
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingUniformKendoHakama
+
+- type: loadout
+  id: LoadoutUniformMartialGi
+  category: Uniform
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingUniformMartialGi
+
+## Kimono
+- type: loadout
+  id: LoadoutClothingKimonoBlue
+  category: Uniform
+  cost: 3
+  exclusive: true
+  items:
+    - ClothingKimonoBlue
+
+- type: loadout
+  id: LoadoutClothingKimonoPink
+  category: Uniform
+  cost: 3
+  exclusive: true
+  items:
+    - ClothingKimonoPink
+
+- type: loadout
+  id: LoadoutClothingKimonoPurple
+  category: Uniform
+  cost: 3
+  exclusive: true
+  items:
+    - ClothingKimonoPurple
+
+- type: loadout
+  id: LoadoutClothingKimonoSky
+  category: Uniform
+  cost: 3
+  exclusive: true
+  items:
+    - ClothingKimonoSky
+
+- type: loadout
+  id: LoadoutClothingKimonoGreen
+  category: Uniform
+  cost: 3
+  exclusive: true
+  items:
+    - ClothingKimonoGreen
 
+## Gakuran
 - type: loadout
-  id: LoadoutUniformJumpsuitColorRainbow
+  id: LoadoutUniformSchoolGakuranBlack
   category: Uniform
   cost: 2
   exclusive: true
   items:
-    - ClothingUniformColorRainbow
+    - ClothingUniformSchoolGakuranBlack
+
+## MNK Uniforms
+- type: loadout
+  id: LoadoutClothingMNKOfficeSkirt
+  category: Uniform
+  cost: 3
+  exclusive: true
+  items:
+    - ClothingUniformMNKOfficeSkirt
+
+- type: loadout
+  id: LoadoutClothingMNKUnderGarment
+  category: Uniform
+  cost: 3
+  exclusive: true
+  items:
+    - ClothingUniformMNKUnderGarment
+
+- type: loadout
+  id: LoadoutClothingMNKGymBra
+  category: Uniform
+  cost: 3
+  exclusive: true
+  items:
+    - ClothingUniformMNKGymBra
+
+- type: loadout
+  id: LoadoutClothingMNKDressBlack
+  category: Uniform
+  cost: 4
+  exclusive: true
+  items:
+    - ClothingUniformMNKDressBlack
+
+- type: loadout
+  id: LoadoutClothingMNKBlackOveralls
+  category: Uniform
+  cost: 3
+  exclusive: true
+  items:
+    - ClothingUniformMNKBlackOveralls
+
+- type: loadout
+  id: LoadoutClothingMNKBlackShoulder
+  category: Uniform
+  cost: 3
+  exclusive: true
+  items:
+    - ClothingUniformMNKBlackShoulder
+
+- type: loadout
+  id: LoadoutClothingMNKTracksuitBlack
+  category: Uniform
+  cost: 3
+  exclusive: true
+  items:
+    - ClothingUniformMNKTracksuitBlack
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/seeds.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/seeds.yml
index 0c3370890c8..83a20623c8c 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/seeds.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/seeds.yml
@@ -33,6 +33,7 @@
         - AloeSeeds
         - PoppySeeds
         - LingzhiSeeds
+        - PomegranateSeeds
         - AmbrosiaVulgarisSeeds
         - GalaxythistleSeeds
         - FlyAmanitaSeeds
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml
index ab3f6f3d1c1..e93117b1aad 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml
@@ -35,7 +35,7 @@
         - MobLayer
   - type: Stamina
     critThreshold: 115
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - GalacticCommon
     - Nekomimetic
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml
index 5bc02461eed..285c7340b21 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml
@@ -65,7 +65,7 @@
       Unsexed: MaleFelinid
   - type: Felinid
   - type: NoShoesSilentFootsteps
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - GalacticCommon
     - SolCommon
@@ -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/Specific/Mail/mail_civilian.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_civilian.yml
index a41fac14ffa..75be319559d 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_civilian.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_civilian.yml
@@ -57,6 +57,8 @@
       orGroup: Seeds
     - id: LingzhiSeeds
       orGroup: Seeds
+    - id: PomegranateSeeds
+      orGroup: Seeds
     - id: OatSeeds
       orGroup: Seeds
     - id: OnionSeeds
diff --git a/Resources/Prototypes/Traits/neutral.yml b/Resources/Prototypes/Traits/neutral.yml
index 3a3dc943cd7..86e12d20b34 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
new file mode 100644
index 00000000000..6175834c1fc
--- /dev/null
+++ b/Resources/Prototypes/Traits/skills.yml
@@ -0,0 +1,14 @@
+- 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/Prototypes/fonts.yml b/Resources/Prototypes/fonts.yml
index 03102cd341b..92c2947258c 100644
--- a/Resources/Prototypes/fonts.yml
+++ b/Resources/Prototypes/fonts.yml
@@ -45,3 +45,19 @@
 - type: font
   id: Emoji
   path: /Fonts/NotoEmoji.ttf
+
+- type: font
+  id: RubikBubbles
+  path: /Fonts/RubikBubbles.ttf
+
+- type: font
+  id: Copperplate
+  path: /Fonts/Copperplate.otf
+
+- type: font
+  id: Manga
+  path: /Fonts/Mangat.ttf
+
+- type: font
+  id: Noganas
+  path: /Fonts/Noganas.ttf
diff --git a/Resources/ServerInfo/Guidebook/Medical/Botanicals.xml b/Resources/ServerInfo/Guidebook/Medical/Botanicals.xml
index 60153e87e8c..35668bc6cc8 100644
--- a/Resources/ServerInfo/Guidebook/Medical/Botanicals.xml
+++ b/Resources/ServerInfo/Guidebook/Medical/Botanicals.xml
@@ -6,6 +6,7 @@ Botany and Chemistry can often work together to produce better medicine (or recr
 <Box>
 <GuideEntityEmbed Entity="FoodGalaxythistle"/>
 <GuideEntityEmbed Entity="FoodLingzhi"/>
+<GuideEntityEmbed Entity="FoodPomegranate"/>
 <GuideEntityEmbed Entity="FoodAmbrosiaVulgaris"/>
 <GuideEntityEmbed Entity="FoodAloe"/>
 <GuideEntityEmbed Entity="Nettle"/>
diff --git a/Resources/ServerInfo/Rules.txt b/Resources/ServerInfo/Rules.txt
index d1d9551f764..07f10fbdc2c 100644
--- a/Resources/ServerInfo/Rules.txt
+++ b/Resources/ServerInfo/Rules.txt
@@ -1,5 +1,28 @@
 Floof Station Server Rules
 
+WARNING: You must be at least 18 years of age to play on Floof Station. 
+Any users suspected of being under the age of 18 WILL be removed.
+
+Intentionally disconnecting, responding with hostility, or refusing to respond when an admin privately 
+messages you in-game will be met with an appeal-only ban. Additionally, abusing the AHelp relay by 
+flooding it with garbage, checking for admins before stating a problem (ex: "hello?", "any admins?"),
+using it as a chatroom, or sending messages of no substance will result in your removal. 
+All AHelp messages are relayed to the Floof Station Discord.
+
+The usage of any third-party applications/scripts/client modifications or any other applicable software 
+to gain an advantage, avoid intended game/server mechanics, or to harm server infrastructure is strictly
+prohibited, as is the abuse of glitches, exploits and bugs. Any and all instances of this will be met 
+with an appeal-only ban.
+Please use the #bug-reports channel on the Discord to report any issues you find in-game.
+
+Attempting to evade bans is strictly forbidden, and will result in the ban being automatically 
+converted to appeal-only.
+Multi-keying (the simultaneous use of multiple accounts at one time) is also forbidden,
+and will be met with a ban of all the accounts involved.
+
+If you have any questions about these rules, please use the admin help menu by hitting F1 in-game
+or clicking the "AHelp" button in the lobby.
+
 Community Rules
 1. All of these rules apply as they are intended. Every example of a rule break cannot be defined as
 written, therefore, enforcement of the rules is subject to staff interpretation of the rule's intention.
@@ -10,23 +33,23 @@ and can be instead pursued within the Floof Station Discord in the #help channel
 communication within the game.
 
 3. Erotic Roleplay (ERP), erotic content, and 18+ sexual content are allowed, so long all parties
-involved consent to it. If your consent is not respected, immediately contact an administrator or
-moderator. Ideally, ERP should not take priority over job responsibilities, especially for command
-and security roles during a crisis; but for the sake of roleplay, so long it is roleplayed well enough,
-leeway is given.
+involved consent to it. For more information about this, consult the ERP guidelines and rules in
+the Game Server Rules section at point 8.
 
 4. Be civil:
 
 A. Do not spam or advertise on our server.
 
-B. Be respectful towards other members, avoid making others uncomfortable, and most important
+B. Do not flame and do not be toxic.
 
-of all, do not be an asshole.
+C. Be respectful towards other members, avoid making others uncomfortable, and most important of all,
+do not be an asshole.
 
-C. We have a zero tolerance policy for racism, sexism, homophobia, violence, threats, hate speech,
+D. We have a zero tolerance policy for racism, sexism, homophobia, violence, threats, hate speech,
 slurs, and other forms of bigotry, discrimination, and harassment. Slurs and terms that use real or
 implied mental or physical disability to mock or denigrate members or their in-game characters are
 also strictly prohibited. Failure to comply with this rule will result in community removal.
+
 Game Server Rules
 
 1. Follow the server expectations:
@@ -55,8 +78,14 @@ emergency.
 G. If a player is alive and catatonic, they may be brought to their relevant department or cryostorage
 as necessary.
 
-H. For the sake of privacy and respect towards the other members of the community, and by reason
-of the nature of the server, recording or livestreaming rounds is strictly forbidden.
+H. For the sake of privacy and respect towards the other members of the community, by reason 
+of the nature of the server, and by motive of potential metagaming, livestreaming rounds is strictly forbidden.
+
+I. It is strictly forbidden to record players engaged in private activities without their consent, 
+and even more so to share it without their consent.
+
+J. Ghosting or playing with the intent of, and the act itself of "exposing" or shaming players by sharing content 
+or information of their presence or activities in this server elsewhere, is strictly forbidden.
 
 2. Follow metagaming guidelines:
 
@@ -75,7 +104,8 @@ wonder where the captain went? OOC He probably left to get dinner lol").
 E. Do not engage in meta-communications (i.e. using external channels to communicate with other
 players in the same game).
 
-F. Do not discuss or share information about the current round to the Floof Station Discord.
+F. Discussion about the current round is allowed on the Floof Station Discord server (albeit discouraged 
+for the purpose of MRP). However, acting on information gained by this method is strictly forbidden.
 
 G. You are allowed to have knowledge of past experiences and prior shifts, and players are allowed
 to have in-character relationships (friends, enemies, or otherwise).
@@ -122,8 +152,8 @@ state without a very valid roleplay reason to it.
 C. If a fight results in someone being critically injured, seek medical help for them - and if they die,
 do not destroy or otherwise hide their body. This falls under self-antagonistic behavior.
 
-D. Pest ghost roles such as mice are always fair game for attacking. Do not grief crew-aligned ghost
-roles such as familiars, drones, or pets without provocation.
+D. D. Pest ghost roles such as mice are always fair game for attacking. Do not grief crew-aligned ghost 
+roles such as familiars or pets without provocation.
 
 E. Some awakened pest roles (e.g. sentient mothroach) may be considered crew pets and fall under
 this rule.
@@ -133,9 +163,15 @@ or other crew in the direct vicinity are in current, immediate danger from it. C
 threats when they present themselves or if they are relevant to the crew member in question, but are
 not to pursue them if and once routed from their current area.
 
-G. Certain severe emergencies may make it reasonable for normal crew to defend themselves and
-their station, such as nuclear operatives, a zombie outbreak, space dragon attack, or any other
-critical situation, and thus render the previous rule temporary null.
+G. Certain severe emergencies may make it reasonable for normal crew to defend themselves and 
+their station, such as nuclear operatives, a zombie outbreak, space dragon attack, or any other 
+critical situation, thus rendering the previous rule temporary null.
+
+H. By picking the prisoner role, you have chosen to roleplay as a prisoner, NOT an antagonist,
+and should not act so in any capacity. While you may be allowed to escape, you must receive 
+admin approval to do so, and ideally you should only seek to do so with excellent reasoning 
+and roleplay (e.g. abusive security personnel or badly damaged permanent brig). 
+Lack of administrator response does not constitute approval.
 
 6. Follow powergaming guidelines:
 
@@ -171,13 +207,53 @@ polluting, and severely injuring without reason both at and on the way to Centra
 B. Explosives and strategies with capacity for high collateral damage should not be used on or
 around the evacuation shuttle.
 
+8. Follow ERP guidelines and rules:
+
+A. Be very mindful of In Character and Out of Character consent, as they are not the same thing.
+Whilst a player may agree for their character to be subjected to a nonconsensual act, engaging 
+in ERP with someone against their OOC consent is strictly forbidden.
+If your OOC consent is not respected, immediately contact an administrator or moderator.
+
+B. Keep in mind mind that by performing actions without IC consent, you are not immune to and will 
+be opening yourself to IC punishment. Expect to be apprehended, prosecuted and sentenced to the 
+full extent of space law, if found or known to have committed the crime you did.
+
+C. For the sake of freedom of roleplay and ERP in particular, extreme acts such as killing,
+severely maiming, nonconning, abuse, or even round removal are allowed, so long that all the 
+participants consented OOC.
+Ideally, if this is done with IC consent, have a form signed by all parties involved, where you
+state consent to the action, and have it stamped by a lawyer or the HoP. This is advised in order
+to avoid potential IC and OOC trouble from people who might be led to believe that they are
+witnessing a potential, major rulebreak or OOC/IC consent violation.
+
+D. Try to make abundantly clear in your consent menu essential information such as whether you
+want to engage in ERP or not, your limits and preferences, your OOC consent to nonconsensual 
+acts, your OOC or/and IC consent to extreme acts such as death or maiming, and so on so forth.
+This is especially important to allow people to understand at a quick glance whether what they
+are witnessing is a potential, major rulebreak or OOC/IC consent violation, or not.
+
+E. DO NOT use ERP as bait, unless done with OOC consent of all parties involved. Much as it would 
+be very believable and make for some amazing roleplay for an Agent to try and seduce a target into 
+the bedroom to then murder them in cold blood on the spot or kidnap them, priority is given to the 
+fun, comfort and enjoyment of all players.
+
+F. Ideally, ERP should not take priority over job responsibilities, especially for Command
+and Security roles during a crisis; but for the sake of roleplay, so long it is roleplayed 
+well enough and there is no urgency, leeway is given.
+
+G. Roleplaying a character as underage is strictly forbidden.
+
+
+
 Command, Security, and Antagonist Rules:
 
 1. Follow Command and Security Guidelines:
 
-A. Security and Command roles are expected to know and perform their jobs to the best of their
-ability. These roles often heavily impact the round and require more careful and conscientious
-roleplay; if you cannot meet these requirements do not take these roles.
+A. Security and Command roles are expected to know and perform their jobs to the best of their 
+ability. These roles often heavily impact the round and require more careful and conscientious 
+roleplay. As such, their roleplay quality is held to a much higher standard, especially in the 
+event a player was to play a character in such a role committing a crime or being disruptive.
+If you cannot meet these requirements, do not take these roles.
 
 B. Both departments are required to read and follow Floof Station Space Law, Standard Operating
 Procedure, Alert Procedure, and Company Policy to the best of their ability.
@@ -186,42 +262,57 @@ C. Abusing your position or using it to make arbitrary or obviously malicious ch
 detriment of the entire station and/or its inhabitants is prohibited, without beyond excellent roleplay
 reason to it, and especially without administrator permission.
 
-D. Leeway to not meeting “expected higher standards” is given and consented in favor of freedom
-of roleplay and fun, so long that the player is ready to be met with the in-character consequences to
-those actions, so long it’s roleplayed well, and so long what’s being done is not too disruptive or
-harmful in nature to others players.
+D. Some leeway is given to Security and Command roles doings things such as committing a crime, 
+slacking, or being irresponsible can be given and consented in favor of freedom of roleplay and fun,
+so long the player is ready to be met with the very serious in-character consequences to those actions,
+so long it’s roleplayed exceptionally well, and so long what’s being done is not too disruptive or 
+harmful in nature to other players.
+
+E. Because of this last rule, an aggravating exemplary factor should be considered when sentencing or 
+applying IC punishment to a Security or Command role, in reason of them not acting appropriately to the
+expected standards of their role.
 
-E. If you need to leave the round, please notify administrators via AHelp menu and notify your
+F. If you need to leave the round, please notify administrators via AHelp menu and notify your
 fellow crew via departmental radio. If you have the capability to do so, ensure that you return your
 items as necessary and seek cryostorage if you are not planning on returning.
 
-F. Do not hire random crew to be your bodyguard(s) or promote random crewmembers to
+G. Do not hire random crew to be your bodyguard(s) or promote random crewmembers to
 Command positions at random. If you require bodyguards or security details, talk to your Security
 department. If you need new Command staff, talk to the personnel in that related department.
 
-G. Security should try to use non-lethals and arrest criminals, unless given extreme circumstances,
+H. Security should try to use non-lethals and arrest criminals, unless given extreme circumstances,
 such as but not limited to: lethal force being used against them, their life or that of an innocent
 being in immediate danger, no other reasonable option being available at the moment to detain an
 unreasonably dangerous threat, or when facing off against station-destroying antagonists (nuclear
 operatives, zombies, dragons, etc.).
 
-H. Security may choose to confiscate dangerous items (weapons, firearms) as well as items used to
+I. Security may choose to confiscate dangerous items (weapons, firearms) as well as items used to
 commit crimes or items that could prove to be problematic when in possession of the detainee
 (tools, insulated gloves, etc.), so long that there is an extremely valid, strong reason and suspicion
 that such items will be used maliciously, or evidence that they have been used to commit a crime.
 
-I. When lethal force is used by Security, they are expected when and if possible to patch up the
+J. When lethal force is used by Security, they are expected when and if possible to patch up the
 critical condition detained individual back to health, or even to life in the event of death, by cloning
 or defibbing.
 
-J. Executions can only be carried out for capital crimes, and are to be used exclusively as a last
-resort. Such as, when the detained individual is proven beyond any reasonable doubt to be an
-unreasonably hard to contain, major threat to the station and its inhabitants.
-K. Brig times should generally not exceed 20 minutes unless the crime is permabriggable, and
+K. Punishment should be proportional to the crime committed and the danger posed by the criminal. 
+You can not execute somebody just for trespassing or stealing an item, but a provable Syndicate Agent 
+going loud and round removing somebody, should absolutely warrant an execution.
+
+L. Brig times should generally not exceed 20 minutes unless the crime is permabriggable, and
 permabrigging is to be done exclusively for antagonists and exceptional cases (usually,
 unreasonably dangerous individuals).
 
-M. Do not mindbreak others against their will solely because they have psionic powers. Only do so
+M. Executions and Do Not Revive orders can only be carried out for capital crimes, and are to be used 
+sparingly as last resorts, or in the most extreme of situations and crimes. For example, when the detained 
+individual is proven beyond any reasonable doubt to be an unreasonably hard to contain, major threat to the 
+station and its inhabitants. Or when an Agent chooses to go loud, kill and round remove somebody.
+The criminal should always be tried first, and executed or/and given a DNR order later. However, if this is
+proven to be something impossible or too dangerous to carry out, such as during a crisis situation, or
+if the crime is deemed particularly heinous and the criminal provably guilty beyond any reasonable doubt,
+trial can be skipped.
+
+N. Do not mindbreak others against their will solely because they have psionic powers. Only do so
 when the individual is either a proven antagonist (and even then, it is strongly encouraged not to do
 so unless absolutely necessary, such as them having a power that makes their containment
 exceedingly difficult), or proven to be misusing their powers to the detriment of the safety of the
@@ -235,7 +326,8 @@ win” gameplay void of any roleplay aspect is not only heavily discouraged, but
 negative notes or even suspensions, if deemed to be causing a negative impact on the community
 and be detrimental to everybody’s fun. The same of course, is to be applied to roles in opposition to
 antagonists, such as Security and Command. We are all here to roleplay, relax and have fun, not to
-have a competition on who’s the best or the most “robust”. Don’t be a dick.
+have a competition on who’s the best or the most “robust”. The objectives are meant to me a means to
+an end, a way to craft and tell a compelling narrative, a fun story for the shift.
 
 B. The damage that antagonists can cause MUST be proportional to their objectives, and contribute
 towards achieving them in some way. If you are concerned as to whether or not what you're about to
@@ -254,8 +346,8 @@ forward the round through your antagonistic actions, rather than grind it to hal
 objectives.
 
 F. Other antagonists are not necessarily your friends. Other agents, mercenaries, and possibly even
-space dragons are free agents that you may negotiate with at your own risk, but no one should be
-working together with xenomorphs or zombies.
+space dragons are free agents that you may negotiate with at your own risk. Just because both Nukies
+and Agents are on the same team, they don't necessarily have to collaborate, having different goals.
 
 G. Heavily damaging/spacing or camping arrivals/evac/cryo, unnecessarily extending the round,
 and behavior that calls the round to an end prematurely - as well as other lame behaviors - are
@@ -265,17 +357,25 @@ H. As a non- or partially-sentient antagonist, you are expected to have only a l
 of space stations and their mechanics. Slimes, zombies, and spiders should not be targeting the
 gravity generator or the AME, nor should they be unnecessarily spacing the station.
 
-I. Neutral roles such as skeletons or sentient artifacts, while having the freedom of being either
-friendly or hostile (and until or unless proven the latter, crew is expected to be friendly in return), in
-reason of not having a defined set of objectives, are expected not to go too overboard if choosing to
-be hostile. As already mentioned and implied by antagonist guidelines: do not mass murder, do not
-cause mass station damage, do not be overly disruptive and a detriment to the fun, and most
-important of all, roleplay the hostility well.
-
-J. Specific, normally hostile roles such as dragons or rat kings, while do also have the liberty of
-being friendly if so wished or desired, are not subjected to the “rule of friendliness”. If deemed too
-big of a potential threat by the station inhabitants, they can be terminated at any time they see fit.
-Although, it is strongly preferable for the crew to act hostile with reason (for example: a rat king
-who agreed to not have more than 3 rats beginning to create more).
-
-K. Ghost roles have their own independent rules that must be followed.
+I. Ghost roles have their own independent rules that must be followed, in addition to the already 
+established antagonist guidelines, for antagonist ghost roles, and the general game server rules for 
+non-antagonist ones. As a rule of thumb for ghost roles in general though: do not be overly disruptive 
+and a detriment to the fun. You may go on a rampage and kill a lot of people as a dragon because that 
+is what you are meant to do, or sow a bit of chaos as a skeleton. But do not go out of your way as a 
+mouse or Pun Pun to disturb people's privacy and ERP, or to persistently harass and annoy people 
+or break things for no reason.
+
+J. Neutral ghost roles (such as skeletons or sentient artifacts), while having the freedom of being 
+either friendly or hostile (and until or unless proven the latter, crew is expected to be friendly 
+in return), in reason of not having a defined set of objectives, are expected not to go too overboard 
+if choosing to be hostile. You can be a nuisance, but don't murderbone or cause mass station damage.
+
+K. Hostile ghost roles, while do also have the liberty of being friendly if they so wished or desired, 
+if deemed too big of a potential threat by the station inhabitants, they can be terminated at any time 
+they see fit. Although, it is strongly encouraged for the crew to act hostile with reason (for example: 
+a rat king who agreed to not have more than 3 rats beginning to create more); and for such ghost roles
+not to powergame by acting friendly one moment, and hostile the next, the moment a great opportunity
+presents itself. Furthermore, though roleplaying a creature as one would be expecting it to behave is 
+also strongly encouraged, due to their inherent nature of often having as a main objective to kill as 
+many things as possible, few of the core antagonist guidelines are a bit relaxed (specifically and in 
+particular those relating to killing).
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 00000000000..609e9e3d199
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 00000000000..ba379dedab4
--- /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/Floof/Clothing/Uniforms/loincloth.rsi/icon.png b/Resources/Textures/Floof/Clothing/Uniforms/loincloth.rsi/icon.png
new file mode 100644
index 00000000000..6f4518ffb94
Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Uniforms/loincloth.rsi/icon.png differ
diff --git a/Resources/Textures/Floof/Clothing/Uniforms/loincloth.rsi/meta.json b/Resources/Textures/Floof/Clothing/Uniforms/loincloth.rsi/meta.json
new file mode 100644
index 00000000000..29892515189
--- /dev/null
+++ b/Resources/Textures/Floof/Clothing/Uniforms/loincloth.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/VOREStation/VOREStation",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    }
+  ]
+}
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 00000000000..6b8580b7dc3
--- /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 00000000000..ce39fa92299
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 00000000000..26bc88fb229
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 00000000000..94cd6fa2e1e
--- /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/Consumable/Drinks/nnn_can.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi/icon.png
new file mode 100644
index 00000000000..85275913d59
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi/icon_open.png
new file mode 100644
index 00000000000..163f7afc520
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi/icon_open.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi/inhand-left.png
new file mode 100644
index 00000000000..ea78e1b319a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi/inhand-right.png
new file mode 100644
index 00000000000..ea0b1987719
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi/meta.json
new file mode 100644
index 00000000000..ae9e3374079
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi/meta.json
@@ -0,0 +1,25 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Originally Rootbeer, Edited by Memeji",
+  "states": [
+    {
+      "name": "icon"
+    },
+	  {
+	    "name": "icon_open"
+  	},
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
index 5117df77356..b57f9844bc7 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 00000000000..6a7aa083ee5
Binary files /dev/null and b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-signature.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/apple.rsi.zip b/Resources/Textures/Objects/Specific/Hydroponics/apple.rsi.zip
new file mode 100644
index 00000000000..fa07018ef00
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/apple.rsi.zip differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/dead.png
new file mode 100644
index 00000000000..817c0f4bff1
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/dead.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/harvest.png
new file mode 100644
index 00000000000..b0047ff701c
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/harvest.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/meta.json
new file mode 100644
index 00000000000..775f8df408f
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/meta.json
@@ -0,0 +1,41 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "dead"
+    },
+    {
+      "name": "harvest"
+    },
+    {
+      "name": "produce"
+    },
+    {
+      "name": "seed"
+    },
+    {
+      "name": "stage-1"
+    },
+    {
+      "name": "stage-2"
+    },
+    {
+      "name": "stage-3"
+    },
+    {
+      "name": "stage-4"
+    },
+    {
+      "name": "stage-5"
+    },
+    {
+      "name": "stage-6"
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/produce.png
new file mode 100644
index 00000000000..a947a6149b9
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/produce.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/seed.png
new file mode 100644
index 00000000000..9b1d7886f8f
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/seed.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/stage-1.png
new file mode 100644
index 00000000000..97245d27f2f
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/stage-1.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/stage-2.png
new file mode 100644
index 00000000000..02222142cee
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/stage-2.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/stage-3.png
new file mode 100644
index 00000000000..37bd6d53d11
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/stage-3.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/stage-4.png b/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/stage-4.png
new file mode 100644
index 00000000000..8667357c88a
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/stage-4.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/stage-5.png b/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/stage-5.png
new file mode 100644
index 00000000000..9a2100edd39
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/stage-5.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/stage-6.png b/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/stage-6.png
new file mode 100644
index 00000000000..be279f7c12c
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/stage-6.png differ
diff --git a/Resources/keybinds.yml b/Resources/keybinds.yml
index 9bfbc9daa4a..22130f60832 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