diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 95e7a3a397f..6ec2a0a8339 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -18,7 +18,7 @@
 - [ ] Я добавил скриншот/видео демонстрации PR в игре, **или** этот PR этого не требует.
 - [ ] Я не добавлял контент нарушающий чужие авторские права.
 - [ ] Я добавил свой контент только в папку _LostParadise(только если вы не меняете оригинальный код).
-- [ ] Я не добавлял переводы в прототипы, а сделал их в файле locale.
+- [ ] Я не добавлял переводы в прототипы, а сделал их с помощью скрипта translations.bat в Tools/SS14_RU.
 
 **Изменения**
 <!--
diff --git a/.github/workflows/update-wiki.yml b/.github/workflows/update-wiki.yml
index f06e14cd09b..48e8bcb4054 100644
--- a/.github/workflows/update-wiki.yml
+++ b/.github/workflows/update-wiki.yml
@@ -18,6 +18,7 @@ on:
 jobs:
   update-wiki:
     name: Build and Publish JSON blobs to wiki
+    if: github.repository == 'Lost-Paradise-Project/Lost-Paradise'
     runs-on: ubuntu-latest
 
     steps:
diff --git a/.github/workflows/validate-rsis.yml b/.github/workflows/validate-rsis.yml
index c5f71a94873..fb8f2f5a8b3 100644
--- a/.github/workflows/validate-rsis.yml
+++ b/.github/workflows/validate-rsis.yml
@@ -22,7 +22,7 @@ jobs:
         uses: space-wizards/submodule-dependency@v0.1.5
       - name: Install Python dependencies
         run: |
-          apt install python3-jsonschema
+          pip3 install --ignore-installed --user pillow jsonschema --break-system-packages
       - name: Validate RSIs
         run: |
           python3 RobustToolbox/Schemas/validate_rsis.py Resources/
diff --git a/Content.Client/CartridgeLoader/Cartridges/MailMetricUi.cs b/Content.Client/CartridgeLoader/Cartridges/MailMetricUi.cs
new file mode 100644
index 00000000000..504dda7c56e
--- /dev/null
+++ b/Content.Client/CartridgeLoader/Cartridges/MailMetricUi.cs
@@ -0,0 +1,28 @@
+using Content.Client.UserInterface.Fragments;
+using Content.Shared.CartridgeLoader.Cartridges;
+using Robust.Client.UserInterface;
+
+namespace Content.Client.CartridgeLoader.Cartridges;
+
+public sealed partial class MailMetricUi : UIFragment
+{
+    private MailMetricUiFragment? _fragment;
+
+    public override Control GetUIFragmentRoot()
+    {
+        return _fragment!;
+    }
+
+    public override void Setup(BoundUserInterface userInterface, EntityUid? fragmentOwner)
+    {
+        _fragment = new MailMetricUiFragment();
+    }
+
+    public override void UpdateState(BoundUserInterfaceState state)
+    {
+        if (state is MailMetricUiState cast)
+        {
+            _fragment?.UpdateState(cast);
+        }
+    }
+}
diff --git a/Content.Client/CartridgeLoader/Cartridges/MailMetricUiFragment.xaml b/Content.Client/CartridgeLoader/Cartridges/MailMetricUiFragment.xaml
new file mode 100644
index 00000000000..39639fe8c97
--- /dev/null
+++ b/Content.Client/CartridgeLoader/Cartridges/MailMetricUiFragment.xaml
@@ -0,0 +1,183 @@
+<cartridges:MailMetricUiFragment
+    xmlns:cartridges="clr-namespace:Content.Client.CartridgeLoader.Cartridges"
+    xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
+    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+    xmlns="https://spacestation14.io"
+    Margin="5"
+    VerticalExpand="True"
+    Orientation="Vertical">
+    <PanelContainer StyleClasses="BackgroundDark"></PanelContainer>
+    <controls:StripeBack Name="MailMetricHeaderContainer">
+        <PanelContainer>
+            <Label Name="MailMetricHeader"
+                Align="Center"
+                Text="{Loc 'mail-metrics-header'}" />
+        </PanelContainer>
+    </controls:StripeBack>
+    <BoxContainer
+        Orientation="Vertical"
+        HorizontalExpand="True"
+        Margin="20 0">
+        <BoxContainer Orientation="Horizontal"
+            HorizontalExpand="True"
+            SeparationOverride="2">
+            <Label Name="TitleEmpty1"
+                SizeFlagsStretchRatio="2"
+                HorizontalExpand="True"
+                ClipText="True" />
+            <Label Name="MailCountLabel"
+                SizeFlagsStretchRatio="1"
+                HorizontalExpand="True"
+                ClipText="True"
+                StyleClasses="monospace"
+                Align="Center"
+                Text="{Loc 'mail-metrics-count-header'}" />
+            <Label Name="SpesosLabel"
+                SizeFlagsStretchRatio="1"
+                HorizontalExpand="True"
+                ClipText="True"
+                Align="Center"
+                StyleClasses="monospace"
+                Text="{Loc 'mail-metrics-money-header'}" />
+        </BoxContainer>
+        <BoxContainer Orientation="Horizontal"
+            HorizontalExpand="True"
+            SeparationOverride="2">
+            <Label Name="OpenedLabel"
+                SizeFlagsStretchRatio="2"
+                HorizontalExpand="True"
+                ClipText="True"
+                Text="{Loc 'mail-metrics-opened'}" />
+            <Label Name="OpenedMailCount"
+                SizeFlagsStretchRatio="1"
+                HorizontalExpand="True"
+                Align="Right"
+                StyleClasses="monospace"
+                ClipText="True" />
+            <Label Name="OpenedMailSpesos"
+                SizeFlagsStretchRatio="1"
+                HorizontalExpand="True"
+                Align="Right"
+                StyleClasses="monospace"
+                ClipText="True" />
+        </BoxContainer>
+        <BoxContainer Orientation="Horizontal"
+            HorizontalExpand="True"
+            SeparationOverride="2">
+            <Label Name="ExpiredLabel"
+                SizeFlagsStretchRatio="2"
+                HorizontalExpand="True"
+                ClipText="True"
+                Text="{Loc 'mail-metrics-expired'}" />
+            <Label Name="ExpiredMailCount"
+                SizeFlagsStretchRatio="1"
+                HorizontalExpand="True"
+                Align="Right"
+                StyleClasses="monospace"
+                ClipText="True" />
+            <Label Name="ExpiredMailSpesos"
+                SizeFlagsStretchRatio="1"
+                HorizontalExpand="True"
+                Align="Right"
+                StyleClasses="monospace"
+                ClipText="True" />
+        </BoxContainer>
+        <BoxContainer Orientation="Horizontal"
+            HorizontalExpand="True"
+            SeparationOverride="2">
+            <Label Name="TamperedLabel"
+                SizeFlagsStretchRatio="2"
+                HorizontalExpand="True"
+                ClipText="True"
+                Text="{Loc 'mail-metrics-tampered'}" />
+            <Label Name="TamperedMailCount"
+                SizeFlagsStretchRatio="1"
+                HorizontalExpand="True"
+                Align="Right"
+                StyleClasses="monospace"
+                ClipText="True" />
+            <Label Name="TamperedMailSpesos"
+                SizeFlagsStretchRatio="1"
+                HorizontalExpand="True"
+                Align="Right"
+                StyleClasses="monospace"
+                ClipText="True" />
+        </BoxContainer>
+        <BoxContainer Orientation="Horizontal"
+            HorizontalExpand="True"
+            SeparationOverride="2">
+            <Label Name="DamagedLabel"
+                SizeFlagsStretchRatio="2"
+                HorizontalExpand="True"
+                ClipText="True"
+                Text="{Loc 'mail-metrics-damaged'}" />
+            <Label Name="DamagedMailCount"
+                SizeFlagsStretchRatio="1"
+                HorizontalExpand="True"
+                Align="Right"
+                StyleClasses="monospace"
+                ClipText="True" />
+            <Label Name="DamagedMailSpesos"
+                SizeFlagsStretchRatio="1"
+                HorizontalExpand="True"
+                StyleClasses="monospace"
+                Align="Right"
+                ClipText="True" />
+        </BoxContainer>
+        <BoxContainer Orientation="Horizontal"
+            HorizontalExpand="True"
+            SeparationOverride="2">
+            <Label Name="UnopenedLabel"
+                SizeFlagsStretchRatio="2"
+                HorizontalExpand="True"
+                ClipText="True"
+                Text="{Loc 'mail-metrics-unopened'}" />
+            <Label Name="UnopenedMailCount"
+                SizeFlagsStretchRatio="1"
+                HorizontalExpand="True"
+                StyleClasses="monospace"
+                Align="Right"
+                ClipText="True" />
+            <Label Name="UnopenedMailSpesos"
+                SizeFlagsStretchRatio="1"
+                HorizontalExpand="True"
+                Align="Right"
+                StyleClasses="monospace"
+                ClipText="True" />
+        </BoxContainer>
+        <BoxContainer Orientation="Horizontal"
+            HorizontalExpand="True"
+            SeparationOverride="2">
+            <Label Name="TotalMailLabel"
+                SizeFlagsStretchRatio="2"
+                HorizontalExpand="True"
+                ClipText="True"
+                Text="{Loc 'mail-metrics-total'}" />
+            <Label Name="TotalMailCount"
+                SizeFlagsStretchRatio="1"
+                HorizontalExpand="True"
+                Align="Right"
+                StyleClasses="monospace"
+                ClipText="True" />
+            <Label Name="TotalMailSpesos"
+                SizeFlagsStretchRatio="1"
+                HorizontalExpand="True"
+                Align="Right"
+                StyleClasses="monospace"
+                ClipText="True" />
+        </BoxContainer>
+    </BoxContainer>
+    <BoxContainer
+        Orientation="Vertical"
+        HorizontalExpand="True"
+        Margin="10">
+        <Label
+            Name="SuccessRateCounts"
+            Align="Center"
+            StyleClasses="LabelBig" />
+        <Label
+            Name="SuccessRatePercent"
+            Align="Center"
+            StyleClasses="LabelBig" />
+    </BoxContainer>
+</cartridges:MailMetricUiFragment>
diff --git a/Content.Client/CartridgeLoader/Cartridges/MailMetricUiFragment.xaml.cs b/Content.Client/CartridgeLoader/Cartridges/MailMetricUiFragment.xaml.cs
new file mode 100644
index 00000000000..553e3a57931
--- /dev/null
+++ b/Content.Client/CartridgeLoader/Cartridges/MailMetricUiFragment.xaml.cs
@@ -0,0 +1,104 @@
+using Content.Shared.CartridgeLoader.Cartridges;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.CartridgeLoader.Cartridges;
+
+[GenerateTypedNameReferences]
+public sealed partial class MailMetricUiFragment : BoxContainer
+{
+
+    private OpenedMailPercentGrade? _successGrade;
+
+    public MailMetricUiFragment()
+    {
+        RobustXamlLoader.Load(this);
+
+        // This my way of adding multiple classes to a XAML control.
+        // Haha Batman I'm going to blow up Gotham City
+        OpenedMailCount.StyleClasses.Add("Good");
+        OpenedMailSpesos.StyleClasses.Add("Good");
+        TamperedMailCount.StyleClasses.Add("Danger");
+        TamperedMailSpesos.StyleClasses.Add("Danger");
+        ExpiredMailCount.StyleClasses.Add("Danger");
+        ExpiredMailSpesos.StyleClasses.Add("Danger");
+        DamagedMailCount.StyleClasses.Add("Danger");
+        DamagedMailSpesos.StyleClasses.Add("Danger");
+        UnopenedMailCount.StyleClasses.Add("Caution");
+    }
+
+    public void UpdateState(MailMetricUiState state)
+    {
+        UpdateTextLabels(state);
+        UpdateSuccessGrade(state);
+    }
+
+    public void UpdateTextLabels(MailMetricUiState state)
+    {
+        var stats = state.Metrics;
+
+        OpenedMailCount.Text = stats.OpenedCount.ToString();
+        OpenedMailSpesos.Text = stats.Earnings.ToString();
+        TamperedMailCount.Text = stats.TamperedCount.ToString();
+        TamperedMailSpesos.Text = stats.TamperedLosses.ToString();
+        ExpiredMailCount.Text = stats.ExpiredCount.ToString();
+        ExpiredMailSpesos.Text = stats.ExpiredLosses.ToString();
+        DamagedMailCount.Text = stats.DamagedCount.ToString();
+        DamagedMailSpesos.Text = stats.DamagedLosses.ToString();
+        UnopenedMailCount.Text = state.UnopenedMailCount.ToString();
+        TotalMailCount.Text = state.TotalMail.ToString();
+        TotalMailSpesos.Text = stats.TotalIncome.ToString();
+        SuccessRateCounts.Text = Loc.GetString("mail-metrics-progress",
+            ("opened", stats.OpenedCount),
+            ("total", state.TotalMail));
+        SuccessRatePercent.Text = Loc.GetString("mail-metrics-progress-percent",
+            ("successRate", state.SuccessRate));
+    }
+
+    public void UpdateSuccessGrade(MailMetricUiState state)
+    {
+        var previousGrade = _successGrade;
+        _successGrade = GetSuccessRateGrade(state.SuccessRate);
+
+        // No need to update if they're the same
+        if (previousGrade == _successGrade)
+            return;
+
+        var previousGradeClass = GetClassForGrade(previousGrade);
+        if (previousGradeClass != string.Empty)
+        {
+            SuccessRatePercent.StyleClasses.Remove(previousGradeClass);
+        }
+
+        SuccessRatePercent.StyleClasses.Add(GetClassForGrade(_successGrade));
+    }
+
+    private static OpenedMailPercentGrade GetSuccessRateGrade(double successRate)
+    {
+        return successRate switch
+        {
+            > 75 => OpenedMailPercentGrade.Good,
+            > 50 => OpenedMailPercentGrade.Average,
+            _ => OpenedMailPercentGrade.Bad,
+        };
+    }
+
+    private string GetClassForGrade(OpenedMailPercentGrade? grade)
+    {
+        return grade switch
+        {
+            OpenedMailPercentGrade.Good => "Good",
+            OpenedMailPercentGrade.Average => "Caution",
+            OpenedMailPercentGrade.Bad => "Danger",
+            _ => string.Empty,
+        };
+    }
+}
+
+enum OpenedMailPercentGrade
+{
+    Good,
+    Average,
+    Bad
+}
diff --git a/Content.Client/Input/ContentContexts.cs b/Content.Client/Input/ContentContexts.cs
index 54e1dff5803..9a49c4e28c1 100644
--- a/Content.Client/Input/ContentContexts.cs
+++ b/Content.Client/Input/ContentContexts.cs
@@ -81,6 +81,7 @@ public static void SetupContexts(IInputContextContainer contexts)
             human.AddFunction(ContentKeyFunctions.OpenBelt);
             human.AddFunction(ContentKeyFunctions.OfferItem);
             human.AddFunction(ContentKeyFunctions.ToggleStanding);
+            human.AddFunction(ContentKeyFunctions.ToggleCrawlingUnder);
             human.AddFunction(ContentKeyFunctions.MouseMiddle);
             human.AddFunction(ContentKeyFunctions.ArcadeUp);
             human.AddFunction(ContentKeyFunctions.ArcadeDown);
diff --git a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
index d0820a4096b..cb76a7d8912 100644
--- a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
@@ -205,6 +205,7 @@ void AddCheckBox(string checkBoxName, bool currentState, Action<BaseButton.Butto
             AddButton(ContentKeyFunctions.OfferItem);
             AddButton(ContentKeyFunctions.SaveItemLocation);
             AddButton(ContentKeyFunctions.ToggleStanding);
+            AddButton(ContentKeyFunctions.ToggleCrawlingUnder);
             AddButton(ContentKeyFunctions.LookUp);
             AddCheckBox("ui-options-function-auto-get-up", _cfg.GetCVar(CCVars.AutoGetUp), HandleToggleAutoGetUp);
             AddCheckBox("ui-options-function-hold-look-up", _cfg.GetCVar(CCVars.HoldLookUp), HandleHoldLookUp);
diff --git a/Content.Client/Standing/LayingDownSystem.cs b/Content.Client/Standing/LayingDownSystem.cs
index 4fe71fe7c97..d45d4811340 100644
--- a/Content.Client/Standing/LayingDownSystem.cs
+++ b/Content.Client/Standing/LayingDownSystem.cs
@@ -3,8 +3,8 @@
 using Content.Shared.Standing;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
+using Robust.Shared.Configuration;
 using Robust.Shared.Timing;
-using DrawDepth = Content.Shared.DrawDepth.DrawDepth;
 
 namespace Content.Client.Standing;
 
@@ -21,12 +21,27 @@ public override void Initialize()
         base.Initialize();
 
         SubscribeLocalEvent<LayingDownComponent, MoveEvent>(OnMovementInput);
-        SubscribeNetworkEvent<DrawDownedEvent>(OnDowned);
-        SubscribeNetworkEvent<DrawStoodEvent>(OnStood);
-
         SubscribeNetworkEvent<CheckAutoGetUpEvent>(OnCheckAutoGetUp);
     }
 
+    public override void Update(float frameTime)
+    {
+        // Update draw depth of laying down entities as necessary
+        var query = EntityQueryEnumerator<LayingDownComponent, StandingStateComponent, SpriteComponent>();
+        while (query.MoveNext(out var uid, out var layingDown, out var standing, out var sprite))
+        {
+            // Do not modify the entities draw depth if it's modified externally
+            if (sprite.DrawDepth != layingDown.NormalDrawDepth && sprite.DrawDepth != layingDown.CrawlingUnderDrawDepth)
+                continue;
+
+            sprite.DrawDepth = standing.CurrentState is StandingState.Lying && layingDown.IsCrawlingUnder
+                ? layingDown.CrawlingUnderDrawDepth
+                : layingDown.NormalDrawDepth;
+        }
+
+        query.Dispose();
+    }
+
     private void OnMovementInput(EntityUid uid, LayingDownComponent component, MoveEvent args)
     {
         if (!_timing.IsFirstTimePredicted
@@ -51,26 +66,6 @@ private void OnMovementInput(EntityUid uid, LayingDownComponent component, MoveE
         sprite.Rotation = Angle.FromDegrees(90);
     }
 
-    private void OnDowned(DrawDownedEvent args)
-    {
-        var uid = GetEntity(args.Uid);
-        if (!TryComp<SpriteComponent>(uid, out var sprite)
-            || !TryComp<LayingDownComponent>(uid, out var component))
-            return;
-
-        sprite.DrawDepth = component.CrawlingDrawDepth;
-    }
-
-    private void OnStood(DrawStoodEvent args)
-    {
-        var uid = GetEntity(args.Uid);
-        if (!TryComp<SpriteComponent>(uid, out var sprite)
-            || !TryComp<LayingDownComponent>(uid, out var component))
-            return;
-
-        sprite.DrawDepth = component.NormalDrawDepth;
-    }
-
     private void OnCheckAutoGetUp(CheckAutoGetUpEvent ev, EntitySessionEventArgs args)
     {
         if (!_timing.IsFirstTimePredicted)
diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs
index 06a9fa521f5..0f6b1621099 100644
--- a/Content.IntegrationTests/Tests/PostMapInitTest.cs
+++ b/Content.IntegrationTests/Tests/PostMapInitTest.cs
@@ -61,7 +61,7 @@ public sealed class PostMapInitTest
             "TheHive", //DeltaV
             "Hammurabi", //DeltaV
             "Lighthouse", //DeltaV
-			"Submarine", //DeltaV
+            "Submarine", //DeltaV
             "LPPKerberos", //LPP
             "LPPAsterisk", //LPP
             "LPPNormandy", //LPP
diff --git a/Content.Server.Database/Migrations/Postgres/20241011054803_CustomSpecieName.cs b/Content.Server.Database/Migrations/Postgres/20241011054803_CustomSpecieName.cs
index 2f87c869ebe..6c40d6240f4 100644
--- a/Content.Server.Database/Migrations/Postgres/20241011054803_CustomSpecieName.cs
+++ b/Content.Server.Database/Migrations/Postgres/20241011054803_CustomSpecieName.cs
@@ -26,4 +26,4 @@ protected override void Down(MigrationBuilder migrationBuilder)
                 table: "profile");
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Content.Server/Antag/AntagSelectionSystem.API.cs b/Content.Server/Antag/AntagSelectionSystem.API.cs
index 59bf05fe03f..77f543cdcf1 100644
--- a/Content.Server/Antag/AntagSelectionSystem.API.cs
+++ b/Content.Server/Antag/AntagSelectionSystem.API.cs
@@ -5,6 +5,7 @@
 using Content.Server.Objectives;
 using Content.Shared.Chat;
 using Content.Shared.Mind;
+using Content.Shared.Preferences;
 using JetBrains.Annotations;
 using Robust.Shared.Audio;
 using Robust.Shared.Enums;
@@ -156,6 +157,36 @@ public List<EntityUid> GetAntagMindEntityUids(Entity<AntagSelectionComponent?> e
         return ent.Comp.SelectedMinds.Select(p => p.Item1).ToList();
     }
 
+    /// <summary>
+    /// Checks if a given session has the primary antag preferences for a given definition
+    /// </summary>
+    public bool HasPrimaryAntagPreference(ICommonSession? session, AntagSelectionDefinition def)
+    {
+        if (session == null)
+            return true;
+
+        if (def.PrefRoles.Count == 0)
+            return false;
+
+        var pref = (HumanoidCharacterProfile) _pref.GetPreferences(session.UserId).SelectedCharacter;
+        return pref.AntagPreferences.Any(p => def.PrefRoles.Contains(p));
+    }
+
+    /// <summary>
+    /// Checks if a given session has the fallback antag preferences for a given definition
+    /// </summary>
+    public bool HasFallbackAntagPreference(ICommonSession? session, AntagSelectionDefinition def)
+    {
+        if (session == null)
+            return true;
+
+        if (def.FallbackRoles.Count == 0)
+            return false;
+
+        var pref = (HumanoidCharacterProfile) _pref.GetPreferences(session.UserId).SelectedCharacter;
+        return pref.AntagPreferences.Any(p => def.FallbackRoles.Contains(p));
+    }
+
     /// <summary>
     /// Returns all the antagonists for this rule who are currently alive
     /// </summary>
diff --git a/Content.Server/Antag/AntagSelectionSystem.cs b/Content.Server/Antag/AntagSelectionSystem.cs
index d74824dd2d5..cd4d836e683 100644
--- a/Content.Server/Antag/AntagSelectionSystem.cs
+++ b/Content.Server/Antag/AntagSelectionSystem.cs
@@ -17,7 +17,6 @@
 using Content.Shared.Ghost;
 using Content.Shared.Humanoid;
 using Content.Shared.Players;
-using Content.Shared.Preferences;
 using Robust.Server.Audio;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
@@ -118,12 +117,15 @@ private void OnSpawnComplete(PlayerSpawnCompleteEvent args)
         // something to figure out later.
 
         var query = QueryActiveRules();
+        var rules = new List<(EntityUid, AntagSelectionComponent)>();
         while (query.MoveNext(out var uid, out _, out var antag, out _))
         {
-            // TODO ANTAG
-            // what why aasdiuhasdopiuasdfhksad
-            // stop this insanity please
-            // probability of antag assignment shouldn't depend on the order in which rules are returned by the query.
+            rules.Add((uid, antag));
+        }
+        RobustRandom.Shuffle(rules);
+
+        foreach (var (uid, antag) in rules)
+        {
             if (!RobustRandom.Prob(LateJoinRandomChance))
                 continue;
 
@@ -221,13 +223,13 @@ public void ChooseAntags(Entity<AntagSelectionComponent> ent, IList<ICommonSessi
     /// <summary>
     /// Tries to makes a given player into the specified antagonist.
     /// </summary>
-    public bool TryMakeAntag(Entity<AntagSelectionComponent> ent, ICommonSession? session, AntagSelectionDefinition def, bool ignoreSpawner = false)
+    public bool TryMakeAntag(Entity<AntagSelectionComponent> ent, ICommonSession? session, AntagSelectionDefinition def, bool ignoreSpawner = false, bool checkPref = true)
     {
-        if (!IsSessionValid(ent, session, def) ||
-            !IsEntityValid(session?.AttachedEntity, def))
-        {
+        if (checkPref && !HasPrimaryAntagPreference(session, def))
+            return false;
+
+        if (!IsSessionValid(ent, session, def) || !IsEntityValid(session?.AttachedEntity, def))
             return false;
-        }
 
         MakeAntag(ent, session, def, ignoreSpawner);
         return true;
@@ -324,16 +326,14 @@ public AntagSelectionPlayerPool GetPlayerPool(Entity<AntagSelectionComponent> en
         var fallbackList = new List<ICommonSession>();
         foreach (var session in sessions)
         {
-            if (!IsSessionValid(ent, session, def) ||
-                !IsEntityValid(session.AttachedEntity, def))
+            if (!IsSessionValid(ent, session, def) || !IsEntityValid(session.AttachedEntity, def))
                 continue;
 
-            var pref = (HumanoidCharacterProfile) _pref.GetPreferences(session.UserId).SelectedCharacter;
-            if (def.PrefRoles.Count != 0 && pref.AntagPreferences.Any(p => def.PrefRoles.Contains(p)))
+            if (HasPrimaryAntagPreference(session, def))
             {
                 preferredList.Add(session);
             }
-            else if (def.FallbackRoles.Count != 0 && pref.AntagPreferences.Any(p => def.FallbackRoles.Contains(p)))
+            else if (HasFallbackAntagPreference(session, def))
             {
                 fallbackList.Add(session);
             }
@@ -404,13 +404,13 @@ public bool IsEntityValid(EntityUid? entity, AntagSelectionDefinition def)
 
         if (def.Whitelist != null)
         {
-            if (!def.Whitelist.IsValid(entity.Value, EntityManager))
+            if (!def.Whitelist.IsValid(entity.Value))
                 return false;
         }
 
         if (def.Blacklist != null)
         {
-            if (def.Blacklist.IsValid(entity.Value, EntityManager))
+            if (def.Blacklist.IsValid(entity.Value))
                 return false;
         }
 
diff --git a/Content.Server/Cargo/Components/StationLogisticStatsDatabaseComponent.cs b/Content.Server/Cargo/Components/StationLogisticStatsDatabaseComponent.cs
new file mode 100644
index 00000000000..ca1fbeaad08
--- /dev/null
+++ b/Content.Server/Cargo/Components/StationLogisticStatsDatabaseComponent.cs
@@ -0,0 +1,14 @@
+using Content.Shared.Cargo;
+using Content.Shared.CartridgeLoader.Cartridges;
+
+namespace Content.Server.Cargo.Components;
+
+/// <summary>
+/// Added to the abstract representation of a station to track stats related to mail delivery and income
+/// </summary>
+[RegisterComponent, Access(typeof(SharedCargoSystem))]
+public sealed partial class StationLogisticStatsComponent : Component
+{
+    [DataField]
+    public MailStats Metrics { get; set; }
+}
diff --git a/Content.Server/Cargo/Systems/LogisticStatsSystem.cs b/Content.Server/Cargo/Systems/LogisticStatsSystem.cs
new file mode 100644
index 00000000000..6abf4eb5a47
--- /dev/null
+++ b/Content.Server/Cargo/Systems/LogisticStatsSystem.cs
@@ -0,0 +1,63 @@
+using Content.Shared.Cargo;
+using Content.Server.Cargo.Components;
+using JetBrains.Annotations;
+
+namespace Content.Server.Cargo.Systems;
+
+public sealed partial class LogisticStatsSystem : SharedCargoSystem
+{
+    [PublicAPI]
+    public void AddOpenedMailEarnings(EntityUid uid, StationLogisticStatsComponent component, int earnedMoney)
+    {
+        component.Metrics = component.Metrics with
+        {
+            Earnings = component.Metrics.Earnings + earnedMoney,
+            OpenedCount = component.Metrics.OpenedCount + 1
+        };
+        UpdateLogisticsStats(uid);
+    }
+
+    [PublicAPI]
+    public void AddExpiredMailLosses(EntityUid uid, StationLogisticStatsComponent component, int lostMoney)
+    {
+        component.Metrics = component.Metrics with
+        {
+            ExpiredLosses = component.Metrics.ExpiredLosses + lostMoney,
+            ExpiredCount = component.Metrics.ExpiredCount + 1
+        };
+        UpdateLogisticsStats(uid);
+    }
+
+    [PublicAPI]
+    public void AddDamagedMailLosses(EntityUid uid, StationLogisticStatsComponent component, int lostMoney)
+    {
+        component.Metrics = component.Metrics with
+        {
+            DamagedLosses = component.Metrics.DamagedLosses + lostMoney,
+            DamagedCount = component.Metrics.DamagedCount + 1
+        };
+        UpdateLogisticsStats(uid);
+    }
+
+    [PublicAPI]
+    public void AddTamperedMailLosses(EntityUid uid, StationLogisticStatsComponent component, int lostMoney)
+    {
+        component.Metrics = component.Metrics with
+        {
+            TamperedLosses = component.Metrics.TamperedLosses + lostMoney,
+            TamperedCount = component.Metrics.TamperedCount + 1
+        };
+        UpdateLogisticsStats(uid);
+    }
+
+    private void UpdateLogisticsStats(EntityUid uid) => RaiseLocalEvent(new LogisticStatsUpdatedEvent(uid));
+}
+
+public sealed class LogisticStatsUpdatedEvent : EntityEventArgs
+{
+    public EntityUid Station;
+    public LogisticStatsUpdatedEvent(EntityUid station)
+    {
+        Station = station;
+    }
+}
diff --git a/Content.Server/CartridgeLoader/Cartridges/MailMetricsCartridgeComponent.cs b/Content.Server/CartridgeLoader/Cartridges/MailMetricsCartridgeComponent.cs
new file mode 100644
index 00000000000..380a4d90c04
--- /dev/null
+++ b/Content.Server/CartridgeLoader/Cartridges/MailMetricsCartridgeComponent.cs
@@ -0,0 +1,11 @@
+namespace Content.Server.CartridgeLoader.Cartridges;
+
+[RegisterComponent, Access(typeof(MailMetricsCartridgeSystem))]
+public sealed partial class MailMetricsCartridgeComponent : Component
+{
+    /// <summary>
+    /// Station entity keeping track of logistics stats
+    /// </summary>
+    [DataField]
+    public EntityUid? Station;
+}
diff --git a/Content.Server/CartridgeLoader/Cartridges/MailMetricsCartridgeSystem.cs b/Content.Server/CartridgeLoader/Cartridges/MailMetricsCartridgeSystem.cs
new file mode 100644
index 00000000000..00b6d0a16e8
--- /dev/null
+++ b/Content.Server/CartridgeLoader/Cartridges/MailMetricsCartridgeSystem.cs
@@ -0,0 +1,82 @@
+using Content.Server.Cargo.Components;
+using Content.Server.Cargo.Systems;
+using Content.Server.Mail.Components;
+using Content.Server.Station.Systems;
+using Content.Shared.CartridgeLoader;
+using Content.Shared.CartridgeLoader.Cartridges;
+
+namespace Content.Server.CartridgeLoader.Cartridges;
+
+public sealed class MailMetricsCartridgeSystem : EntitySystem
+{
+    [Dependency] private readonly CartridgeLoaderSystem _cartridgeLoader = default!;
+    [Dependency] private readonly StationSystem _station = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<MailMetricsCartridgeComponent, CartridgeUiReadyEvent>(OnUiReady);
+        SubscribeLocalEvent<LogisticStatsUpdatedEvent>(OnLogisticsStatsUpdated);
+        SubscribeLocalEvent<MailComponent, MapInitEvent>(OnMapInit);
+    }
+
+    private void OnUiReady(Entity<MailMetricsCartridgeComponent> ent, ref CartridgeUiReadyEvent args)
+    {
+        UpdateUI(ent, args.Loader);
+    }
+
+    private void OnLogisticsStatsUpdated(LogisticStatsUpdatedEvent args)
+    {
+        UpdateAllCartridges(args.Station);
+    }
+
+    private void OnMapInit(EntityUid uid, MailComponent mail, MapInitEvent args)
+    {
+        if (_station.GetOwningStation(uid) is { } station)
+            UpdateAllCartridges(station);
+    }
+
+    private void UpdateAllCartridges(EntityUid station)
+    {
+        var query = EntityQueryEnumerator<MailMetricsCartridgeComponent, CartridgeComponent>();
+        while (query.MoveNext(out var uid, out var comp, out var cartridge))
+        {
+            if (cartridge.LoaderUid is not { } loader || comp.Station != station)
+                continue;
+            UpdateUI((uid, comp), loader);
+        }
+    }
+
+    private void UpdateUI(Entity<MailMetricsCartridgeComponent> ent, EntityUid loader)
+    {
+        if (_station.GetOwningStation(loader) is { } station)
+            ent.Comp.Station = station;
+
+        if (!TryComp<StationLogisticStatsComponent>(ent.Comp.Station, out var logiStats))
+            return;
+
+        // Get station's logistic stats
+        var unopenedMailCount = GetUnopenedMailCount(ent.Comp.Station);
+
+        // Send logistic stats to cartridge client
+        var state = new MailMetricUiState(logiStats.Metrics, unopenedMailCount);
+        _cartridgeLoader.UpdateCartridgeUiState(loader, state);
+    }
+
+
+    private int GetUnopenedMailCount(EntityUid? station)
+    {
+        var unopenedMail = 0;
+
+        var query = EntityQueryEnumerator<MailComponent>();
+
+        while (query.MoveNext(out var uid, out var comp))
+        {
+            if (comp.IsLocked && _station.GetOwningStation(uid) == station)
+                unopenedMail++;
+        }
+
+        return unopenedMail;
+    }
+}
diff --git a/Content.Server/Gateway/Components/GatewayGeneratorComponent.cs b/Content.Server/Gateway/Components/GatewayGeneratorComponent.cs
index d65760e270f..0f948f1b8f6 100644
--- a/Content.Server/Gateway/Components/GatewayGeneratorComponent.cs
+++ b/Content.Server/Gateway/Components/GatewayGeneratorComponent.cs
@@ -64,6 +64,8 @@ public sealed partial class GatewayGeneratorComponent : Component
         "OreUranium",
         "OreBananium",
         "OreArtifactFragment",
+        "OreBluespace",
+        "OreNormality",
     };
 }
 
diff --git a/Content.Server/Mail/Components/DelayedItemComponent.cs b/Content.Server/Mail/Components/DelayedItemComponent.cs
new file mode 100644
index 00000000000..f73aef85b06
--- /dev/null
+++ b/Content.Server/Mail/Components/DelayedItemComponent.cs
@@ -0,0 +1,15 @@
+namespace Content.Server.Mail.Components;
+
+/// <summary>
+///     A placeholder for another entity, spawned when dropped or placed in someone's hands.
+///     Useful for storing instant effect entities, e.g. smoke, in the mail.
+/// </summary>
+[RegisterComponent]
+public sealed partial class DelayedItemComponent : Component
+{
+    /// <summary>
+    ///     The entity to replace this when opened or dropped.
+    /// </summary>
+    [DataField]
+    public string Item = "None";
+}
diff --git a/Content.Server/Mail/Components/MailComponent.cs b/Content.Server/Mail/Components/MailComponent.cs
new file mode 100644
index 00000000000..af0bdaa87ff
--- /dev/null
+++ b/Content.Server/Mail/Components/MailComponent.cs
@@ -0,0 +1,111 @@
+using System.Threading;
+using Robust.Shared.Audio;
+using Content.Shared.Storage;
+using Content.Shared.Mail;
+
+namespace Content.Server.Mail.Components;
+
+[RegisterComponent]
+public sealed partial class MailComponent : SharedMailComponent
+{
+    [DataField]
+    public string Recipient = "None";
+
+    [DataField]
+    public string RecipientJob = "None";
+
+    /// <remarks>
+    ///     Why do we not use LockComponent?
+    ///     Because this can't be locked again,
+    ///     and we have special conditions for unlocking,
+    ///     and we don't want to add a verb.
+    /// </remarks>
+    [DataField]
+    public bool IsLocked = true;
+
+    /// <summary>
+    ///     Is this parcel profitable to deliver for the station?
+    /// </summary>
+    /// <remarks>
+    ///     The station won't receive any award on delivery if this is false.
+    ///     This is useful for broken fragile packages and packages that were
+    ///     not delivered in time.
+    /// </remarks>
+    [DataField]
+    public bool IsProfitable = true;
+
+    /// <summary>
+    ///     Is this package considered fragile?
+    /// </summary>
+    /// <remarks>
+    ///     This can be set to true in the YAML files for a mail delivery to
+    ///     always be Fragile, despite its contents.
+    /// </remarks>
+    [DataField]
+    public bool IsFragile = false;
+
+    /// <summary>
+    ///     Is this package considered priority mail?
+    /// </summary>
+    /// <remarks>
+    ///     There will be a timer set for its successful delivery. The
+    ///     station's bank account will be penalized if it is not delivered on
+    ///     time. <br/>
+    ///     <br/>
+    ///     This is set to false on successful delivery.<br/>
+    ///     <br/>
+    ///     This can be set to true in the YAML files for a mail delivery to always be Priority.
+    /// </remarks>
+    [DataField]
+    public bool IsPriority = false;
+
+    /// <summary>
+    ///     Whether this parcel is large.
+    /// </summary>
+    [DataField]
+    public bool IsLarge = false;
+
+    /// <summary>
+    ///     What will be packaged when the mail is spawned.
+    /// </summary>
+    [DataField]
+    public List<EntitySpawnEntry> Contents = new();
+
+    /// <summary>
+    ///     The amount that cargo will be awarded for delivering this mail.
+    /// </summary>
+    [DataField]
+    public int Bounty = 750;
+
+    /// <summary>
+    ///     Penalty if the mail is destroyed.
+    /// </summary>
+    [DataField]
+    public int Penalty = -250;
+
+    /// <summary>
+    ///     The sound that's played when the mail's lock is broken.
+    /// </summary>
+    [DataField]
+    public SoundSpecifier PenaltySound = new SoundPathSpecifier("/Audio/Machines/Nuke/angry_beep.ogg");
+
+    /// <summary>
+    ///     The sound that's played when the mail's opened.
+    /// </summary>
+    [DataField]
+    public SoundSpecifier OpenSound = new SoundPathSpecifier("/Audio/Effects/packetrip.ogg");
+
+    /// <summary>
+    ///     The sound that's played when the mail's lock has been emagged.
+    /// </summary>
+    [DataField]
+    public SoundSpecifier EmagSound = new SoundCollectionSpecifier("sparks");
+
+    /// <summary>
+    ///     Whether this component is enabled.
+    ///     Removed when it becomes trash.
+    /// </summary>
+    public bool IsEnabled = true;
+
+    public CancellationTokenSource? PriorityCancelToken;
+}
diff --git a/Content.Server/Mail/Components/MailReceiverComponent.cs b/Content.Server/Mail/Components/MailReceiverComponent.cs
new file mode 100644
index 00000000000..281a27ea79e
--- /dev/null
+++ b/Content.Server/Mail/Components/MailReceiverComponent.cs
@@ -0,0 +1,4 @@
+namespace Content.Server.Mail.Components;
+
+[RegisterComponent]
+public sealed partial class MailReceiverComponent : Component {}
diff --git a/Content.Server/Mail/Components/MailTeleporterComponent.cs b/Content.Server/Mail/Components/MailTeleporterComponent.cs
new file mode 100644
index 00000000000..81f58bc7a59
--- /dev/null
+++ b/Content.Server/Mail/Components/MailTeleporterComponent.cs
@@ -0,0 +1,118 @@
+using Robust.Shared.Audio;
+
+namespace Content.Server.Mail.Components;
+
+/// <summary>
+/// This is for the mail teleporter.
+/// Random mail will be teleported to this every few minutes.
+/// </summary>
+[RegisterComponent]
+public sealed partial class MailTeleporterComponent : Component
+{
+    // <remarks>Not starting accumulator at 0 so mail carriers have some deliveries to make shortly after roundstart.</remarks>
+    [DataField]
+    public float Accumulator = 285f;
+
+    [DataField]
+    public TimeSpan TeleportInterval = TimeSpan.FromMinutes(5);
+
+    /// <summary>
+    ///     The sound that's played when new mail arrives.
+    /// </summary>
+    [DataField]
+    public SoundSpecifier TeleportSound = new SoundPathSpecifier("/Audio/Effects/teleport_arrival.ogg");
+
+    /// <summary>
+    ///     The MailDeliveryPoolPrototype that's used to select what mail this
+    ///     teleporter can deliver.
+    /// </summary>
+    [DataField]
+    public string MailPool = "RandomDeltaVMailDeliveryPool";
+
+    /// <summary>
+    ///     How many mail candidates do we need per actual delivery sent when
+    ///     the mail goes out? The number of candidates is divided by this number
+    ///     to determine how many deliveries will be teleported in.
+    ///     It does not determine unique recipients. That is random.
+    /// </summary>
+    [DataField]
+    public int CandidatesPerDelivery = 8;
+
+    [DataField]
+    public int MinimumDeliveriesPerTeleport = 1;
+
+    /// <summary>
+    ///     Do not teleport any more mail in, if there are at least this many
+    ///     undelivered parcels.
+    /// </summary>
+    /// <remarks>
+    ///     Currently this works by checking how many MailComponent entities
+    ///     are sitting on the teleporter's tile.<br/><br/>
+    ///
+    ///     It should be noted that if the number of actual deliveries to be
+    ///     made based on the number of candidates divided by candidates per
+    ///     delivery exceeds this number, the teleporter will spawn more mail
+    ///     than this number.<br/><br/>
+    ///
+    ///     This is just a simple check to see if anyone's been picking up the
+    ///     mail lately to prevent entity bloat for the sake of performance.
+    /// </remarks>
+    [DataField]
+    public int MaximumUndeliveredParcels = 5;
+
+    /// <summary>
+    ///     Any item that breaks or is destroyed in less than this amount of
+    ///     damage is one of the types of items considered fragile.
+    /// </summary>
+    [DataField]
+    public int FragileDamageThreshold = 10;
+
+    /// <summary>
+    ///     What's the bonus for delivering a fragile package intact?
+    /// </summary>
+    [DataField]
+    public int FragileBonus = 100;
+
+    /// <summary>
+    ///     What's the malus for failing to deliver a fragile package?
+    /// </summary>
+    [DataField]
+    public int FragileMalus = -100;
+
+    /// <summary>
+    ///     What's the chance for any one delivery to be marked as priority mail?
+    /// </summary>
+    [DataField]
+    public float PriorityChance = 0.1f;
+
+    /// <summary>
+    ///     How long until a priority delivery is considered as having failed
+    ///     if not delivered?
+    /// </summary>
+    [DataField]
+    public TimeSpan PriorityDuration = TimeSpan.FromMinutes(5);
+
+    /// <summary>
+    ///     What's the bonus for delivering a priority package on time?
+    /// </summary>
+    [DataField]
+    public int PriorityBonus = 250;
+
+    /// <summary>
+    ///    What's the malus for failing to deliver a priority package?
+    /// </summary>
+    [DataField]
+    public int PriorityMalus = -250;
+
+    /// <summary>
+    ///     What's the bonus for delivering a large package intact?
+    /// </summary>
+    [DataField]
+    public int LargeBonus = 1500;
+
+    /// <summary>
+    ///     What's the malus for failing to deliver a large package?
+    /// </summary>
+    [DataField]
+    public int LargeMalus = -500;
+}
diff --git a/Content.Server/Nyanotrasen/Mail/Components/StationMailRouterComponent.cs b/Content.Server/Mail/Components/StationMailRouterComponent.cs
similarity index 51%
rename from Content.Server/Nyanotrasen/Mail/Components/StationMailRouterComponent.cs
rename to Content.Server/Mail/Components/StationMailRouterComponent.cs
index ce87eb131fc..6f6df1e10bb 100644
--- a/Content.Server/Nyanotrasen/Mail/Components/StationMailRouterComponent.cs
+++ b/Content.Server/Mail/Components/StationMailRouterComponent.cs
@@ -1,7 +1,7 @@
-namespace Content.Server.Mail;
+namespace Content.Server.Mail.Components;
 
 /// <summary>
-/// Designates a station as a place for sending and receiving mail.
+///     Designates a station as a place for sending and receiving mail.
 /// </summary>
 [RegisterComponent]
 public sealed partial class StationMailRouterComponent : Component
diff --git a/Content.Server/Nyanotrasen/Mail/MailCommands.cs b/Content.Server/Mail/MailCommands.cs
similarity index 69%
rename from Content.Server/Nyanotrasen/Mail/MailCommands.cs
rename to Content.Server/Mail/MailCommands.cs
index 5af873f9e80..390de93fb3a 100644
--- a/Content.Server/Nyanotrasen/Mail/MailCommands.cs
+++ b/Content.Server/Mail/MailCommands.cs
@@ -5,6 +5,7 @@
 using Content.Shared.Administration;
 using Content.Server.Administration;
 using Content.Server.Mail.Components;
+using Content.Server.Mail.Systems;
 
 namespace Content.Server.Mail;
 
@@ -20,6 +21,7 @@ public sealed class MailToCommand : IConsoleCommand
     [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
 
     private readonly string _blankMailPrototype = "MailAdminFun";
+    private readonly string _blankLargeMailPrototype = "MailLargeAdminFun"; // Frontier: large mail
     private readonly string _container = "storagebase";
     private readonly string _mailContainer = "contents";
 
@@ -44,21 +46,23 @@ public async void Execute(IConsoleShell shell, string argStr, string[] args)
             return;
         }
 
-        if (!Boolean.TryParse(args[2], out var isFragile))
+        if (!bool.TryParse(args[2], out var isFragile) || !bool.TryParse(args[3], out var isPriority))
         {
             shell.WriteError(Loc.GetString("shell-invalid-bool"));
             return;
         }
 
-        if (!Boolean.TryParse(args[3], out var isPriority))
+        var isLarge = false;
+        if (args.Length > 4 && !bool.TryParse(args[4], out isLarge))
         {
             shell.WriteError(Loc.GetString("shell-invalid-bool"));
             return;
         }
+        var mailPrototype = isLarge ? _blankLargeMailPrototype : _blankMailPrototype;
 
 
-        var _mailSystem = _entitySystemManager.GetEntitySystem<MailSystem>();
-        var _containerSystem = _entitySystemManager.GetEntitySystem<SharedContainerSystem>();
+        var mailSystem = _entitySystemManager.GetEntitySystem<MailSystem>();
+        var containerSystem = _entitySystemManager.GetEntitySystem<SharedContainerSystem>();
 
         if (!_entityManager.TryGetComponent(recipientUid, out MailReceiverComponent? mailReceiver))
         {
@@ -66,49 +70,50 @@ public async void Execute(IConsoleShell shell, string argStr, string[] args)
             return;
         }
 
-        if (!_prototypeManager.HasIndex<EntityPrototype>(_blankMailPrototype))
+        if (!_prototypeManager.HasIndex<EntityPrototype>(mailPrototype))
         {
-            shell.WriteLine(Loc.GetString("command-mailto-no-blankmail", ("blankMail", _blankMailPrototype)));
+            shell.WriteLine(Loc.GetString("command-mailto-no-blankmail", ("blankMail", mailPrototype)));
             return;
         }
 
-        if (!_containerSystem.TryGetContainer(containerUid, _container, out var targetContainer))
+        if (!containerSystem.TryGetContainer(containerUid, _container, out var targetContainer))
         {
             shell.WriteLine(Loc.GetString("command-mailto-invalid-container", ("requiredContainer", _container)));
             return;
         }
 
-        if (!_mailSystem.TryGetMailRecipientForReceiver(mailReceiver, out MailRecipient? recipient))
+        if (!mailSystem.TryGetMailRecipientForReceiver(mailReceiver, out MailRecipient? recipient))
         {
             shell.WriteLine(Loc.GetString("command-mailto-unable-to-receive"));
             return;
         }
 
-        if (!_mailSystem.TryGetMailTeleporterForReceiver(mailReceiver, out MailTeleporterComponent? teleporterComponent))
+        if (!mailSystem.TryGetMailTeleporterForReceiver(mailReceiver, out MailTeleporterComponent? teleporterComponent))
         {
             shell.WriteLine(Loc.GetString("command-mailto-no-teleporter-found"));
             return;
         }
 
-        var mailUid = _entityManager.SpawnEntity(_blankMailPrototype, _entityManager.GetComponent<TransformComponent>(containerUid).Coordinates);
-        var mailContents = _containerSystem.EnsureContainer<Container>(mailUid, _mailContainer);
+        var mailUid = _entityManager.SpawnEntity(mailPrototype, _entityManager.GetComponent<TransformComponent>(containerUid).Coordinates);
+        var mailContents = containerSystem.EnsureContainer<Container>(mailUid, _mailContainer);
 
         if (!_entityManager.TryGetComponent(mailUid, out MailComponent? mailComponent))
         {
-            shell.WriteLine(Loc.GetString("command-mailto-bogus-mail", ("blankMail", _blankMailPrototype), ("requiredMailComponent", nameof(MailComponent))));
+            shell.WriteLine(Loc.GetString("command-mailto-bogus-mail", ("blankMail", mailPrototype), ("requiredMailComponent", nameof(MailComponent))));
             return;
         }
 
         foreach (var entity in targetContainer.ContainedEntities.ToArray())
-            _containerSystem.Insert(entity, mailContents);
+            containerSystem.Insert(entity, mailContents);
 
         mailComponent.IsFragile = isFragile;
         mailComponent.IsPriority = isPriority;
+        mailComponent.IsLarge = isLarge;
 
-        _mailSystem.SetupMail(mailUid, teleporterComponent, recipient.Value);
+        mailSystem.SetupMail(mailUid, teleporterComponent, recipient.Value);
 
-        var teleporterQueue = _containerSystem.EnsureContainer<Container>(teleporterComponent.Owner, "queued");
-        _containerSystem.Insert(mailUid, teleporterQueue);
+        var teleporterQueue = containerSystem.EnsureContainer<Container>(teleporterComponent.Owner, "queued");
+        containerSystem.Insert(mailUid, teleporterQueue);
         shell.WriteLine(Loc.GetString("command-mailto-success", ("timeToTeleport", teleporterComponent.TeleportInterval.TotalSeconds - teleporterComponent.Accumulator)));
     }
 }
@@ -125,7 +130,7 @@ public sealed class MailNowCommand : IConsoleCommand
 
     public async void Execute(IConsoleShell shell, string argStr, string[] args)
     {
-        var _mailSystem = _entitySystemManager.GetEntitySystem<MailSystem>();
+        var entitySystem = _entitySystemManager.GetEntitySystem<MailSystem>();
 
         foreach (var mailTeleporter in _entityManager.EntityQuery<MailTeleporterComponent>())
         {
diff --git a/Content.Server/Mail/MailConstants.cs b/Content.Server/Mail/MailConstants.cs
new file mode 100644
index 00000000000..38d37a13269
--- /dev/null
+++ b/Content.Server/Mail/MailConstants.cs
@@ -0,0 +1,37 @@
+namespace Content.Server.Mail;
+
+/// <summary>
+/// A set of localized strings related to mail entities
+/// </summary>
+public struct MailEntityStrings
+{
+    public string NameAddressed;
+    public string DescClose;
+    public string DescFar;
+}
+
+/// <summary>
+/// Constants related to mail.
+/// </summary>
+public static class MailConstants
+{
+    /// <summary>
+    /// Locale strings related to small parcels.
+    /// </summary>
+    public static readonly MailEntityStrings Mail = new()
+    {
+        NameAddressed = "mail-item-name-addressed",
+        DescClose = "mail-desc-close",
+        DescFar = "mail-desc-far"
+    };
+
+    /// <summary>
+    /// Locale strings related to large packages.
+    /// </summary>
+    public static readonly MailEntityStrings MailLarge = new()
+    {
+        NameAddressed = "mail-large-item-name-addressed",
+        DescClose = "mail-large-desc-close",
+        DescFar = "mail-large-desc-far"
+    };
+}
diff --git a/Content.Server/Mail/Systems/DelayedItemSystem.cs b/Content.Server/Mail/Systems/DelayedItemSystem.cs
new file mode 100644
index 00000000000..59aaa3aff6f
--- /dev/null
+++ b/Content.Server/Mail/Systems/DelayedItemSystem.cs
@@ -0,0 +1,43 @@
+using Content.Shared.Damage;
+using Content.Shared.Hands;
+using Robust.Shared.Containers;
+
+namespace Content.Server.Mail.Systems;
+
+/// <summary>
+///     A placeholder for another entity, spawned when taken out of a container, with the placeholder deleted shortly after.
+///     Useful for storing instant effect entities, e.g. smoke, in the mail.
+/// </summary>
+public sealed class DelayedItemSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<Components.DelayedItemComponent, DropAttemptEvent>(OnDropAttempt);
+        SubscribeLocalEvent<Components.DelayedItemComponent, GotEquippedHandEvent>(OnHandEquipped);
+        SubscribeLocalEvent<Components.DelayedItemComponent, DamageChangedEvent>(OnDamageChanged);
+        SubscribeLocalEvent<Components.DelayedItemComponent, EntGotRemovedFromContainerMessage>(OnRemovedFromContainer);
+    }
+
+    private void OnRemovedFromContainer(EntityUid uid, Components.DelayedItemComponent component, ContainerModifiedMessage args)
+    {
+        Spawn(component.Item, Transform(uid).Coordinates);
+    }
+
+    private void OnHandEquipped(EntityUid uid, Components.DelayedItemComponent component, EquippedHandEvent args)
+    {
+        EntityManager.DeleteEntity(uid);
+    }
+
+    private void OnDropAttempt(EntityUid uid, Components.DelayedItemComponent component, DropAttemptEvent args)
+    {
+        EntityManager.DeleteEntity(uid);
+    }
+
+    private void OnDamageChanged(EntityUid uid, Components.DelayedItemComponent component, DamageChangedEvent args)
+    {
+        Spawn(component.Item, Transform(uid).Coordinates);
+        EntityManager.DeleteEntity(uid);
+    }
+}
diff --git a/Content.Server/Mail/Systems/MailSystem.cs b/Content.Server/Mail/Systems/MailSystem.cs
new file mode 100644
index 00000000000..e80febd2308
--- /dev/null
+++ b/Content.Server/Mail/Systems/MailSystem.cs
@@ -0,0 +1,756 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Threading;
+using Content.Server.Access.Systems;
+using Content.Server.Cargo.Components;
+using Content.Server.Cargo.Systems;
+using Content.Server.Chat.Systems;
+using Content.Server.Chemistry.Containers.EntitySystems;
+using Content.Server.Damage.Components;
+using Content.Server.Destructible;
+using Content.Server.Destructible.Thresholds;
+using Content.Server.Destructible.Thresholds.Behaviors;
+using Content.Server.Destructible.Thresholds.Triggers;
+using Content.Server.Item;
+using Content.Server.Mail.Components;
+using Content.Server.Mind;
+using Content.Server.Popups;
+using Content.Server.Power.Components;
+using Content.Server.Spawners.EntitySystems;
+using Content.Server.Station.Systems;
+using Content.Shared.Access;
+using Content.Shared.Access.Components;
+using Content.Shared.Access.Systems;
+using Content.Shared.Chat;
+using Content.Shared.Damage;
+using Content.Shared.Destructible;
+using Content.Shared.Emag.Components;
+using Content.Shared.Emag.Systems;
+using Content.Shared.Examine;
+using Content.Shared.Fluids.Components;
+using Content.Shared.Hands.EntitySystems;
+using Content.Shared.Interaction;
+using Content.Shared.Interaction.Events;
+using Content.Shared.Mail;
+using Content.Shared.Maps;
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Nutrition.EntitySystems;
+using Content.Shared.PDA;
+using Content.Shared.Roles;
+using Content.Shared.Storage;
+using Content.Shared.Tag;
+using Robust.Shared.Audio;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Containers;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+using Timer = Robust.Shared.Timing.Timer;
+
+namespace Content.Server.Mail.Systems;
+
+public sealed class MailSystem : EntitySystem
+{
+    [Dependency] private readonly PopupSystem _popupSystem = default!;
+    [Dependency] private readonly AccessReaderSystem _accessSystem = default!;
+    [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
+    [Dependency] private readonly IdCardSystem _idCardSystem = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly TagSystem _tagSystem = default!;
+    [Dependency] private readonly CargoSystem _cargoSystem = default!;
+    [Dependency] private readonly StationSystem _stationSystem = default!;
+    [Dependency] private readonly ChatSystem _chatSystem = default!;
+    [Dependency] private readonly OpenableSystem _openable = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
+    [Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
+    [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!;
+    [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
+    [Dependency] private readonly DamageableSystem _damageableSystem = default!;
+    [Dependency] private readonly MindSystem _mindSystem = default!;
+    [Dependency] private readonly MetaDataSystem _metaDataSystem = default!;
+
+    // DeltaV - system that keeps track of mail and cargo stats
+    [Dependency] private readonly LogisticStatsSystem _logisticsStatsSystem = default!;
+
+    private ISawmill _sawmill = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        _sawmill = Logger.GetSawmill("mail");
+
+        SubscribeLocalEvent<PlayerSpawningEvent>(OnSpawnPlayer, after: new[] { typeof(SpawnPointSystem) });
+
+        SubscribeLocalEvent<MailComponent, ComponentRemove>(OnRemove);
+        SubscribeLocalEvent<MailComponent, UseInHandEvent>(OnUseInHand);
+        SubscribeLocalEvent<MailComponent, AfterInteractUsingEvent>(OnAfterInteractUsing);
+        SubscribeLocalEvent<MailComponent, ExaminedEvent>(OnExamined);
+        SubscribeLocalEvent<MailComponent, DestructionEventArgs>(OnDestruction);
+        SubscribeLocalEvent<MailComponent, DamageChangedEvent>(OnDamage);
+        SubscribeLocalEvent<MailComponent, BreakageEventArgs>(OnBreak);
+        SubscribeLocalEvent<MailComponent, GotEmaggedEvent>(OnMailEmagged);
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+        foreach (var mailTeleporter in EntityQuery<MailTeleporterComponent>())
+        {
+            if (TryComp<ApcPowerReceiverComponent>(mailTeleporter.Owner, out var power) && !power.Powered)
+                continue;
+
+            mailTeleporter.Accumulator += frameTime;
+            if (mailTeleporter.Accumulator < mailTeleporter.TeleportInterval.TotalSeconds)
+                continue;
+
+            mailTeleporter.Accumulator -= (float) mailTeleporter.TeleportInterval.TotalSeconds;
+
+            SpawnMail(mailTeleporter.Owner, mailTeleporter);
+        }
+    }
+
+    /// <summary>
+    ///     Dynamically add the MailReceiver component to appropriate entities.
+    /// </summary>
+    private void OnSpawnPlayer(PlayerSpawningEvent args)
+    {
+        if (args.SpawnResult == null
+            || args.Job == null
+            || args.Station is not {} station
+            || !HasComp<StationMailRouterComponent>(station))
+            return;
+
+        AddComp<MailReceiverComponent>(args.SpawnResult.Value);
+    }
+
+    private void OnRemove(EntityUid uid, MailComponent component, ComponentRemove args)
+    {
+        // Make sure the priority timer doesn't run.
+        if (component.PriorityCancelToken != null)
+            component.PriorityCancelToken.Cancel();
+    }
+
+    /// <summary>
+    ///     Try to open the mail.
+    /// </summary>
+    private void OnUseInHand(EntityUid uid, MailComponent component, UseInHandEvent args)
+    {
+        if (!component.IsEnabled)
+            return;
+        if (component.IsLocked)
+        {
+            _popupSystem.PopupEntity(Loc.GetString("mail-locked"), uid, args.User);
+            return;
+        }
+        OpenMail(uid, component, args.User);
+    }
+
+    /// <summary>
+    ///     Handle logic similar between a normal mail unlock and an emag
+    ///     frying out the lock.
+    /// </summary>
+    private void UnlockMail(EntityUid uid, MailComponent component)
+    {
+        component.IsLocked = false;
+        UpdateAntiTamperVisuals(uid, false);
+
+        if (component.IsPriority)
+        {
+            // This is a successful delivery. Keep the failure timer from triggering.
+            if (component.PriorityCancelToken != null)
+                component.PriorityCancelToken.Cancel();
+
+            // The priority tape is visually considered to be a part of the
+            // anti-tamper lock, so remove that too.
+            _appearanceSystem.SetData(uid, MailVisuals.IsPriority, false);
+
+            // The examination code depends on this being false to not show
+            // the priority tape description anymore.
+            component.IsPriority = false;
+        }
+    }
+
+    /// <summary>
+    ///     Check the ID against the mail's lock
+    /// </summary>
+    private void OnAfterInteractUsing(EntityUid uid, MailComponent component, AfterInteractUsingEvent args)
+    {
+        if (!args.CanReach || !component.IsLocked || !TryComp<AccessReaderComponent>(uid, out var access))
+            return;
+
+        IdCardComponent? idCard = null; // We need an ID card.
+        if (HasComp<PdaComponent>(args.Used)) // Can we find it in a PDA if the user is using that?
+        {
+            _idCardSystem.TryGetIdCard(args.Used, out var pdaID);
+            idCard = pdaID;
+        }
+
+        if (HasComp<IdCardComponent>(args.Used)) // Or are they using an id card directly?
+            idCard = Comp<IdCardComponent>(args.Used);
+
+        if (idCard == null) // Return if we still haven't found an id card.
+            return;
+
+        if (!HasComp<EmaggedComponent>(uid))
+        {
+            if (idCard.FullName != component.Recipient || idCard.JobTitle != component.RecipientJob)
+            {
+                _popupSystem.PopupEntity(Loc.GetString("mail-recipient-mismatch"), uid, args.User);
+                return;
+            }
+
+            if (!_accessSystem.IsAllowed(uid, args.User))
+            {
+                _popupSystem.PopupEntity(Loc.GetString("mail-invalid-access"), uid, args.User);
+                return;
+            }
+        }
+
+        ExecuteForEachLogisticsStats(uid, (station, logisticStats) =>
+        {
+            _logisticsStatsSystem.AddOpenedMailEarnings(station,
+                logisticStats,
+                component.IsProfitable ? component.Bounty : 0);
+        });
+        UnlockMail(uid, component);
+
+        if (!component.IsProfitable)
+        {
+            _popupSystem.PopupEntity(Loc.GetString("mail-unlocked"), uid, args.User);
+            return;
+        }
+
+        _popupSystem.PopupEntity(Loc.GetString("mail-unlocked-reward", ("bounty", component.Bounty)), uid, args.User);
+
+        component.IsProfitable = false;
+
+        var query = EntityQueryEnumerator<StationBankAccountComponent>();
+        while (query.MoveNext(out var station, out var account))
+        {
+            if (_stationSystem.GetOwningStation(uid) != station)
+                continue;
+
+            _cargoSystem.UpdateBankAccount(station, account, component.Bounty);
+        }
+    }
+
+    private void OnExamined(EntityUid uid, MailComponent component, ExaminedEvent args)
+    {
+        MailEntityStrings mailEntityStrings = component.IsLarge ? MailConstants.MailLarge : MailConstants.Mail; //Frontier: mail types stored per type (large mail)
+        if (!args.IsInDetailsRange)
+        {
+            args.PushMarkup(Loc.GetString(mailEntityStrings.DescFar)); // Frontier: mail constants struct
+            return;
+        }
+
+        args.PushMarkup(Loc.GetString(mailEntityStrings.DescClose, ("name", component.Recipient), ("job", component.RecipientJob))); // Frontier: mail constants struct
+
+        if (component.IsFragile)
+            args.PushMarkup(Loc.GetString("mail-desc-fragile"));
+
+        if (component.IsPriority)
+        {
+            if (component.IsProfitable)
+                args.PushMarkup(Loc.GetString("mail-desc-priority"));
+            else
+                args.PushMarkup(Loc.GetString("mail-desc-priority-inactive"));
+        }
+    }
+
+    /// <summary>
+    ///     Penalize a station for a failed delivery.
+    /// </summary>
+    /// <remarks>
+    ///     This will mark a parcel as no longer being profitable, which will
+    ///     prevent multiple failures on different conditions for the same
+    ///     delivery. <br/><br/>
+    ///
+    ///     The standard penalization is breaking the anti-tamper lock,
+    ///     but this allows a delivery to fail for other reasons too
+    ///     while having a generic function to handle different messages.
+    /// </remarks>
+    public void PenalizeStationFailedDelivery(EntityUid uid, MailComponent component, string localizationString)
+    {
+        if (!component.IsProfitable)
+            return;
+
+        _chatSystem.TrySendInGameICMessage(uid, Loc.GetString(localizationString, ("credits", component.Penalty)), InGameICChatType.Speak, false);
+        _audioSystem.PlayPvs(component.PenaltySound, uid);
+
+        component.IsProfitable = false;
+
+        if (component.IsPriority)
+            _appearanceSystem.SetData(uid, MailVisuals.IsPriorityInactive, true);
+
+        var query = EntityQueryEnumerator<StationBankAccountComponent>();
+        while (query.MoveNext(out var station, out var account))
+        {
+            if (_stationSystem.GetOwningStation(uid) != station)
+                continue;
+
+            _cargoSystem.UpdateBankAccount(station, account, component.Penalty);
+            return;
+        }
+    }
+
+    private void OnDestruction(EntityUid uid, MailComponent component, DestructionEventArgs args)
+    {
+        if (component.IsLocked)
+        {
+            // DeltaV - Tampered mail recorded to logistic stats
+            ExecuteForEachLogisticsStats(uid, (station, logisticStats) =>
+            {
+                _logisticsStatsSystem.AddTamperedMailLosses(station,
+                    logisticStats,
+                    component.IsProfitable ? component.Penalty : 0);
+            });
+
+            PenalizeStationFailedDelivery(uid, component, "mail-penalty-lock");
+        }
+
+        if (component.IsEnabled)
+            OpenMail(uid, component);
+
+        UpdateAntiTamperVisuals(uid, false);
+    }
+
+    private void OnDamage(EntityUid uid, MailComponent component, DamageChangedEvent args)
+    {
+        if (args.DamageDelta == null || !_containerSystem.TryGetContainer(uid, "contents", out var contents))
+            return;
+
+        // Transfer damage to the contents.
+        // This should be a general-purpose feature for all containers in the future.
+        foreach (var entity in contents.ContainedEntities.ToArray())
+            _damageableSystem.TryChangeDamage(entity, args.DamageDelta);
+    }
+
+    private void OnBreak(EntityUid uid, MailComponent component, BreakageEventArgs args)
+    {
+        _appearanceSystem.SetData(uid, MailVisuals.IsBroken, true);
+
+        if (component.IsFragile)
+        {
+            // DeltaV - Broken mail recorded to logistic stats
+            ExecuteForEachLogisticsStats(uid, (station, logisticStats) =>
+            {
+                _logisticsStatsSystem.AddDamagedMailLosses(station,
+                    logisticStats,
+                    component.IsProfitable ? component.Penalty : 0);
+            });
+
+            PenalizeStationFailedDelivery(uid, component, "mail-penalty-fragile");
+        }
+    }
+
+    private void OnMailEmagged(EntityUid uid, MailComponent component, ref GotEmaggedEvent args)
+    {
+        if (!component.IsLocked)
+            return;
+
+        UnlockMail(uid, component);
+
+        _popupSystem.PopupEntity(Loc.GetString("mail-unlocked-by-emag"), uid, args.UserUid);
+
+        _audioSystem.PlayPvs(component.EmagSound, uid, AudioParams.Default.WithVolume(4));
+        component.IsProfitable = false;
+        args.Handled = true;
+    }
+
+    /// <summary>
+    /// Returns true if the given entity is considered fragile for delivery.
+    /// </summary>
+    public bool IsEntityFragile(EntityUid uid, int fragileDamageThreshold)
+    {
+        // It takes damage on falling.
+        if (HasComp<DamageOnLandComponent>(uid))
+            return true;
+
+        // It can be spilled easily and has something to spill.
+        if (HasComp<SpillableComponent>(uid)
+            && TryComp<OpenableComponent>(uid, out var openable)
+            && !_openable.IsClosed(uid, null, openable)
+            && _solutionContainerSystem.PercentFull(uid) > 0)
+            return true;
+
+        // It might be made of non-reinforced glass.
+        if (TryComp(uid, out DamageableComponent? damageableComponent)
+            && damageableComponent.DamageModifierSetId == "Glass")
+            return true;
+
+        if (!TryComp(uid, out DestructibleComponent? destructibleComp))
+            return false;
+
+        // Fallback: It breaks or is destroyed in less than a damage
+        // threshold dictated by the teleporter.
+        foreach (var threshold in destructibleComp.Thresholds)
+        {
+            if (threshold.Trigger is not DamageTrigger trigger || trigger.Damage >= fragileDamageThreshold)
+                continue;
+
+            foreach (var behavior in threshold.Behaviors)
+            {
+                if (behavior is not DoActsBehavior doActs)
+                    continue;
+
+                if (doActs.Acts.HasFlag(ThresholdActs.Breakage) || doActs.Acts.HasFlag(ThresholdActs.Destruction))
+                    return true;
+            }
+        }
+
+        return false;
+    }
+
+    public bool TryMatchJobTitleToDepartment(string jobTitle, [NotNullWhen(true)] out string? jobDepartment)
+    {
+        foreach (var department in _prototypeManager.EnumeratePrototypes<DepartmentPrototype>())
+        {
+            foreach (var role in department.Roles)
+            {
+                if (!_prototypeManager.TryIndex(role, out JobPrototype? jobPrototype) || jobPrototype.LocalizedName != jobTitle)
+                    continue;
+
+                jobDepartment = department.ID;
+                return true;
+            }
+        }
+
+        jobDepartment = null;
+        return false;
+    }
+
+    public bool TryMatchJobTitleToPrototype(string jobTitle, [NotNullWhen(true)] out JobPrototype? jobPrototype)
+    {
+        foreach (var job in _prototypeManager.EnumeratePrototypes<JobPrototype>())
+        {
+            if (job.LocalizedName == jobTitle)
+            {
+                jobPrototype = job;
+                return true;
+            }
+        }
+
+        jobPrototype = null;
+        return false;
+    }
+
+    /// <summary>
+    /// Handle all the gritty details particular to a new mail entity.
+    /// </summary>
+    /// <remarks>
+    /// This is separate mostly so the unit tests can get to it.
+    /// </remarks>
+    public void SetupMail(EntityUid uid, MailTeleporterComponent component, MailRecipient recipient)
+    {
+        var mailComp = EnsureComp<MailComponent>(uid);
+
+        var container = _containerSystem.EnsureContainer<Container>(uid, "contents");
+        foreach (var item in EntitySpawnCollection.GetSpawns(mailComp.Contents, _random))
+        {
+            var entity = EntityManager.SpawnEntity(item, Transform(uid).Coordinates);
+            if (!_containerSystem.Insert(entity, container))
+            {
+                _sawmill.Error($"Can't insert {ToPrettyString(entity)} into new mail delivery {ToPrettyString(uid)}! Deleting it.");
+                QueueDel(entity);
+            }
+            else if (!mailComp.IsFragile && IsEntityFragile(entity, component.FragileDamageThreshold))
+            {
+                mailComp.IsFragile = true;
+            }
+        }
+
+        mailComp.IsPriority = recipient.MayReceivePriorityMail && _random.Prob(component.PriorityChance);
+        mailComp.RecipientJob = recipient.Job;
+        mailComp.Recipient = recipient.Name;
+
+        var mailEntityStrings = mailComp.IsLarge ? MailConstants.MailLarge : MailConstants.Mail;
+        if (mailComp.IsLarge)
+        {
+            mailComp.Bounty += component.LargeBonus;
+            mailComp.Penalty += component.LargeMalus;
+        }
+
+        if (mailComp.IsFragile)
+        {
+            mailComp.Bounty += component.FragileBonus;
+            mailComp.Penalty += component.FragileMalus;
+            _appearanceSystem.SetData(uid, MailVisuals.IsFragile, true);
+        }
+
+        if (mailComp.IsPriority)
+        {
+            mailComp.Bounty += component.PriorityBonus;
+            mailComp.Penalty += component.PriorityMalus;
+            _appearanceSystem.SetData(uid, MailVisuals.IsPriority, true);
+            mailComp.PriorityCancelToken = new CancellationTokenSource();
+
+            Timer.Spawn((int) component.PriorityDuration.TotalMilliseconds, () =>
+            {
+                // DeltaV - Expired mail recorded to logistic stats
+                ExecuteForEachLogisticsStats(uid, (station, logisticStats) =>
+                {
+                    _logisticsStatsSystem.AddExpiredMailLosses(station,
+                        logisticStats,
+                        mailComp.IsProfitable ? mailComp.Penalty : 0);
+                });
+
+                PenalizeStationFailedDelivery(uid, mailComp, "mail-penalty-expired");
+            }, mailComp.PriorityCancelToken.Token);
+        }
+
+        _appearanceSystem.SetData(uid, MailVisuals.JobIcon, recipient.JobIcon);
+
+        _metaDataSystem.SetEntityName(uid, Loc.GetString(mailEntityStrings.NameAddressed, // Frontier: move constant to MailEntityString
+            ("recipient", recipient.Name)));
+
+        var accessReader = EnsureComp<AccessReaderComponent>(uid);
+        accessReader.AccessLists.Add(recipient.AccessTags);
+    }
+
+    /// <summary>
+    /// Return the parcels waiting for delivery.
+    /// </summary>
+    /// <param name="uid">The mail teleporter to check.</param>
+    public List<EntityUid> GetUndeliveredParcels(EntityUid uid)
+    {
+        // An alternative solution would be to keep a list of the unopened
+        // parcels spawned by the teleporter and see if they're not carried
+        // by someone, but this is simple, and simple is good.
+        List<EntityUid> undeliveredParcels = new();
+        foreach (var entityInTile in TurfHelpers.GetEntitiesInTile(Transform(uid).Coordinates, LookupFlags.Dynamic | LookupFlags.Sundries))
+        {
+            if (HasComp<MailComponent>(entityInTile))
+                undeliveredParcels.Add(entityInTile);
+        }
+        return undeliveredParcels;
+    }
+
+    /// <summary>
+    /// Return how many parcels are waiting for delivery.
+    /// </summary>
+    /// <param name="uid">The mail teleporter to check.</param>
+    public uint GetUndeliveredParcelCount(EntityUid uid)
+    {
+        return (uint) GetUndeliveredParcels(uid).Count();
+    }
+
+    /// <summary>
+    /// Try to match a mail receiver to a mail teleporter.
+    /// </summary>
+    public bool TryGetMailTeleporterForReceiver(MailReceiverComponent receiver, [NotNullWhen(true)] out MailTeleporterComponent? teleporterComponent)
+    {
+        foreach (var mailTeleporter in EntityQuery<MailTeleporterComponent>())
+        {
+            if (_stationSystem.GetOwningStation(receiver.Owner) != _stationSystem.GetOwningStation(mailTeleporter.Owner))
+                continue;
+
+            teleporterComponent = mailTeleporter;
+            return true;
+        }
+
+        teleporterComponent = null;
+        return false;
+    }
+
+    /// <summary>
+    /// Try to construct a recipient struct for a mail parcel based on a receiver.
+    /// </summary>
+    public bool TryGetMailRecipientForReceiver(MailReceiverComponent receiver, [NotNullWhen(true)] out MailRecipient? recipient)
+    {
+        // Because of the way this works, people are not considered
+        // candidates for mail if there is no valid PDA or ID in their slot
+        // or active hand. A better future solution might be checking the
+        // station records, possibly cross-referenced with the medical crew
+        // scanner to look for living recipients. TODO
+
+        if (_idCardSystem.TryFindIdCard(receiver.Owner, out var idCard)
+            && TryComp<AccessComponent>(idCard.Owner, out var access)
+            && idCard.Comp.FullName != null
+            && idCard.Comp.JobTitle != null)
+        {
+            var accessTags = access.Tags;
+
+            var mayReceivePriorityMail = !(_mindSystem.GetMind(receiver.Owner) == null);
+
+            recipient = new MailRecipient(idCard.Comp.FullName,
+                idCard.Comp.JobTitle,
+                idCard.Comp.JobIcon,
+                accessTags,
+                mayReceivePriorityMail);
+
+            return true;
+        }
+
+        recipient = null;
+        return false;
+    }
+
+    /// <summary>
+    /// Get the list of valid mail recipients for a mail teleporter.
+    /// </summary>
+    public List<MailRecipient> GetMailRecipientCandidates(EntityUid uid)
+    {
+        List<MailRecipient> candidateList = new();
+
+        foreach (var receiver in EntityQuery<MailReceiverComponent>())
+        {
+            if (_stationSystem.GetOwningStation(receiver.Owner) != _stationSystem.GetOwningStation(uid))
+                continue;
+
+            if (TryGetMailRecipientForReceiver(receiver, out MailRecipient? recipient))
+                candidateList.Add(recipient.Value);
+        }
+
+        return candidateList;
+    }
+
+    /// <summary>
+    ///     Handle the spawning of all the mail for a mail teleporter.
+    /// </summary>
+    public void SpawnMail(EntityUid uid, MailTeleporterComponent? component = null)
+    {
+        if (!Resolve(uid, ref component))
+        {
+            _sawmill.Error($"Tried to SpawnMail on {ToPrettyString(uid)} without a valid MailTeleporterComponent!");
+            return;
+        }
+
+        if (GetUndeliveredParcelCount(uid) >= component.MaximumUndeliveredParcels)
+            return;
+
+        var candidateList = GetMailRecipientCandidates(uid);
+
+        if (candidateList.Count <= 0)
+        {
+            _sawmill.Error("List of mail candidates was empty!");
+            return;
+        }
+
+        if (!_prototypeManager.TryIndex<MailDeliveryPoolPrototype>(component.MailPool, out var pool))
+        {
+            _sawmill.Error($"Can't index {ToPrettyString(uid)}'s MailPool {component.MailPool}!");
+            return;
+        }
+
+        for (int i = 0;
+             i < component.MinimumDeliveriesPerTeleport + candidateList.Count / component.CandidatesPerDelivery;
+             i++)
+        {
+            var candidate = _random.Pick(candidateList);
+            var possibleParcels = new Dictionary<string, float>(pool.Everyone);
+
+            if (TryMatchJobTitleToPrototype(candidate.Job, out JobPrototype? jobPrototype)
+                && pool.Jobs.TryGetValue(jobPrototype.ID, out Dictionary<string, float>? jobParcels))
+            {
+                possibleParcels = possibleParcels.Union(jobParcels)
+                    .GroupBy(g => g.Key)
+                    .ToDictionary(pair => pair.Key, pair => pair.First().Value);
+            }
+
+            if (TryMatchJobTitleToDepartment(candidate.Job, out string? department)
+                && pool.Departments.TryGetValue(department, out Dictionary<string, float>? departmentParcels))
+            {
+                possibleParcels = possibleParcels.Union(departmentParcels)
+                    .GroupBy(g => g.Key)
+                    .ToDictionary(pair => pair.Key, pair => pair.First().Value);
+            }
+
+            var accumulated = 0f;
+            var randomPoint = _random.NextFloat(possibleParcels.Values.Sum());
+            string? chosenParcel = null;
+            foreach (var (key, weight) in possibleParcels)
+            {
+                accumulated += weight;
+                if (accumulated >= randomPoint)
+                {
+                    chosenParcel = key;
+                    break;
+                }
+            }
+
+            if (chosenParcel == null)
+            {
+                _sawmill.Error($"MailSystem wasn't able to find a deliverable parcel for {candidate.Name}, {candidate.Job}!");
+                return;
+            }
+
+            var mail = EntityManager.SpawnEntity(chosenParcel, Transform(uid).Coordinates);
+            SetupMail(mail, component, candidate);
+
+            _tagSystem.AddTag(mail, "Mail"); // Frontier
+        }
+
+        if (_containerSystem.TryGetContainer(uid, "queued", out var queued))
+            _containerSystem.EmptyContainer(queued);
+
+        _audioSystem.PlayPvs(component.TeleportSound, uid);
+    }
+
+    public void OpenMail(EntityUid uid, MailComponent? component = null, EntityUid? user = null)
+    {
+        if (!Resolve(uid, ref component))
+            return;
+
+        _audioSystem.PlayPvs(component.OpenSound, uid);
+
+        if (user != null)
+            _handsSystem.TryDrop((EntityUid) user);
+
+        if (!_containerSystem.TryGetContainer(uid, "contents", out var contents))
+        {
+            // I silenced this error because it fails non deterministically in tests and doesn't seem to effect anything else.
+            // _sawmill.Error($"Mail {ToPrettyString(uid)} was missing contents container!");
+            return;
+        }
+
+        foreach (var entity in contents.ContainedEntities.ToArray())
+        {
+            _handsSystem.PickupOrDrop(user, entity);
+        }
+
+        _tagSystem.AddTag(uid, "Trash");
+        _tagSystem.AddTag(uid, "Recyclable");
+        component.IsEnabled = false;
+        UpdateMailTrashState(uid, true);
+    }
+
+    private void UpdateAntiTamperVisuals(EntityUid uid, bool isLocked)
+    {
+        _appearanceSystem.SetData(uid, MailVisuals.IsLocked, isLocked);
+    }
+
+    private void UpdateMailTrashState(EntityUid uid, bool isTrash)
+    {
+        _appearanceSystem.SetData(uid, MailVisuals.IsTrash, isTrash);
+    }
+
+    // DeltaV - Helper function that executes for each StationLogisticsStatsComponent
+    // For updating MailMetrics stats
+    private void ExecuteForEachLogisticsStats(EntityUid uid,
+        Action<EntityUid, StationLogisticStatsComponent> action)
+    {
+
+        var query = EntityQueryEnumerator<StationLogisticStatsComponent>();
+        while (query.MoveNext(out var station, out var logisticStats))
+        {
+            if (_stationSystem.GetOwningStation(uid) != station)
+                continue;
+            action(station, logisticStats);
+        }
+    }
+}
+
+public struct MailRecipient(
+    string name,
+    string job,
+    string jobIcon,
+    HashSet<ProtoId<AccessLevelPrototype>> accessTags,
+    bool mayReceivePriorityMail)
+{
+    public string Name = name;
+    public string Job = job;
+    public string JobIcon = jobIcon;
+    public HashSet<ProtoId<AccessLevelPrototype>> AccessTags = accessTags;
+    public bool MayReceivePriorityMail = mayReceivePriorityMail;
+}
diff --git a/Content.Server/Nyanotrasen/Mail/Components/MailComponent.cs b/Content.Server/Nyanotrasen/Mail/Components/MailComponent.cs
deleted file mode 100644
index 61d94bbad31..00000000000
--- a/Content.Server/Nyanotrasen/Mail/Components/MailComponent.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-using System.Threading;
-using Robust.Shared.Audio;
-using Content.Shared.Storage;
-using Content.Shared.Mail;
-
-namespace Content.Server.Mail.Components
-{
-    [RegisterComponent]
-    public sealed partial class MailComponent : SharedMailComponent
-    {
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("recipient")]
-        public string Recipient = "None";
-
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("recipientJob")]
-        public string RecipientJob = "None";
-
-        // Why do we not use LockComponent?
-        // Because this can't be locked again,
-        // and we have special conditions for unlocking,
-        // and we don't want to add a verb.
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("isLocked")]
-        public bool IsLocked = true;
-
-        /// <summary>
-        /// Is this parcel profitable to deliver for the station?
-        /// </summary>
-        /// <remarks>
-        /// The station won't receive any award on delivery if this is false.
-        /// This is useful for broken fragile packages and packages that were
-        /// not delivered in time.
-        /// </remarks>
-        [DataField("isProfitable")]
-        public bool IsProfitable = true;
-
-        /// <summary>
-        /// Is this package considered fragile?
-        /// </summary>
-        /// <remarks>
-        /// This can be set to true in the YAML files for a mail delivery to
-        /// always be Fragile, despite its contents.
-        /// </remarks>
-        [DataField("isFragile")]
-        public bool IsFragile = false;
-
-        /// <summary>
-        /// Is this package considered priority mail?
-        /// </summary>
-        /// <remarks>
-        /// There will be a timer set for its successful delivery. The
-        /// station's bank account will be penalized if it is not delivered on
-        /// time.
-        ///
-        /// This is set to false on successful delivery.
-        ///
-        /// This can be set to true in the YAML files for a mail delivery to
-        /// always be Priority.
-        /// </remarks>
-        [DataField("isPriority")]
-        public bool IsPriority = false;
-
-        /// <summary>
-        /// What will be packaged when the mail is spawned.
-        /// </summary>
-        [DataField("contents")]
-        public List<EntitySpawnEntry> Contents = new();
-
-        /// <summary>
-        /// The amount that cargo will be awarded for delivering this mail.
-        /// </summary>
-        [DataField("bounty")]
-        public int Bounty = 750;
-
-        /// <summary>
-        /// Penalty if the mail is destroyed.
-        /// </summary>
-        [DataField("penalty")]
-        public int Penalty = -250;
-
-        /// <summary>
-        /// The sound that's played when the mail's lock is broken.
-        /// </summary>
-        [DataField("penaltySound")]
-        public SoundSpecifier PenaltySound = new SoundPathSpecifier("/Audio/Machines/Nuke/angry_beep.ogg");
-
-        /// <summary>
-        /// The sound that's played when the mail's opened.
-        /// </summary>
-        [DataField("openSound")]
-        public SoundSpecifier OpenSound = new SoundPathSpecifier("/Audio/Effects/packetrip.ogg");
-
-        /// <summary>
-        /// The sound that's played when the mail's lock has been emagged.
-        /// </summary>
-        [DataField("emagSound")]
-        public SoundSpecifier EmagSound = new SoundCollectionSpecifier("sparks");
-
-        /// <summary>
-        /// Whether this component is enabled.
-        /// Removed when it becomes trash.
-        /// </summary>
-        public bool IsEnabled = true;
-
-        public CancellationTokenSource? priorityCancelToken;
-    }
-}
diff --git a/Content.Server/Nyanotrasen/Mail/Components/MailReceiverComponent.cs b/Content.Server/Nyanotrasen/Mail/Components/MailReceiverComponent.cs
deleted file mode 100644
index 4224de5de45..00000000000
--- a/Content.Server/Nyanotrasen/Mail/Components/MailReceiverComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Content.Server.Mail.Components
-{
-    [RegisterComponent]
-    public sealed partial class MailReceiverComponent : Component
-    {}
-}
diff --git a/Content.Server/Nyanotrasen/Mail/Components/MailTeleporterComponent.cs b/Content.Server/Nyanotrasen/Mail/Components/MailTeleporterComponent.cs
deleted file mode 100644
index bc05d7307d9..00000000000
--- a/Content.Server/Nyanotrasen/Mail/Components/MailTeleporterComponent.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-using Robust.Shared.Audio;
-
-namespace Content.Server.Mail.Components
-{
-    /// <summary>
-    /// This is for the mail teleporter.
-    /// Random mail will be teleported to this every few minutes.
-    /// </summary>
-    [RegisterComponent]
-    public sealed partial class MailTeleporterComponent : Component
-    {
-
-        // Not starting accumulator at 0 so mail carriers have some deliveries to make shortly after roundstart.
-        [DataField("accumulator")]
-        public float Accumulator = 285f;
-
-        [DataField("teleportInterval")]
-        public TimeSpan TeleportInterval = TimeSpan.FromMinutes(5);
-
-        /// <summary>
-        /// The sound that's played when new mail arrives.
-        /// </summary>
-        [DataField("teleportSound")]
-        public SoundSpecifier TeleportSound = new SoundPathSpecifier("/Audio/Effects/teleport_arrival.ogg");
-
-        /// <summary>
-        /// The MailDeliveryPoolPrototype that's used to select what mail this
-        /// teleporter can deliver.
-        /// </summary>
-        [DataField("mailPool")]
-        public string MailPool = "RandomMailDeliveryPool";
-
-        /// <summary>
-        /// How many mail candidates do we need per actual delivery sent when
-        /// the mail goes out? The number of candidates is divided by this number
-        /// to determine how many deliveries will be teleported in.
-        /// It does not determine unique recipients. That is random.
-        /// </summary>
-        [DataField("candidatesPerDelivery")]
-        public int CandidatesPerDelivery = 8;
-
-        [DataField("minimumDeliveriesPerTeleport")]
-        public int MinimumDeliveriesPerTeleport = 1;
-
-        /// <summary>
-        /// Do not teleport any more mail in, if there are at least this many
-        /// undelivered parcels.
-        /// </summary>
-        /// <remarks>
-        /// Currently this works by checking how many MailComponent entities
-        /// are sitting on the teleporter's tile.
-        ///
-        /// It should be noted that if the number of actual deliveries to be
-        /// made based on the number of candidates divided by candidates per
-        /// delivery exceeds this number, the teleporter will spawn more mail
-        /// than this number.
-        ///
-        /// This is just a simple check to see if anyone's been picking up the
-        /// mail lately to prevent entity bloat for the sake of performance.
-        /// </remarks>
-        [DataField("maximumUndeliveredParcels")]
-        public int MaximumUndeliveredParcels = 5;
-
-        /// <summary>
-        /// Any item that breaks or is destroyed in less than this amount of
-        /// damage is one of the types of items considered fragile.
-        /// </summary>
-        [DataField("fragileDamageThreshold")]
-        public int FragileDamageThreshold = 10;
-
-        /// <summary>
-        /// What's the bonus for delivering a fragile package intact?
-        /// </summary>
-        [DataField("fragileBonus")]
-        public int FragileBonus = 100;
-
-        /// <summary>
-        /// What's the malus for failing to deliver a fragile package?
-        /// </summary>
-        [DataField("fragileMalus")]
-        public int FragileMalus = -100;
-
-        /// <summary>
-        /// What's the chance for any one delivery to be marked as priority mail?
-        /// </summary>
-        [DataField("priorityChance")]
-        public float PriorityChance = 0.1f;
-
-        /// <summary>
-        /// How long until a priority delivery is considered as having failed
-        /// if not delivered?
-        /// </summary>
-        [DataField("priorityDuration")]
-        public TimeSpan priorityDuration = TimeSpan.FromMinutes(5);
-
-        /// <summary>
-        /// What's the bonus for delivering a priority package on time?
-        /// </summary>
-        [DataField("priorityBonus")]
-        public int PriorityBonus = 250;
-
-        /// <summary>
-        /// What's the malus for failing to deliver a priority package?
-        /// </summary>
-        [DataField("priorityMalus")]
-        public int PriorityMalus = -250;
-    }
-}
diff --git a/Content.Server/Nyanotrasen/Mail/MailSystem.cs b/Content.Server/Nyanotrasen/Mail/MailSystem.cs
deleted file mode 100644
index 05cd0c88a72..00000000000
--- a/Content.Server/Nyanotrasen/Mail/MailSystem.cs
+++ /dev/null
@@ -1,731 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Threading;
-using Robust.Shared.Audio;
-using Robust.Shared.Containers;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-using Content.Server.Access.Systems;
-using Content.Server.Cargo.Components;
-using Content.Server.Cargo.Systems;
-using Content.Server.Chat.Systems;
-using Content.Server.Chemistry.Containers.EntitySystems;
-using Content.Server.Chemistry.EntitySystems;
-using Content.Server.Damage.Components;
-using Content.Server.Destructible;
-using Content.Server.Destructible.Thresholds;
-using Content.Server.Destructible.Thresholds.Behaviors;
-using Content.Server.Destructible.Thresholds.Triggers;
-using Content.Server.Fluids.Components;
-using Content.Server.Item;
-using Content.Server.Mail.Components;
-using Content.Server.Mind;
-using Content.Server.Nutrition.Components;
-using Content.Server.Nutrition.EntitySystems;
-using Content.Server.Popups;
-using Content.Server.Power.Components;
-using Content.Server.Station.Systems;
-using Content.Server.Spawners.EntitySystems;
-using Content.Shared.Access;
-using Content.Shared.Access.Components;
-using Content.Shared.Access.Systems;
-using Content.Shared.Chat;
-using Content.Shared.Chemistry.EntitySystems;
-using Content.Shared.Damage;
-using Content.Shared.Emag.Components;
-using Content.Shared.Destructible;
-using Content.Shared.Emag.Systems;
-using Content.Shared.Examine;
-using Content.Shared.Fluids.Components;
-using Content.Shared.Hands.EntitySystems;
-using Content.Shared.Interaction;
-using Content.Shared.Interaction.Events;
-using Content.Shared.Item;
-using Content.Shared.Mail;
-using Content.Shared.Maps;
-using Content.Shared.Nutrition.Components;
-using Content.Shared.Nutrition.EntitySystems;
-using Content.Shared.PDA;
-using Content.Shared.Random.Helpers;
-using Content.Shared.Roles;
-using Content.Shared.StatusIcon;
-using Content.Shared.Storage;
-using Content.Shared.Tag;
-using Robust.Shared.Audio.Systems;
-using Timer = Robust.Shared.Timing.Timer;
-
-namespace Content.Server.Mail
-{
-    public sealed class MailSystem : EntitySystem
-    {
-        [Dependency] private readonly PopupSystem _popupSystem = default!;
-        [Dependency] private readonly AccessReaderSystem _accessSystem = default!;
-        [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
-        [Dependency] private readonly IdCardSystem _idCardSystem = default!;
-        [Dependency] private readonly IRobustRandom _random = default!;
-        [Dependency] private readonly TagSystem _tagSystem = default!;
-        [Dependency] private readonly CargoSystem _cargoSystem = default!;
-        [Dependency] private readonly StationSystem _stationSystem = default!;
-        [Dependency] private readonly ChatSystem _chatSystem = default!;
-        [Dependency] private readonly OpenableSystem _openable = default!;
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-        [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
-        [Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
-        [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!;
-        [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
-        [Dependency] private readonly DamageableSystem _damageableSystem = default!;
-        [Dependency] private readonly ItemSystem _itemSystem = default!;
-        [Dependency] private readonly MindSystem _mindSystem = default!;
-        [Dependency] private readonly MetaDataSystem _metaDataSystem = default!;
-
-        private ISawmill _sawmill = default!;
-
-        public override void Initialize()
-        {
-            base.Initialize();
-
-            _sawmill = Logger.GetSawmill("mail");
-
-            SubscribeLocalEvent<PlayerSpawningEvent>(OnSpawnPlayer, after: new[] { typeof(SpawnPointSystem) });
-
-            SubscribeLocalEvent<MailComponent, ComponentRemove>(OnRemove);
-            SubscribeLocalEvent<MailComponent, UseInHandEvent>(OnUseInHand);
-            SubscribeLocalEvent<MailComponent, AfterInteractUsingEvent>(OnAfterInteractUsing);
-            SubscribeLocalEvent<MailComponent, ExaminedEvent>(OnExamined);
-            SubscribeLocalEvent<MailComponent, DestructionEventArgs>(OnDestruction);
-            SubscribeLocalEvent<MailComponent, DamageChangedEvent>(OnDamage);
-            SubscribeLocalEvent<MailComponent, BreakageEventArgs>(OnBreak);
-            SubscribeLocalEvent<MailComponent, GotEmaggedEvent>(OnMailEmagged);
-        }
-
-        public override void Update(float frameTime)
-        {
-            base.Update(frameTime);
-            foreach (var mailTeleporter in EntityQuery<MailTeleporterComponent>())
-            {
-                if (TryComp<ApcPowerReceiverComponent>(mailTeleporter.Owner, out var power) && !power.Powered)
-                    return;
-
-                mailTeleporter.Accumulator += frameTime;
-
-                if (mailTeleporter.Accumulator < mailTeleporter.TeleportInterval.TotalSeconds)
-                    continue;
-
-                mailTeleporter.Accumulator -= (float) mailTeleporter.TeleportInterval.TotalSeconds;
-
-                SpawnMail(mailTeleporter.Owner, mailTeleporter);
-            }
-        }
-
-        /// <summary>
-        /// Dynamically add the MailReceiver component to appropriate entities.
-        /// </summary>
-        private void OnSpawnPlayer(PlayerSpawningEvent args)
-        {
-            if (args.SpawnResult == null ||
-                args.Job == null ||
-                args.Station is not {} station)
-            {
-                return;
-            }
-
-            if (!HasComp<StationMailRouterComponent>(station))
-                return;
-
-            AddComp<MailReceiverComponent>(args.SpawnResult.Value);
-        }
-
-        private void OnRemove(EntityUid uid, MailComponent component, ComponentRemove args)
-        {
-            // Make sure the priority timer doesn't run.
-            if (component.priorityCancelToken != null)
-                component.priorityCancelToken.Cancel();
-        }
-
-        /// <summary>
-        /// Try to open the mail.
-        /// <summary>
-        private void OnUseInHand(EntityUid uid, MailComponent component, UseInHandEvent args)
-        {
-            if (!component.IsEnabled)
-                return;
-            if (component.IsLocked)
-            {
-                _popupSystem.PopupEntity(Loc.GetString("mail-locked"), uid, args.User);
-                return;
-            }
-            OpenMail(uid, component, args.User);
-        }
-
-        /// <summary>
-        /// Handle logic similar between a normal mail unlock and an emag
-        /// frying out the lock.
-        /// </summary>
-        private void UnlockMail(EntityUid uid, MailComponent component)
-        {
-            component.IsLocked = false;
-            UpdateAntiTamperVisuals(uid, false);
-
-            if (component.IsPriority)
-            {
-                // This is a successful delivery. Keep the failure timer from triggering.
-                if (component.priorityCancelToken != null)
-                    component.priorityCancelToken.Cancel();
-
-                // The priority tape is visually considered to be a part of the
-                // anti-tamper lock, so remove that too.
-                _appearanceSystem.SetData(uid, MailVisuals.IsPriority, false);
-
-                // The examination code depends on this being false to not show
-                // the priority tape description anymore.
-                component.IsPriority = false;
-            }
-        }
-
-        /// <summary>
-        /// Check the ID against the mail's lock
-        /// </summary>
-        private void OnAfterInteractUsing(EntityUid uid, MailComponent component, AfterInteractUsingEvent args)
-        {
-            if (!args.CanReach || !component.IsLocked)
-                return;
-
-            if (!TryComp<AccessReaderComponent>(uid, out var access))
-                return;
-
-            IdCardComponent? idCard = null; // We need an ID card.
-
-            if (HasComp<PdaComponent>(args.Used)) /// Can we find it in a PDA if the user is using that?
-            {
-                _idCardSystem.TryGetIdCard(args.Used, out var pdaID);
-                idCard = pdaID;
-            }
-
-            if (HasComp<IdCardComponent>(args.Used)) /// Or are they using an id card directly?
-                idCard = Comp<IdCardComponent>(args.Used);
-
-            if (idCard == null) /// Return if we still haven't found an id card.
-                return;
-
-            if (!HasComp<EmaggedComponent>(uid))
-            {
-                if (idCard.FullName != component.Recipient || idCard.JobTitle != component.RecipientJob)
-                {
-                    _popupSystem.PopupEntity(Loc.GetString("mail-recipient-mismatch"), uid, args.User);
-                    return;
-                }
-
-                if (!_accessSystem.IsAllowed(uid, args.User))
-                {
-                    _popupSystem.PopupEntity(Loc.GetString("mail-invalid-access"), uid, args.User);
-                    return;
-                }
-            }
-
-            UnlockMail(uid, component);
-
-            if (!component.IsProfitable)
-            {
-                _popupSystem.PopupEntity(Loc.GetString("mail-unlocked"), uid, args.User);
-                return;
-            }
-
-            _popupSystem.PopupEntity(Loc.GetString("mail-unlocked-reward", ("bounty", component.Bounty)), uid, args.User);
-
-            component.IsProfitable = false;
-
-            var query = EntityQueryEnumerator<StationBankAccountComponent>();
-            while (query.MoveNext(out var station, out var account))
-            {
-                if (_stationSystem.GetOwningStation(uid) != station)
-                    continue;
-
-                _cargoSystem.UpdateBankAccount(station, account, component.Bounty);
-                return;
-            }
-        }
-
-        private void OnExamined(EntityUid uid, MailComponent component, ExaminedEvent args)
-        {
-            if (!args.IsInDetailsRange)
-            {
-                args.PushMarkup(Loc.GetString("mail-desc-far"));
-                return;
-            }
-
-            args.PushMarkup(Loc.GetString("mail-desc-close", ("name", component.Recipient), ("job", component.RecipientJob)));
-
-            if (component.IsFragile)
-                args.PushMarkup(Loc.GetString("mail-desc-fragile"));
-
-            if (component.IsPriority)
-            {
-                if (component.IsProfitable)
-                    args.PushMarkup(Loc.GetString("mail-desc-priority"));
-                else
-                    args.PushMarkup(Loc.GetString("mail-desc-priority-inactive"));
-            }
-        }
-
-        /// <summary>
-        /// Penalize a station for a failed delivery.
-        /// </summary>
-        /// <remarks>
-        /// This will mark a parcel as no longer being profitable, which will
-        /// prevent multiple failures on different conditions for the same
-        /// delivery.
-        ///
-        /// The standard penalization is breaking the anti-tamper lock,
-        /// but this allows a delivery to fail for other reasons too
-        /// while having a generic function to handle different messages.
-        /// </remarks>
-        public void PenalizeStationFailedDelivery(EntityUid uid, MailComponent component, string localizationString)
-        {
-            if (!component.IsProfitable)
-                return;
-
-            _chatSystem.TrySendInGameICMessage(uid, Loc.GetString(localizationString, ("credits", component.Penalty)), InGameICChatType.Speak, false);
-            _audioSystem.PlayPvs(component.PenaltySound, uid);
-
-            component.IsProfitable = false;
-
-            if (component.IsPriority)
-                _appearanceSystem.SetData(uid, MailVisuals.IsPriorityInactive, true);
-
-            var query = EntityQueryEnumerator<StationBankAccountComponent>();
-            while (query.MoveNext(out var station, out var account))
-            {
-                if (_stationSystem.GetOwningStation(uid) != station)
-                    continue;
-
-                _cargoSystem.UpdateBankAccount(station, account, component.Penalty);
-                return;
-            }
-        }
-
-        private void OnDestruction(EntityUid uid, MailComponent component, DestructionEventArgs args)
-        {
-            if (component.IsLocked)
-                PenalizeStationFailedDelivery(uid, component, "mail-penalty-lock");
-
-            if (component.IsEnabled)
-                OpenMail(uid, component);
-
-            UpdateAntiTamperVisuals(uid, false);
-        }
-
-        private void OnDamage(EntityUid uid, MailComponent component, DamageChangedEvent args)
-        {
-            if (args.DamageDelta == null)
-                return;
-
-            if (!_containerSystem.TryGetContainer(uid, "contents", out var contents))
-                return;
-
-            // Transfer damage to the contents.
-            // This should be a general-purpose feature for all containers in the future.
-            foreach (var entity in contents.ContainedEntities.ToArray())
-            {
-                _damageableSystem.TryChangeDamage(entity, args.DamageDelta);
-            }
-        }
-
-        private void OnBreak(EntityUid uid, MailComponent component, BreakageEventArgs args)
-        {
-            _appearanceSystem.SetData(uid, MailVisuals.IsBroken, true);
-
-            if (component.IsFragile)
-                PenalizeStationFailedDelivery(uid, component, "mail-penalty-fragile");
-        }
-
-        private void OnMailEmagged(EntityUid uid, MailComponent component, ref GotEmaggedEvent args)
-        {
-            if (!component.IsLocked)
-                return;
-
-            UnlockMail(uid, component);
-
-            _popupSystem.PopupEntity(Loc.GetString("mail-unlocked-by-emag"), uid, args.UserUid);
-
-            _audioSystem.PlayPvs(component.EmagSound, uid, AudioParams.Default.WithVolume(4));
-            component.IsProfitable = false;
-            args.Handled = true;
-        }
-
-        /// <summary>
-        /// Returns true if the given entity is considered fragile for delivery.
-        /// </summary>
-        public bool IsEntityFragile(EntityUid uid, int fragileDamageThreshold)
-        {
-            // It takes damage on falling.
-            if (HasComp<DamageOnLandComponent>(uid))
-                return true;
-
-            // It can be spilled easily and has something to spill.
-            if (HasComp<SpillableComponent>(uid)
-                && TryComp<OpenableComponent>(uid, out var openable)
-                && !_openable.IsClosed(uid, null, openable)
-                && _solutionContainerSystem.PercentFull(uid) > 0)
-                return true;
-
-            // It might be made of non-reinforced glass.
-            if (TryComp(uid, out DamageableComponent? damageableComponent)
-                && damageableComponent.DamageModifierSetId == "Glass")
-                return true;
-
-            // Fallback: It breaks or is destroyed in less than a damage
-            // threshold dictated by the teleporter.
-            if (TryComp(uid, out DestructibleComponent? destructibleComp))
-            {
-                foreach (var threshold in destructibleComp.Thresholds)
-                {
-                    if (threshold.Trigger is DamageTrigger trigger
-                        && trigger.Damage < fragileDamageThreshold)
-                    {
-                        foreach (var behavior in threshold.Behaviors)
-                        {
-                            if (behavior is DoActsBehavior doActs)
-                            {
-                                if (doActs.Acts.HasFlag(ThresholdActs.Breakage)
-                                    || doActs.Acts.HasFlag(ThresholdActs.Destruction))
-                                {
-                                    return true;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-            return false;
-        }
-
-        public bool TryMatchJobTitleToDepartment(string jobTitle, [NotNullWhen(true)] out string? jobDepartment)
-        {
-            foreach (var department in _prototypeManager.EnumeratePrototypes<DepartmentPrototype>())
-            {
-                foreach (var role in department.Roles)
-                {
-                    if (_prototypeManager.TryIndex(role, out JobPrototype? _jobPrototype)
-                        && _jobPrototype.LocalizedName == jobTitle)
-                    {
-                        jobDepartment = department.ID;
-                        return true;
-                    }
-                }
-            }
-
-            jobDepartment = null;
-            return false;
-        }
-
-        public bool TryMatchJobTitleToPrototype(string jobTitle, [NotNullWhen(true)] out JobPrototype? jobPrototype)
-        {
-            foreach (var job in _prototypeManager.EnumeratePrototypes<JobPrototype>())
-            {
-                if (job.LocalizedName == jobTitle)
-                {
-                    jobPrototype = job;
-                    return true;
-                }
-            }
-
-            jobPrototype = null;
-            return false;
-        }
-
-        /// <summary>
-        /// Handle all the gritty details particular to a new mail entity.
-        /// </summary>
-        /// <remarks>
-        /// This is separate mostly so the unit tests can get to it.
-        /// </remarks>
-        public void SetupMail(EntityUid uid, MailTeleporterComponent component, MailRecipient recipient)
-        {
-            var mailComp = EnsureComp<MailComponent>(uid);
-
-            var container = _containerSystem.EnsureContainer<Container>(uid, "contents");
-            foreach (var item in EntitySpawnCollection.GetSpawns(mailComp.Contents, _random))
-            {
-                var entity = EntityManager.SpawnEntity(item, Transform(uid).Coordinates);
-                if (!_containerSystem.Insert(entity, container))
-                {
-                    _sawmill.Error($"Can't insert {ToPrettyString(entity)} into new mail delivery {ToPrettyString(uid)}! Deleting it.");
-                    QueueDel(entity);
-                }
-                else if (!mailComp.IsFragile && IsEntityFragile(entity, component.FragileDamageThreshold))
-                {
-                    mailComp.IsFragile = true;
-                }
-            }
-
-            if (_random.Prob(component.PriorityChance))
-                mailComp.IsPriority = true;
-
-            // This needs to override both the random probability and the
-            // entity prototype, so this is fine.
-            if (!recipient.MayReceivePriorityMail)
-                mailComp.IsPriority = false;
-
-            mailComp.RecipientJob = recipient.Job;
-            mailComp.Recipient = recipient.Name;
-
-            if (mailComp.IsFragile)
-            {
-                mailComp.Bounty += component.FragileBonus;
-                mailComp.Penalty += component.FragileMalus;
-                _appearanceSystem.SetData(uid, MailVisuals.IsFragile, true);
-            }
-
-            if (mailComp.IsPriority)
-            {
-                mailComp.Bounty += component.PriorityBonus;
-                mailComp.Penalty += component.PriorityMalus;
-                _appearanceSystem.SetData(uid, MailVisuals.IsPriority, true);
-
-                mailComp.priorityCancelToken = new CancellationTokenSource();
-
-                Timer.Spawn((int) component.priorityDuration.TotalMilliseconds,
-                    () => PenalizeStationFailedDelivery(uid, mailComp, "mail-penalty-expired"),
-                    mailComp.priorityCancelToken.Token);
-            }
-
-            _appearanceSystem.SetData(uid, MailVisuals.JobIcon, recipient.JobIcon);
-
-            _metaDataSystem.SetEntityName(uid, Loc.GetString("mail-item-name-addressed",
-                ("recipient", recipient.Name)));
-
-            var accessReader = EnsureComp<AccessReaderComponent>(uid);
-            accessReader.AccessLists.Add(recipient.AccessTags);
-        }
-
-        /// <summary>
-        /// Return the parcels waiting for delivery.
-        /// </summary>
-        /// <param name="uid">The mail teleporter to check.</param>
-        public List<EntityUid> GetUndeliveredParcels(EntityUid uid)
-        {
-            // An alternative solution would be to keep a list of the unopened
-            // parcels spawned by the teleporter and see if they're not carried
-            // by someone, but this is simple, and simple is good.
-            List<EntityUid> undeliveredParcels = new();
-            foreach (var entityInTile in TurfHelpers.GetEntitiesInTile(Transform(uid).Coordinates, LookupFlags.Dynamic | LookupFlags.Sundries))
-            {
-                if (HasComp<MailComponent>(entityInTile))
-                    undeliveredParcels.Add(entityInTile);
-            }
-            return undeliveredParcels;
-        }
-
-        /// <summary>
-        /// Return how many parcels are waiting for delivery.
-        /// </summary>
-        /// <param name="uid">The mail teleporter to check.</param>
-        public uint GetUndeliveredParcelCount(EntityUid uid)
-        {
-            return (uint) GetUndeliveredParcels(uid).Count();
-        }
-
-        /// <summary>
-        /// Try to match a mail receiver to a mail teleporter.
-        /// </summary>
-        public bool TryGetMailTeleporterForReceiver(MailReceiverComponent receiver, [NotNullWhen(true)] out MailTeleporterComponent? teleporterComponent)
-        {
-            foreach (var mailTeleporter in EntityQuery<MailTeleporterComponent>())
-            {
-                if (_stationSystem.GetOwningStation(receiver.Owner) == _stationSystem.GetOwningStation(mailTeleporter.Owner))
-                {
-                    teleporterComponent = mailTeleporter;
-                    return true;
-                }
-            }
-
-            teleporterComponent = null;
-            return false;
-        }
-
-        /// <summary>
-        /// Try to construct a recipient struct for a mail parcel based on a receiver.
-        /// </summary>
-        public bool TryGetMailRecipientForReceiver(MailReceiverComponent receiver, [NotNullWhen(true)] out MailRecipient? recipient)
-        {
-            // Because of the way this works, people are not considered
-            // candidates for mail if there is no valid PDA or ID in their slot
-            // or active hand. A better future solution might be checking the
-            // station records, possibly cross-referenced with the medical crew
-            // scanner to look for living recipients. TODO
-
-            if (_idCardSystem.TryFindIdCard(receiver.Owner, out var idCard)
-                && TryComp<AccessComponent>(idCard.Owner, out var access)
-                && idCard.Comp.FullName != null
-                && idCard.Comp.JobTitle != null)
-            {
-                var accessTags = access.Tags;
-
-                var mayReceivePriorityMail = !(_mindSystem.GetMind(receiver.Owner) == null);
-
-                recipient = new MailRecipient(idCard.Comp.FullName,
-                    idCard.Comp.JobTitle,
-                    idCard.Comp.JobIcon,
-                    accessTags,
-                    mayReceivePriorityMail);
-
-                return true;
-            }
-
-            recipient = null;
-            return false;
-        }
-
-        /// <summary>
-        /// Get the list of valid mail recipients for a mail teleporter.
-        /// </summary>
-        public List<MailRecipient> GetMailRecipientCandidates(EntityUid uid)
-        {
-            List<MailRecipient> candidateList = new();
-
-            foreach (var receiver in EntityQuery<MailReceiverComponent>())
-            {
-                if (_stationSystem.GetOwningStation(receiver.Owner) != _stationSystem.GetOwningStation(uid))
-                    continue;
-
-                if (TryGetMailRecipientForReceiver(receiver, out MailRecipient? recipient))
-                    candidateList.Add(recipient.Value);
-            }
-
-            return candidateList;
-        }
-
-        /// <summary>
-        /// Handle the spawning of all the mail for a mail teleporter.
-        /// </summary>
-        public void SpawnMail(EntityUid uid, MailTeleporterComponent? component = null)
-        {
-            if (!Resolve(uid, ref component))
-            {
-                _sawmill.Error($"Tried to SpawnMail on {ToPrettyString(uid)} without a valid MailTeleporterComponent!");
-                return;
-            }
-
-            if (GetUndeliveredParcelCount(uid) >= component.MaximumUndeliveredParcels)
-                return;
-
-            var candidateList = GetMailRecipientCandidates(uid);
-
-            if (candidateList.Count <= 0)
-            {
-                _sawmill.Error("List of mail candidates was empty!");
-                return;
-            }
-
-            if (!_prototypeManager.TryIndex<MailDeliveryPoolPrototype>(component.MailPool, out var pool))
-            {
-                _sawmill.Error($"Can't index {ToPrettyString(uid)}'s MailPool {component.MailPool}!");
-                return;
-            }
-
-            for (int i = 0;
-                i < component.MinimumDeliveriesPerTeleport + candidateList.Count / component.CandidatesPerDelivery;
-                i++)
-            {
-                var candidate = _random.Pick(candidateList);
-                var possibleParcels = new Dictionary<string, float>(pool.Everyone);
-
-                if (TryMatchJobTitleToPrototype(candidate.Job, out JobPrototype? jobPrototype)
-                    && pool.Jobs.TryGetValue(jobPrototype.ID, out Dictionary<string, float>? jobParcels))
-                {
-                    possibleParcels = possibleParcels.Union(jobParcels)
-                        .GroupBy(g => g.Key)
-                        .ToDictionary(pair => pair.Key, pair => pair.First().Value);
-                }
-
-                if (TryMatchJobTitleToDepartment(candidate.Job, out string? department)
-                    && pool.Departments.TryGetValue(department, out Dictionary<string, float>? departmentParcels))
-                {
-                    possibleParcels = possibleParcels.Union(departmentParcels)
-                        .GroupBy(g => g.Key)
-                        .ToDictionary(pair => pair.Key, pair => pair.First().Value);
-                }
-
-                var accumulated = 0f;
-                var randomPoint = _random.NextFloat(possibleParcels.Values.Sum());
-                string? chosenParcel = null;
-                foreach (var (key, weight) in possibleParcels)
-                {
-                    accumulated += weight;
-                    if (accumulated >= randomPoint)
-                    {
-                        chosenParcel = key;
-                        break;
-                    }
-                }
-
-                if (chosenParcel == null)
-                {
-                    _sawmill.Error($"MailSystem wasn't able to find a deliverable parcel for {candidate.Name}, {candidate.Job}!");
-                    return;
-                }
-
-                var mail = EntityManager.SpawnEntity(chosenParcel, Transform(uid).Coordinates);
-                SetupMail(mail, component, candidate);
-            }
-
-            if (_containerSystem.TryGetContainer(uid, "queued", out var queued))
-                _containerSystem.EmptyContainer(queued);
-
-            _audioSystem.PlayPvs(component.TeleportSound, uid);
-        }
-
-        public void OpenMail(EntityUid uid, MailComponent? component = null, EntityUid? user = null)
-        {
-            if (!Resolve(uid, ref component))
-                return;
-
-            _audioSystem.PlayPvs(component.OpenSound, uid);
-
-            if (user != null)
-                _handsSystem.TryDrop((EntityUid) user);
-
-            if (!_containerSystem.TryGetContainer(uid, "contents", out var contents))
-            {
-                // I silenced this error because it fails non deterministically in tests and doesn't seem to effect anything else.
-                // _sawmill.Error($"Mail {ToPrettyString(uid)} was missing contents container!");
-                return;
-            }
-
-            foreach (var entity in contents.ContainedEntities.ToArray())
-            {
-                _handsSystem.PickupOrDrop(user, entity);
-            }
-
-            _tagSystem.AddTag(uid, "Trash");
-            _tagSystem.AddTag(uid, "Recyclable");
-            component.IsEnabled = false;
-            UpdateMailTrashState(uid, true);
-        }
-
-        private void UpdateAntiTamperVisuals(EntityUid uid, bool isLocked)
-        {
-            _appearanceSystem.SetData(uid, MailVisuals.IsLocked, isLocked);
-        }
-
-        private void UpdateMailTrashState(EntityUid uid, bool isTrash)
-        {
-            _appearanceSystem.SetData(uid, MailVisuals.IsTrash, isTrash);
-        }
-    }
-
-    public struct MailRecipient(
-        string name,
-        string job,
-        string jobIcon,
-        HashSet<ProtoId<AccessLevelPrototype>> accessTags,
-        bool mayReceivePriorityMail)
-    {
-        public string Name = name;
-        public string Job = job;
-        public string JobIcon = jobIcon;
-        public HashSet<ProtoId<AccessLevelPrototype>> AccessTags = accessTags;
-        public bool MayReceivePriorityMail = mayReceivePriorityMail;
-    }
-}
diff --git a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
index ae742cf1f9e..c855bacfc7d 100644
--- a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
+++ b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
@@ -425,7 +425,7 @@ public override void Update(float frameTime)
                 if (xform.MapUid != arrivalsXform.MapUid)
                 {
                     if (arrivals.IsValid())
-                        _shuttles.FTLToDock(uid, shuttle, arrivals);
+                        _shuttles.FTLToDock(uid, shuttle, arrivals, _cfgManager.GetCVar(CCVars.ArrivalsStartupTime), _cfgManager.GetCVar(CCVars.ArrivalsHyperspaceTime), "DockArrivals");
 
                     comp.NextArrivalsTime = _timing.CurTime + TimeSpan.FromSeconds(tripTime);
                 }
@@ -435,7 +435,7 @@ public override void Update(float frameTime)
                     var targetGrid = _station.GetLargestGrid(data);
 
                     if (targetGrid != null)
-                        _shuttles.FTLToDock(uid, shuttle, targetGrid.Value);
+                        _shuttles.FTLToDock(uid, shuttle, targetGrid.Value, _cfgManager.GetCVar(CCVars.ArrivalsStartupTime), _cfgManager.GetCVar(CCVars.ArrivalsHyperspaceTime), "DockArrivals");
 
                     // The ArrivalsCooldown includes the trip there, so we only need to add the time taken for
                     // the trip back.
diff --git a/Content.Server/Standing/LayingDownSystem.cs b/Content.Server/Standing/LayingDownSystem.cs
index e5054bdd706..fcad649c9ab 100644
--- a/Content.Server/Standing/LayingDownSystem.cs
+++ b/Content.Server/Standing/LayingDownSystem.cs
@@ -1,6 +1,11 @@
 using Content.Shared.Standing;
 using Content.Shared.CCVar;
+using Content.Shared.Input;
+using Content.Shared.Movement.Systems;
+using Content.Shared.Popups;
 using Robust.Shared.Configuration;
+using Robust.Shared.Input.Binding;
+using Robust.Shared.Player;
 
 namespace Content.Server.Standing;
 
diff --git a/Content.Server/Traits/Assorted/LayingDownModifierSystem.cs b/Content.Server/Traits/Assorted/LayingDownModifierSystem.cs
index e4a63d6108b..8c47d65233f 100644
--- a/Content.Server/Traits/Assorted/LayingDownModifierSystem.cs
+++ b/Content.Server/Traits/Assorted/LayingDownModifierSystem.cs
@@ -17,6 +17,6 @@ private void OnStartup(EntityUid uid, LayingDownModifierComponent component, Com
             return;
 
         layingDown.StandingUpTime *= component.LayingDownCooldownMultiplier;
-        layingDown.SpeedModify *= component.DownedSpeedMultiplierMultiplier;
+        layingDown.LyingSpeedModifier *= component.DownedSpeedMultiplierMultiplier;
     }
 }
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index d8c7eb7f8fb..5827882fc14 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -1513,6 +1513,18 @@ public static readonly CVarDef<int>
         public static readonly CVarDef<float> ArrivalsCooldown =
             CVarDef.Create("shuttle.arrivals_cooldown", 50f, CVar.SERVERONLY);
 
+        /// <summary>
+        /// Time it takes the shuttle to spin up it's hyper drive and jump
+        /// </summary>
+        public static readonly CVarDef<float> ArrivalsStartupTime=
+            CVarDef.Create("shuttle.arrivals_startup_time", 5.5f, CVar.SERVERONLY);
+
+        /// <summary>
+        /// Time spent in hyperspace
+        /// </summary>
+        public static readonly CVarDef<float> ArrivalsHyperspaceTime =
+            CVarDef.Create("shuttle.arrivals_hyperspace_time", 20f, CVar.SERVERONLY);
+
         /// <summary>
         /// Are players allowed to return on the arrivals shuttle.
         /// </summary>
@@ -2475,11 +2487,10 @@ public static readonly CVarDef<float>
             CVarDef.Create("rest.hold_look_up", false, CVar.CLIENT | CVar.ARCHIVE);
 
         /// <summary>
-        ///     When true, entities that fall to the ground will be able to crawl under tables and
-        ///     plastic flaps, allowing them to take cover from gunshots.
+        ///     When true, players can choose to crawl under tables while laying down, using the designated keybind.
         /// </summary>
         public static readonly CVarDef<bool> CrawlUnderTables =
-            CVarDef.Create("rest.crawlundertables", false, CVar.REPLICATED);
+            CVarDef.Create("rest.crawlundertables", true, CVar.SERVER | CVar.ARCHIVE);
 
         #endregion
 
diff --git a/Content.Shared/DeltaV/CartridgeLoader/Cartridges/MailMetricUiState.cs b/Content.Shared/DeltaV/CartridgeLoader/Cartridges/MailMetricUiState.cs
new file mode 100644
index 00000000000..69506f5d0c2
--- /dev/null
+++ b/Content.Shared/DeltaV/CartridgeLoader/Cartridges/MailMetricUiState.cs
@@ -0,0 +1,50 @@
+using Content.Shared.Security;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.CartridgeLoader.Cartridges;
+
+[Serializable, NetSerializable]
+public sealed class MailMetricUiState : BoundUserInterfaceState
+{
+    public readonly MailStats Metrics;
+    public int UnopenedMailCount { get; }
+    public int TotalMail { get; }
+    public double SuccessRate { get; }
+
+    public MailMetricUiState(MailStats metrics, int unopenedMailCount)
+    {
+        Metrics = metrics;
+        UnopenedMailCount = unopenedMailCount;
+        TotalMail = metrics.TotalMail(unopenedMailCount);
+        SuccessRate = metrics.SuccessRate(unopenedMailCount);
+    }
+}
+
+[DataDefinition]
+[Serializable, NetSerializable]
+public partial record struct MailStats
+{
+    public int Earnings { get; init; }
+    public int DamagedLosses { get; init; }
+    public int ExpiredLosses { get; init; }
+    public int TamperedLosses { get; init; }
+    public int OpenedCount { get; init; }
+    public int DamagedCount { get; init; }
+    public int ExpiredCount { get; init; }
+    public int TamperedCount { get; init; }
+
+    public readonly int TotalMail(int unopenedCount)
+    {
+        return OpenedCount + unopenedCount;
+    }
+
+    public readonly int TotalIncome => Earnings + DamagedLosses + ExpiredLosses + TamperedLosses;
+
+    public readonly double SuccessRate(int unopenedCount)
+    {
+        var totalMail = TotalMail(unopenedCount);
+        return (totalMail > 0)
+            ? Math.Round((double)OpenedCount / totalMail * 100, 2)
+            : 0;
+    }
+}
\ No newline at end of file
diff --git a/Content.Shared/Input/ContentKeyFunctions.cs b/Content.Shared/Input/ContentKeyFunctions.cs
index 3008a4be6b8..79bc474189c 100644
--- a/Content.Shared/Input/ContentKeyFunctions.cs
+++ b/Content.Shared/Input/ContentKeyFunctions.cs
@@ -62,6 +62,7 @@ public static class ContentKeyFunctions
         public static readonly BoundKeyFunction ResetZoom = "ResetZoom";
         public static readonly BoundKeyFunction OfferItem = "OfferItem";
         public static readonly BoundKeyFunction ToggleStanding = "ToggleStanding";
+        public static readonly BoundKeyFunction ToggleCrawlingUnder = "ToggleCrawlingUnder";
         public static readonly BoundKeyFunction LookUp = "LookUp";
 
         public static readonly BoundKeyFunction ArcadeUp = "ArcadeUp";
diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
index 19cb35a1c00..58dced7d072 100644
--- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs
+++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
@@ -643,7 +643,7 @@ IDependencyCollection collection
             {
                 name = GetName(Species, gender);
             }
-            
+
             var customspeciename =
                 !speciesPrototype.CustomName
                 || string.IsNullOrEmpty(Customspeciename)
diff --git a/Content.Shared/Standing/LayingDownComponent.cs b/Content.Shared/Standing/LayingDownComponent.cs
index b3c07220e1a..ec9351e22ca 100644
--- a/Content.Shared/Standing/LayingDownComponent.cs
+++ b/Content.Shared/Standing/LayingDownComponent.cs
@@ -1,6 +1,5 @@
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
-using Content.Shared.DrawDepth;
 
 namespace Content.Shared.Standing;
 
@@ -8,19 +7,24 @@ namespace Content.Shared.Standing;
 public sealed partial class LayingDownComponent : Component
 {
     [DataField, AutoNetworkedField]
-    public float StandingUpTime { get; set; } = 1f;
+    public TimeSpan StandingUpTime = TimeSpan.FromSeconds(1);
 
     [DataField, AutoNetworkedField]
-    public float SpeedModify { get; set; } = 0.4f;
+    public float LyingSpeedModifier = 0.35f,
+                 CrawlingUnderSpeedModifier = 0.5f;
 
     [DataField, AutoNetworkedField]
     public bool AutoGetUp;
 
+    /// <summary>
+    ///     If true, the entity is choosing to crawl under furniture. This is purely visual and has no effect on physics.
+    /// </summary>
     [DataField, AutoNetworkedField]
-    public int NormalDrawDepth = (int) DrawDepth.DrawDepth.Mobs;
+    public bool IsCrawlingUnder = false;
 
     [DataField, AutoNetworkedField]
-    public int CrawlingDrawDepth = (int) DrawDepth.DrawDepth.SmallMobs;
+    public int NormalDrawDepth = (int) DrawDepth.DrawDepth.Mobs,
+               CrawlingUnderDrawDepth = (int) DrawDepth.DrawDepth.SmallMobs;
 }
 
 [Serializable, NetSerializable]
@@ -31,15 +35,3 @@ public sealed class CheckAutoGetUpEvent(NetEntity user) : CancellableEntityEvent
 {
     public NetEntity User = user;
 }
-
-[Serializable, NetSerializable]
-public sealed class DrawDownedEvent(NetEntity uid) : EntityEventArgs
-{
-    public NetEntity Uid = uid;
-}
-
-[Serializable, NetSerializable]
-public sealed class DrawStoodEvent(NetEntity uid) : EntityEventArgs
-{
-    public NetEntity Uid = uid;
-}
\ No newline at end of file
diff --git a/Content.Shared/Standing/SharedLayingDownSystem.cs b/Content.Shared/Standing/SharedLayingDownSystem.cs
index bed4ec53bf6..914b04cdef6 100644
--- a/Content.Shared/Standing/SharedLayingDownSystem.cs
+++ b/Content.Shared/Standing/SharedLayingDownSystem.cs
@@ -1,10 +1,13 @@
+using Content.Shared.ActionBlocker;
+using Content.Shared.CCVar;
 using Content.Shared.DoAfter;
 using Content.Shared.Gravity;
 using Content.Shared.Input;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Movement.Systems;
-using Content.Shared.Standing;
+using Content.Shared.Popups;
 using Content.Shared.Stunnable;
+using Robust.Shared.Configuration;
 using Robust.Shared.Input.Binding;
 using Robust.Shared.Player;
 using Robust.Shared.Serialization;
@@ -17,11 +20,16 @@ public abstract class SharedLayingDownSystem : EntitySystem
     [Dependency] private readonly StandingStateSystem _standing = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
     [Dependency] private readonly SharedGravitySystem _gravity = default!;
+    [Dependency] private readonly IConfigurationManager _config = default!;
+    [Dependency] private readonly SharedPopupSystem _popups = default!;
+    [Dependency] private readonly MovementSpeedModifierSystem _speed = default!;
+    [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
 
     public override void Initialize()
     {
         CommandBinds.Builder
             .Bind(ContentKeyFunctions.ToggleStanding, InputCmdHandler.FromDelegate(ToggleStanding))
+            .Bind(ContentKeyFunctions.ToggleCrawlingUnder, InputCmdHandler.FromDelegate(HandleCrawlUnderRequest, handle: false))
             .Register<SharedLayingDownSystem>();
 
         SubscribeNetworkEvent<ChangeLayingDownEvent>(OnChangeState);
@@ -49,17 +57,37 @@ private void ToggleStanding(ICommonSession? session)
         RaiseNetworkEvent(new ChangeLayingDownEvent());
     }
 
+    private void HandleCrawlUnderRequest(ICommonSession? session)
+    {
+        if (session == null
+            || session.AttachedEntity is not {} uid
+            || !TryComp<StandingStateComponent>(uid, out var standingState)
+            || !TryComp<LayingDownComponent>(uid, out var layingDown)
+            || !_actionBlocker.CanInteract(uid, null))
+            return;
+
+        var newState = !layingDown.IsCrawlingUnder;
+        if (standingState.CurrentState is StandingState.Standing)
+            newState = false; // If the entity is already standing, this function only serves a fallback method to fix its draw depth
+
+        // Do not allow to begin crawling under if it's disabled in config. We still, however, allow to stop it, as a failsafe.
+        if (newState && !_config.GetCVar(CCVars.CrawlUnderTables))
+        {
+            _popups.PopupEntity(Loc.GetString("crawling-under-tables-disabled-popup"), uid, session);
+            return;
+        }
+
+        layingDown.IsCrawlingUnder = newState;
+        _speed.RefreshMovementSpeedModifiers(uid);
+        Dirty(uid, layingDown);
+    }
+
     private void OnChangeState(ChangeLayingDownEvent ev, EntitySessionEventArgs args)
     {
         if (!args.SenderSession.AttachedEntity.HasValue)
             return;
 
         var uid = args.SenderSession.AttachedEntity.Value;
-
-        // TODO: Wizard
-        //if (HasComp<FrozenComponent>(uid))
-        //   return;
-
         if (!TryComp(uid, out StandingStateComponent? standing)
             || !TryComp(uid, out LayingDownComponent? layingDown))
             return;
@@ -89,10 +117,11 @@ private void OnStandingUpDoAfter(EntityUid uid, StandingStateComponent component
 
     private void OnRefreshMovementSpeed(EntityUid uid, LayingDownComponent component, RefreshMovementSpeedModifiersEvent args)
     {
-        if (_standing.IsDown(uid))
-            args.ModifySpeed(component.SpeedModify, component.SpeedModify);
-        else
-            args.ModifySpeed(1f, 1f);
+        if (!_standing.IsDown(uid))
+            return;
+
+        var modifier = component.LyingSpeedModifier * (component.IsCrawlingUnder ? component.CrawlingUnderSpeedModifier : 1);
+        args.ModifySpeed(modifier, modifier);
     }
 
     private void OnParentChanged(EntityUid uid, LayingDownComponent component, EntParentChangedMessage args)
@@ -125,6 +154,7 @@ public bool TryStandUp(EntityUid uid, LayingDownComponent? layingDown = null, St
             return false;
 
         standingState.CurrentState = StandingState.GettingUp;
+        layingDown.IsCrawlingUnder = false;
         return true;
     }
 
diff --git a/Content.Shared/Standing/StandingStateSystem.cs b/Content.Shared/Standing/StandingStateSystem.cs
index 37f1095fd46..aed6ce372f8 100644
--- a/Content.Shared/Standing/StandingStateSystem.cs
+++ b/Content.Shared/Standing/StandingStateSystem.cs
@@ -1,15 +1,12 @@
 using Content.Shared.Buckle;
 using Content.Shared.Buckle.Components;
-using Content.Shared.CCVar;
 using Content.Shared.Hands.Components;
 using Content.Shared.Movement.Systems;
 using Content.Shared.Physics;
 using Content.Shared.Rotation;
 using Robust.Shared.Audio.Systems;
-using Robust.Shared.Configuration;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Systems;
-using Robust.Shared.Serialization;
 
 namespace Content.Shared.Standing;
 
@@ -20,7 +17,6 @@ public sealed class StandingStateSystem : EntitySystem
     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
     [Dependency] private readonly MovementSpeedModifierSystem _movement = default!;
     [Dependency] private readonly SharedBuckleSystem _buckle = default!;
-    [Dependency] private readonly IConfigurationManager _config = default!;
 
     // If StandingCollisionLayer value is ever changed to more than one layer, the logic needs to be edited.
     private const int StandingCollisionLayer = (int) CollisionGroup.MidImpassable;
@@ -69,10 +65,6 @@ public bool Down(EntityUid uid, bool playSound = true, bool dropHeldItems = true
         Dirty(standingState);
         RaiseLocalEvent(uid, new DownedEvent(), false);
 
-        // Raising this event will lower the entity's draw depth to the same as a small mob.
-        if (_config.GetCVar(CCVars.CrawlUnderTables) && setDrawDepth)
-            RaiseNetworkEvent(new DrawDownedEvent(GetNetEntity(uid)));
-
         // Seemed like the best place to put it
         _appearance.SetData(uid, RotationVisuals.RotationState, RotationState.Horizontal, appearance);
 
@@ -129,10 +121,6 @@ public bool Stand(EntityUid uid,
         Dirty(uid, standingState);
         RaiseLocalEvent(uid, new StoodEvent(), false);
 
-        // Raising this event will increase the entity's draw depth to a normal mob's.
-        if (_config.GetCVar(CCVars.CrawlUnderTables))
-            RaiseNetworkEvent(new DrawStoodEvent(GetNetEntity(uid)));
-
         _appearance.SetData(uid, RotationVisuals.RotationState, RotationState.Vertical, appearance);
 
         if (TryComp(uid, out FixturesComponent? fixtureComponent))
@@ -170,4 +158,4 @@ public sealed class StoodEvent : EntityEventArgs { }
 /// <summary>
 ///     Raised when an entity is not standing
 /// </summary>
-public sealed class DownedEvent : EntityEventArgs { }
+public sealed class DownedEvent  : EntityEventArgs { }
diff --git a/Content.Shared/Traits/Assorted/Components/CyberEyesComponent.cs b/Content.Shared/Traits/Assorted/Components/CyberEyesComponent.cs
new file mode 100644
index 00000000000..7009077e9cc
--- /dev/null
+++ b/Content.Shared/Traits/Assorted/Components/CyberEyesComponent.cs
@@ -0,0 +1,11 @@
+namespace Content.Shared.Traits.Assorted.Components;
+
+[RegisterComponent]
+public sealed partial class CyberEyesComponent : Component
+{
+    /// <summary>
+    ///     The text that will appear when someone with the CyberEyes component is examined at close range
+    /// </summary>
+    [DataField]
+    public string CyberEyesExaminationText = "examine-cybereyes-message";
+}
diff --git a/Content.Shared/Traits/Assorted/Systems/CyberEyesSystem.cs b/Content.Shared/Traits/Assorted/Systems/CyberEyesSystem.cs
new file mode 100644
index 00000000000..2dde4379720
--- /dev/null
+++ b/Content.Shared/Traits/Assorted/Systems/CyberEyesSystem.cs
@@ -0,0 +1,21 @@
+using Content.Shared.Examine;
+using Content.Shared.Traits.Assorted.Components;
+
+namespace Content.Shared.Traits.Assorted.Systems;
+
+public sealed class CyberEyesSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<CyberEyesComponent, ExaminedEvent>(OnExamined);
+    }
+
+    private void OnExamined(EntityUid uid, CyberEyesComponent component, ExaminedEvent args)
+    {
+        if (!args.IsInDetailsRange)
+            return;
+
+        args.PushMarkup($"[color=white]{Loc.GetString(component.CyberEyesExaminationText, ("entity", uid))}[/color]");
+    }
+}
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 55a95126d79..9b921643c77 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
@@ -4458,7 +4458,7 @@ Entries:
     - type: Add
       message: >-
         Cablecuffs and Zipties are now easier to escape out of if you're
-        smaller. 
+        smaller.
   id: 6158
   time: '2024-07-13T08:05:52.0000000+00:00'
 - author: FoxxoTrystan
@@ -4526,7 +4526,7 @@ Entries:
     - type: Fix
       message: >-
         Harpies can no longer buy Loadout items that are impossible for them to
-        wear due to having digitigrade legs. 
+        wear due to having digitigrade legs.
   id: 6168
   time: '2024-07-18T02:34:52.0000000+00:00'
 - author: Mnemotechnician
@@ -4585,7 +4585,7 @@ Entries:
     - type: Add
       message: >-
         Camera Shake is now affected by character mass. Small characters
-        experience more camera shake. Large characters experience less. 
+        experience more camera shake. Large characters experience less.
   id: 6176
   time: '2024-07-21T06:50:25.0000000+00:00'
 - author: VMSolidus
@@ -4593,7 +4593,7 @@ Entries:
     - type: Add
       message: >-
         The Head Of Personnel can now hire people onto basic roles for each
-        department by vending PDAs. 
+        department by vending PDAs.
   id: 6177
   time: '2024-07-22T19:12:01.0000000+00:00'
 - author: VMSolidus
@@ -4700,7 +4700,7 @@ Entries:
     - type: Fix
       message: >-
         Fixed Tools, Drink Containers, Lockers, and all base items having
-        inconsistent sound settings. 
+        inconsistent sound settings.
   id: 6191
   time: '2024-07-31T22:47:01.0000000+00:00'
 - author: VMSolidus
@@ -4808,7 +4808,7 @@ Entries:
     - type: Add
       message: >-
         Added a 1-point combat knife to Loadouts for Felinid/Harpy security
-        jobs. 
+        jobs.
     - type: Tweak
       message: Made the security belt and security webbing able to hold combat knives.
     - type: Tweak
@@ -4858,7 +4858,7 @@ Entries:
         Due to budget cuts, Nanotrasen has ceased stocking Clothesmate vendors
         with more clothing than the average cargo tech can afford. Civilians are
         advised to bring their own clothes to the station if they wish to wear
-        anything other than grey. 
+        anything other than grey.
   id: 6208
   time: '2024-08-04T00:23:53.0000000+00:00'
 - author: VMSolidus
@@ -4866,7 +4866,7 @@ Entries:
     - type: Add
       message: >-
         SweatMAX, "hot foods", Mars Mart, and Nippon-tan vendors have all been
-        added to vendor spawners. 
+        added to vendor spawners.
   id: 6209
   time: '2024-08-04T06:26:34.0000000+00:00'
 - author: Skubman
@@ -4925,7 +4925,7 @@ Entries:
         The Carrying system has been reworked as a means of better supporting
         having extremely large species and characters. 10kg Harpies should no
         longer be oppressed by 2000kg Lamia with infinitely short carry
-        attempts. 
+        attempts.
   id: 6216
   time: '2024-08-05T17:11:37.0000000+00:00'
 - author: Rane
@@ -4953,11 +4953,11 @@ Entries:
     - type: Add
       message: >-
         CPR has been added to the game. People with CPR training can now perform
-        CPR on anyone who is in either crit or dead states. 
+        CPR on anyone who is in either crit or dead states.
     - type: Add
       message: >-
         CPR Training has been added to the game as a new positive trait. All
-        medical staff start with this trait for free. 
+        medical staff start with this trait for free.
   id: 6220
   time: '2024-08-06T05:28:54.0000000+00:00'
 - author: Skubman
@@ -5144,7 +5144,7 @@ Entries:
     - type: Fix
       message: >-
         Sluggish and Snail-Paced will now properly apply their movement
-        penalties upon joining. 
+        penalties upon joining.
   id: 6244
   time: '2024-08-09T17:28:01.0000000+00:00'
 - author: ODJ
@@ -5160,7 +5160,7 @@ Entries:
     - type: Tweak
       message: >-
         Renamed "Psionic Mantis" to "Mantis", as it was originally going to be
-        called. 
+        called.
   id: 6246
   time: '2024-08-10T12:03:12.0000000+00:00'
 - author: Skubman
@@ -5448,7 +5448,7 @@ Entries:
     - type: Tweak
       message: >-
         Chaplain, Mantis, & Mystagogue all receive the Latent Psychic trait for
-        free, automatically. 
+        free, automatically.
   id: 6273
   time: '2024-08-20T18:42:44.0000000+00:00'
 - author: VMSolidus
@@ -5466,7 +5466,7 @@ Entries:
         Actions no longer need to hardcode in target blacklists, and can now
         blacklist entities in YML. This is notably useful for Psionic powers,
         which all share a common feature that they can't target people with
-        Psionic Insulation (Or have been Mindbroken). 
+        Psionic Insulation (Or have been Mindbroken).
   id: 6275
   time: '2024-08-21T09:08:40.0000000+00:00'
 - author: VMSolidus
@@ -5535,7 +5535,7 @@ Entries:
       message: >-
         Gaining a new Psionic Power can now display messages to alert the
         player, both as a short popup, and optionally a lengthier message sent
-        to the user's Chat window. 
+        to the user's Chat window.
   id: 6284
   time: '2024-08-22T17:12:26.0000000+00:00'
 - author: DEATHB4DEFEAT
@@ -5652,7 +5652,7 @@ Entries:
       message: >-
         Natural Telepath has returned from Psionic-Refactor V1, now using new
         functionality from the trait system that allows traits to buy psionic
-        powers directly. 
+        powers directly.
     - type: Add
       message: >-
         Latent Psychics who have neither bought Natural Telepath, nor acquired
@@ -5730,7 +5730,7 @@ Entries:
       message: >-
         InnatePsionicPowers now operates on MapInitEvent instead of
         ComponentStartup, meaning that it can now be safely used on entities
-        that are mapped in instead of spawned. 
+        that are mapped in instead of spawned.
     - type: Add
       message: >-
         Oracle and Sophia are now recognized as Divine, and as such are
@@ -5783,7 +5783,7 @@ Entries:
         Psionic(But cannot gain powers randomly). This is due to their status as
         "Magical And/Or Extraplanar Creatures", which makes them valid targets
         for anti-psychic abilities such as the Psionic Mantis' Anti-Psychic
-        Knife. 
+        Knife.
     - type: Add
       message: Some Reagent Slimes can now contain Lotophagoi Oil.
   id: 6310
@@ -5800,7 +5800,7 @@ Entries:
       message: >-
         "Clone Soup" scales directly with the mass of the entity you're
         attempting to clone. Fail to clone a Lamia, and you'll be greeted with
-        an Olympic swimming pool worth of blood when the machine opens. 
+        an Olympic swimming pool worth of blood when the machine opens.
     - type: Add
       message: >-
         Cloning will fail if at any point during the procedure, the machine is
@@ -5809,7 +5809,7 @@ Entries:
       message: >-
         Clones come out of the machine with severe Cellular damage. Consider
         using Doxarubixadone in a Cryo tube as an affordable means of
-        "Finishing" clones. 
+        "Finishing" clones.
     - type: Tweak
       message: >-
         Cloning Time is now increased proportionally if an entity being cloned
@@ -5867,7 +5867,7 @@ Entries:
     - type: Add
       message: >-
         Several new tips have been added to the game, many of which reference
-        new content available on Einstein-Engines. 
+        new content available on Einstein-Engines.
   id: 6315
   time: '2024-09-05T00:00:21.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/844
@@ -5885,7 +5885,7 @@ Entries:
         Due to NUMEROUS complaints, NanoTrasen has swapped the sticker labels on
         all colored jumpskirts to correctly state that they are infact,
         "Skirts", so now they can legally be worn by Harpies, Lamia, and
-        Arachne. 
+        Arachne.
   id: 6317
   time: '2024-09-05T00:19:49.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/848
@@ -5949,7 +5949,7 @@ Entries:
       message: >-
         All non-job specific uniforms have had their points reduced drastically,
         almost all of them down to 0 points, with only a tiny handful at 2
-        points, and the rest as 1. 
+        points, and the rest as 1.
   id: 6321
   time: '2024-09-07T00:53:13.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/872
@@ -6126,7 +6126,7 @@ Entries:
     - type: Add
       message: >-
         The Antag Refactor has been once again added back in. More antags will
-        be coming soon. 
+        be coming soon.
   id: 6340
   time: '2024-09-09T14:21:56.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/794
@@ -6234,7 +6234,7 @@ Entries:
     - type: Add
       message: >-
         added rcds to the list of possible re and ported over the re update from
-        delta 
+        delta
     - type: Tweak
       message: >-
         tweaked the costs of boards re-machine boards to be more consistent with
@@ -6425,7 +6425,7 @@ Entries:
     - type: Fix
       message: >-
         Cloning Consoles will now correctly state when a body has the
-        Uncloneable trait. 
+        Uncloneable trait.
   id: 6368
   time: '2024-09-18T04:30:39.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/926
@@ -6544,7 +6544,7 @@ Entries:
     - type: Add
       message: >-
         All "Long-arms", Rifles, Light Machine Guns, Shotguns, now require
-        wielding to use. 
+        wielding to use.
   id: 6378
   time: '2024-09-20T20:35:43.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/913
@@ -6562,7 +6562,7 @@ Entries:
     - type: Add
       message: >-
         Tau-Ceti Basic, Tradeband, Freespeak, Elyran Standard, Sol Common, and
-        Sign Language have been added to the Languages tab. 
+        Sign Language have been added to the Languages tab.
   id: 6380
   time: '2024-09-20T21:46:47.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/936
@@ -6572,7 +6572,7 @@ Entries:
       message: >-
         Removed the "Become Psionic" traitor objective. It was literally
         impossible to fail if you took the Latent Psychic trait, and literally
-        impossible to greentext if you didn't. 
+        impossible to greentext if you didn't.
   id: 6381
   time: '2024-09-20T21:47:16.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/940
@@ -6643,7 +6643,7 @@ Entries:
       message: >-
         The Do-After bar for Breath of Life and Healing Word is now hidden if
         glimmer is low enough. The threshold for which scales with your
-        Dampening stat. More Dampening = stealthier casting. 
+        Dampening stat. More Dampening = stealthier casting.
   id: 6386
   time: '2024-09-24T00:56:34.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/949
@@ -6683,7 +6683,7 @@ Entries:
     - type: Remove
       message: >-
         The button for "Suit/Skirt Preference" has also been removed. Suit
-        selection is done via Loadouts. 
+        selection is done via Loadouts.
   id: 6390
   time: '2024-09-28T00:46:19.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/957
@@ -6789,7 +6789,7 @@ Entries:
       message: >-
         Nerfed the fuck out of Reagent Slimes. They have 1/3rd as much HP, spawn
         half as many during reagent slime vents, deal significantly less damage,
-        and inject a lot less chems when biting people. 
+        and inject a lot less chems when biting people.
   id: 6401
   time: '2024-09-29T17:42:43.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/977
@@ -6836,7 +6836,7 @@ Entries:
       message: >-
         Oni now have a built-in negative trait that acts as a more severe
         version of Low Psi-Potential. Oni now have significant penalties to
-        generating new Psionic Powers. 
+        generating new Psionic Powers.
   id: 6406
   time: '2024-09-30T18:28:31.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/983
@@ -6987,7 +6987,7 @@ Entries:
       message: >-
         Nerfed Lotophagoi Moodlets so that both the positive and negative
         moodlets only last for 10 minutes. The total mood modification has been
-        left untouched. 
+        left untouched.
   id: 6423
   time: '2024-10-07T15:29:05.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/1013
@@ -7005,7 +7005,7 @@ Entries:
     - type: Add
       message: >-
         The Salvage Shittle has been replaced with the Pathfinder Expedition
-        Vessel from Frontier. 
+        Vessel from Frontier.
   id: 6425
   time: '2024-10-09T01:17:11.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/1027
@@ -7153,3 +7153,92 @@ Entries:
   id: 6438
   time: '2024-10-11T16:08:48.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/1037
+- author: VMSolidus
+  changes:
+    - type: Add
+      message: >-
+        Added Bluespace and Normality ore as very rare ore types. Salvage can
+        occasionally find these ores on Asteroids or on Expedition planets.
+        Bluespace and Normality Ore can be smelted in an Ore Processor into
+        Bluespace and Normality Crystals. Make sure to bring these to Epistemics
+        so that they can do their job.
+  id: 6439
+  time: '2024-10-12T20:49:32.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1042
+- author: Fansana
+  changes:
+    - type: Fix
+      message: Fixes the arrivals shuttle choosing to correct docking port.
+  id: 6440
+  time: '2024-10-13T16:38:30.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1040
+- author: FoxxoTrystan
+  changes:
+    - type: Fix
+      message: Oneirophage is once more psionic invisible in webs.
+  id: 6441
+  time: '2024-10-13T18:33:59.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1033
+- author: Mnemotechnician
+  changes:
+    - type: Add
+      message: >-
+        You can now toggle crawling under furniture! The default keybind is
+        Shift-R, you can change it in settings.
+  id: 6442
+  time: '2024-10-13T18:34:58.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1036
+- author: DEATHB4DEFEAT
+  changes:
+    - type: Tweak
+      message: Made the show clothing/loadouts button labels more clear
+  id: 6443
+  time: '2024-10-13T18:41:16.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1030
+- author: VMSolidus
+  changes:
+    - type: Tweak
+      message: Brains now can no longer be eaten.
+  id: 6444
+  time: '2024-10-13T18:51:26.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1044
+- author: VMSolidus
+  changes:
+    - type: Add
+      message: >-
+        Added 8 new Physical Traits. These are, Cyber-Eyes Basic System(Plus 4
+        different modular options), Bionic Arm, Dermal Armor, and Platelet
+        Factories.
+  id: 6445
+  time: '2024-10-13T19:25:05.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1035
+- author: VMSolidus
+  changes:
+    - type: Add
+      message: >-
+        NT has started hiring contractors from other corporations to fill out
+        station staff. New loadout items for corporate contractors are now
+        available for Bartender, Botanist, Cataloguer, Chef, and Janitor.
+        Currently there are no jumpskirt versions of these uniforms. We are
+        looking for people willing to make skirt variations of each of these.
+  id: 6446
+  time: '2024-10-13T19:26:23.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1041
+- author: Mnemotechnician
+  changes:
+    - type: Add
+      message: >-
+        The Courier and Logistics Officer now have a new program in their PDA
+        for tracking mail delivery performance, including earnings and percent
+        of packages opened, damaged, or expired.
+    - type: Add
+      message: >-
+        The list of possible mail packages has been greately expanded, and now
+        includes large parcels.
+    - type: Add
+      message: >-
+        The CourierDrobe now offers a rapid mail delivery device, along with
+        capsules for it.
+  id: 6447
+  time: '2024-10-13T19:38:19.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1011
diff --git a/Resources/Locale/en-US/deltav/cartridge-loader/cartridges.ftl b/Resources/Locale/en-US/deltav/cartridge-loader/cartridges.ftl
index 9b4c59d001d..ede1a36b8ee 100644
--- a/Resources/Locale/en-US/deltav/cartridge-loader/cartridges.ftl
+++ b/Resources/Locale/en-US/deltav/cartridge-loader/cartridges.ftl
@@ -118,3 +118,16 @@ crime-assist-sophont-explanation = A sophont is described as any entity with the
                                    • [bold]Sentience[/bold]: the entity has the capacity to process an emotion or lack thereof, or at a minimum the ability to recognise its own pain.
                                    • [bold]Self-awareness[/bold]: the entity is capable of altering its behaviour in a reasonable fashion as a result of stimuli, or at a minimum is capable of recognising its own sapience and sentience.
                                    Any sophont is considered a legal person, regardless of origin or prior cognitive status. Much like any other intelligent organic, a sophont may press charges against crew and be tried for crimes.
+
+mail-metrics-program-name = MailMetrics
+mail-metrics-header = Income from Mail Deliveries
+mail-metrics-opened = Earnings (Opened)
+mail-metrics-expired = Losses (Expired)
+mail-metrics-damaged = Losses (Damaged)
+mail-metrics-tampered = Losses (Tampered)
+mail-metrics-unopened = Unopened
+mail-metrics-count-header = Packages
+mail-metrics-money-header = Spesos
+mail-metrics-total = Total
+mail-metrics-progress = {$opened} out of {$total} packages opened!
+mail-metrics-progress-percent = Success rate: {$successRate}%
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 ea24439f708..66e525b8f34 100644
--- a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
+++ b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
@@ -147,6 +147,7 @@ ui-options-function-rotate-stored-item = Rotate stored item
 ui-options-function-offer-item = Offer something
 ui-options-function-save-item-location = Save item location
 ui-options-function-toggle-standing = Toggle standing
+ui-options-function-toggle-crawling-under = Toggle crawling under furniture
 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/loadouts/categories.ftl b/Resources/Locale/en-US/loadouts/categories.ftl
index ddabf9db13c..193760005ea 100644
--- a/Resources/Locale/en-US/loadouts/categories.ftl
+++ b/Resources/Locale/en-US/loadouts/categories.ftl
@@ -26,6 +26,9 @@ loadout-category-JobsSecurity = Security
 loadout-category-JobsService = Service
 loadout-category-JobsServiceUncategorized = Uncategorized
 loadout-category-JobsServiceBartender = Bartender
+loadout-category-JobsServiceBotanist = Botanist
+loadout-category-JobsServiceChef = Chef
+loadout-category-JobsServiceJanitor = Janitor
 loadout-category-Mask = Mask
 loadout-category-Neck = Neck
 loadout-category-Outer = Outer
diff --git a/Resources/Locale/en-US/loadouts/itemgroups.ftl b/Resources/Locale/en-US/loadouts/itemgroups.ftl
index 50f37e7c7ac..9e66e200bcd 100644
--- a/Resources/Locale/en-US/loadouts/itemgroups.ftl
+++ b/Resources/Locale/en-US/loadouts/itemgroups.ftl
@@ -29,6 +29,19 @@ character-item-group-LoadoutHeadEngineering = Engineering Headgear
 character-item-group-LoadoutOuterEngineering = Engineering Outerwear
 character-item-group-LoadoutUniformsEngineering = Engineering Uniforms
 
+# Epistemics
+character-item-group-LoadoutEyesScience = Epistemics Eyewear
+character-item-group-LoadoutGlovesScience = Epistemics Gloves
+character-item-group-LoadoutHeadScience = Epistemics Headgear
+character-item-group-LoadoutMaskScience = Epistemics Masks
+character-item-group-LoadoutNeckScience = Epistemics Neckwear
+character-item-group-LoadoutOuterScience = Epistemics Outerwear
+character-item-group-LoadoutShoesScience = Epistemics Shoes
+character-item-group-LoadoutUniformsScience = Epistemics Uniforms
+
+# Epistemics - Cataloguer
+character-item-group-LoadoutCataloguerUniforms = Cataloguer Uniforms
+
 # Medical
 character-item-group-LoadoutEyesMedical = Medical Eyewear
 character-item-group-LoadoutGlovesMedical = Medical Gloves
@@ -55,6 +68,7 @@ character-item-group-LoadoutHoSWeapon = Head of Security's Antique Weapon Collec
 
 # Service
 character-item-group-LoadoutEquipmentService = Service Equipment
+character-item-group-LoadoutHeadService = Service Headgear
 character-item-group-LoadoutMaskService = Service Masks
 character-item-group-LoadoutNeckService = Service Neckwear
 character-item-group-LoadoutOuterService = Service Outerwear
@@ -63,9 +77,22 @@ character-item-group-LoadoutUniformsService = Service Uniforms
 
 # Service - Bartender
 character-item-group-LoadoutBartenderAmmo = Bartender Ammo
+character-item-group-LoadoutBartenderHead = Bartender Headgear
 character-item-group-LoadoutBartenderOuterwear = Bartender Outerwear
+character-item-group-LoadoutBartenderUniforms = Bartender Uniforms
 character-item-group-LoadoutBartenderWeapon = Bartender Weapon
 
+# Service - Botanist
+character-item-group-LoadoutBotanistUniforms = Botanist Uniforms
+
+# Service - Chef
+character-item-group-LoadoutChefHead = Chef Headgear
+character-item-group-LoadoutChefOuter = Chef Outerwear
+character-item-group-LoadoutChefUniforms = Chef Uniforms
+
+# Service - Janitor
+character-item-group-LoadoutJanitorUniforms = Janitor Uniforms
+
 # Service - Musician
 character-item-group-LoadoutMusicianInstruments = Musician Instruments
 
diff --git a/Resources/Locale/en-US/Mail/mail.ftl b/Resources/Locale/en-US/mail/commands.ftl
similarity index 52%
rename from Resources/Locale/en-US/Mail/mail.ftl
rename to Resources/Locale/en-US/mail/commands.ftl
index 72cd3879b32..1f471bb7a59 100644
--- a/Resources/Locale/en-US/Mail/mail.ftl
+++ b/Resources/Locale/en-US/mail/commands.ftl
@@ -1,22 +1,6 @@
-mail-recipient-mismatch = Recipient name or job does not match.
-mail-invalid-access = Recipient name and job match, but access isn't as expected.
-mail-locked = The anti-tamper lock hasn't been removed. Tap the recipient's ID.
-mail-desc-far = A parcel of mail. You can't make out who it's addressed to from this distance.
-mail-desc-close = A parcel of mail addressed to {CAPITALIZE($name)}, {$job}.
-mail-desc-fragile = It has a [color=red]red fragile label[/color].
-mail-desc-priority = The anti-tamper lock's [color=yellow]yellow priority tape[/color] is active. Better deliver it on time!
-mail-desc-priority-inactive = The anti-tamper lock's [color=#886600]yellow priority tape[/color] is inactive.
-mail-unlocked = Anti-tamper system unlocked.
-mail-unlocked-by-emag = Anti-tamper system *BZZT*.
-mail-unlocked-reward = Anti-tamper system unlocked. {$bounty} spesos have been added to logistics's account.
-mail-penalty-lock = ANTI-TAMPER LOCK BROKEN. LOGISTICS BANK ACCOUNT PENALIZED BY {$credits} CREDITS.
-mail-penalty-fragile = INTEGRITY COMPROMISED. LOGISTICS BANK ACCOUNT PENALIZED BY {$credits} CREDITS.
-mail-penalty-expired = DELIVERY PAST DUE. LOGISTICS BANK ACCOUNT PENALIZED BY {$credits} CREDITS.
-mail-item-name-unaddressed = mail
-mail-item-name-addressed = mail ({$recipient})
-
+# Mailto
 command-mailto-description = Queue a parcel to be delivered to an entity. Example usage: `mailto 1234 5678 false false`. The target container's contents will be transferred to an actual mail parcel.
-command-mailto-help = Usage: {$command} <recipient entityUid> <container entityUid> [is-fragile: true or false] [is-priority: true or false]
+command-mailto-help = Usage: {$command} <recipient entityUid> <container entityUid> [is-fragile: true or false] [is-priority: true or false] [is-large: true or false, optional]
 command-mailto-no-mailreceiver = Target recipient entity does not have a {$requiredComponent}.
 command-mailto-no-blankmail = The {$blankMail} prototype doesn't exist. Something is very wrong. Contact a programmer.
 command-mailto-bogus-mail = {$blankMail} did not have {$requiredMailComponent}. Something is very wrong. Contact a programmer.
@@ -25,6 +9,12 @@ command-mailto-unable-to-receive = Target recipient entity was unable to be setu
 command-mailto-no-teleporter-found = Target recipient entity was unable to be matched to any station's mail teleporter. Recipient may be off-station.
 command-mailto-success = Success! Mail parcel has been queued for next teleport in {$timeToTeleport} seconds.
 
+# Mailnow
 command-mailnow = Force all mail teleporters to deliver another round of mail as soon as possible. This will not bypass the undelivered mail limit.
 command-mailnow-help = Usage: {$command}
 command-mailnow-success = Success! All mail teleporters will be delivering another round of mail soon.
+
+# Mailtestbulk
+command-mailtestbulk = Sends one of each type of parcel to a given mail teleporter.  Implicitly calls mailnow.
+command-mailtestbulk-help = Usage: {$command} <teleporter_id>
+command-mailtestbulk-success = Success! All mail teleporters will be delivering another round of mail soon.
diff --git a/Resources/Locale/en-US/mail/mail.ftl b/Resources/Locale/en-US/mail/mail.ftl
new file mode 100644
index 00000000000..5a277377324
--- /dev/null
+++ b/Resources/Locale/en-US/mail/mail.ftl
@@ -0,0 +1,23 @@
+mail-recipient-mismatch = Recipient name or job does not match.
+mail-invalid-access = Recipient name and job match, but access isn't as expected.
+mail-locked = The anti-tamper lock hasn't been removed. Tap the recipient's ID.
+mail-desc-far = A parcel of mail. You can't make out who it's addressed to from this distance.
+mail-desc-close = A parcel of mail addressed to {CAPITALIZE($name)}, {$job}.
+mail-desc-fragile = It has a [color=red]red fragile label[/color].
+mail-desc-priority = The anti-tamper lock's [color=yellow]yellow priority tape[/color] is active. Better deliver it on time!
+mail-desc-priority-inactive = The anti-tamper lock's [color=#886600]yellow priority tape[/color] is inactive.
+mail-unlocked = Anti-tamper system unlocked.
+mail-unlocked-by-emag = Anti-tamper system *BZZT*.
+mail-unlocked-reward = Anti-tamper system unlocked. {$bounty} spesos have been added to logistics' account.
+mail-penalty-lock = ANTI-TAMPER LOCK BROKEN. LOGISTICS BANK ACCOUNT PENALIZED BY {$credits} SPESOS.
+mail-penalty-fragile = INTEGRITY COMPROMISED. LOGISTICS BANK ACCOUNT PENALIZED BY {$credits} SPESOS.
+mail-penalty-expired = DELIVERY PAST DUE. LOGISTICS BANK ACCOUNT PENALIZED BY {$credits} SPESOS.
+mail-item-name-unaddressed = mail
+mail-item-name-addressed = mail ({$recipient})
+
+mail-large-item-name-unaddressed = package
+mail-large-item-name-addressed = package ({$recipient})
+mail-large-desc-far = A large package.
+mail-large-desc-close = A large package addressed to {CAPITALIZE($name)}, {$job}.
+
+
diff --git a/Resources/Locale/en-US/materials/materials.ftl b/Resources/Locale/en-US/materials/materials.ftl
index 5a4413348e8..f8d54ee21ad 100644
--- a/Resources/Locale/en-US/materials/materials.ftl
+++ b/Resources/Locale/en-US/materials/materials.ftl
@@ -35,6 +35,8 @@ materials-raw-plasma = raw plasma
 materials-raw-uranium = raw uranium
 materials-raw-bananium = raw bananium
 materials-raw-salt = raw salt
+materials-raw-bluespace = raw bluespace
+materials-raw-normality = raw normality
 
 # Material Reclaimer
 material-reclaimer-upgrade-process-rate = process rate
diff --git a/Resources/Locale/en-US/movement/laying.ftl b/Resources/Locale/en-US/movement/laying.ftl
index f75061d6a75..de84ca629ea 100644
--- a/Resources/Locale/en-US/movement/laying.ftl
+++ b/Resources/Locale/en-US/movement/laying.ftl
@@ -1,3 +1,6 @@
+crawling-under-tables-disabled-popup = Crawling under tables is disabled on this server.
+
+# TODO either remove those, or make use of them
 laying-comp-lay-success-self = You lay down.
 laying-comp-lay-success-other = {THE($entity)} lays down.
 laying-comp-lay-fail-self = You can't lay down right now.
diff --git a/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl b/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
index c9b71053143..022f3423c0a 100644
--- a/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
+++ b/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
@@ -2,8 +2,8 @@ humanoid-profile-editor-randomize-everything-button = Randomize everything
 humanoid-profile-editor-name-label = Name:
 humanoid-profile-editor-name-random-button = Randomize
 humanoid-profile-editor-appearance-tab = Appearance
-humanoid-profile-editor-clothing = Show clothing
-humanoid-profile-editor-loadouts = Show loadout
+humanoid-profile-editor-clothing = Preview job equipment:
+humanoid-profile-editor-loadouts = Preview loadout items:
 humanoid-profile-editor-clothing-show = Show
 humanoid-profile-editor-sex-label = Sex:
 humanoid-profile-editor-sex-male-text = Male
diff --git a/Resources/Locale/en-US/salvage/salvage-magnet.ftl b/Resources/Locale/en-US/salvage/salvage-magnet.ftl
index 7ce2a486de9..027afffef2f 100644
--- a/Resources/Locale/en-US/salvage/salvage-magnet.ftl
+++ b/Resources/Locale/en-US/salvage/salvage-magnet.ftl
@@ -17,6 +17,8 @@ salvage-magnet-resources = {$resource ->
     [OrePlasma] Plasma
     [OreUranium] Uranium
     [OreArtifactFragment] Artifact fragments
+    [OreBluespace] Bluespace crystals
+    [OreNormality] Normality crystals
     *[other] {$resource}
 }
 
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks_bottles.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks_bottles.ftl
new file mode 100644
index 00000000000..4fff83bd8aa
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks_bottles.ftl
@@ -0,0 +1,16 @@
+ent-LPPDrinkCamomileTeaBottleFull = camomile tea bottle
+    .desc = Bottle of chamomile tea is the perfect remedy for your peace of mind.
+ent-LPPDrinkMintTeaBottleFull = mint tea bottle
+    .desc = Bottle of refreshing peppermint tea, just looking at it makes you feel chilled.
+ent-LPPDrinkGingerTeaBottleFull = ginger tea bottle
+    .desc = Bottle of ginger tea, great for warming your soul.
+ent-LPPDrinkBerryTeaBottleFull = berry tea bottle
+    .desc = Bottle of berry tea with the rich flavor of summer berries.
+ent-LPPDrinkOrangeTeaBottleFull = orange tea bottle
+    .desc = Bottle of orange tea with citrus freshness.
+ent-LPPDrinkFlowerTeaBottleFull = flower tea bottle
+    .desc = Bottle of flower tea with subtle, delicate notes of flowers.
+ent-LPPDrinkTeaBottleFull = tea bottle
+    .desc = Bottle of regular tea, nothing special.
+ent-LPPDrinkGreenTeaBottleFull = green tea bottle
+    .desc = Bottle of green tea, nothing special either.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/structures/machines/vending_machines.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/structures/machines/vending_machines.ftl
index 833e802b0ad..c4e3f93ca46 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/structures/machines/vending_machines.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/structures/machines/vending_machines.ftl
@@ -25,3 +25,5 @@ ent-LPPUnderpantsMat = Underpants machine
 ent-LPPWithSoftAnimals = With soft animals machine
     .desc = For when you need seeds fast. Hands down the best seed selection on the station!
     .suffix = Unlocked
+ent-LPPTeaVend = TeaVend
+    .desc = Perfect for those who want to cool down a bit.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/devices/cartridges.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/devices/cartridges.ftl
index a1fd47189e6..335bb33c3c4 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/devices/cartridges.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/devices/cartridges.ftl
@@ -2,3 +2,5 @@ ent-CrimeAssistCartridge = crime assist cartridge
     .desc = A cartridge that helps identify crimes and see appropriate punishment.
 ent-SecWatchCartridge = sec watch cartridge
     .desc = A cartridge that tracks the status of currently wanted individuals.
+ent-MailMetricsCartridge = mail metrics cartridge
+    .desc = A cartridge that tracks statistics related to mail deliveries.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/specific/mail/mail.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/specific/mail/mail.ftl
index aa999caeb1a..0b6ab46d5f8 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/specific/mail/mail.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/specific/mail/mail.ftl
@@ -4,3 +4,183 @@ ent-MailBooksAll = { ent-BaseMail }
 ent-MailPumpkinPie = { ent-BaseMail }
     .suffix = pumpkinpie
     .desc = { ent-BaseMail.desc }
+ent-MailDVCosplayFakeWizard = { ent-BaseMail }
+    .suffix = cosplay-wizard, fake as fuck
+    .desc = { ent-BaseMail.desc }
+ent-MailDVScarves = { ent-BaseMail }
+    .suffix = scarves
+    .desc = { ent-BaseMail.desc }
+ent-MailDVBoxes = { ent-BaseMailLarge }
+    .suffix = boxes
+    .desc = { ent-BaseMailLarge.desc }
+ent-MailNFAlcohol = { ent-BaseMail }
+    .suffix = alcohol, extended
+    .desc = { ent-BaseMail.desc }
+ent-MailNFBible = { ent-BaseMailLarge }
+    .suffix = bible, extended
+    .desc = { ent-BaseMailLarge.desc }
+ent-MailNFBikeHorn = { ent-BaseMail }
+    .suffix = bike horn, random
+    .desc = { ent-BaseMail.desc }
+ent-MailNFBuildABuddy = { ent-BaseMailLarge }
+    .suffix = Build-a-Buddy
+    .desc = { ent-BaseMailLarge.desc }
+ent-MailNFCake = { ent-BaseMailLarge }
+    .suffix = cake, extended
+    .desc = { ent-BaseMailLarge.desc }
+ent-MailNFCosplayWizard = { ent-BaseMail }
+    .suffix = cosplay-wizard, extended
+    .desc = { ent-BaseMail.desc }
+ent-MailNFCosplayMaid = { ent-BaseMail }
+    .suffix = cosplay-maid, extended
+    .desc = { ent-BaseMail.desc }
+ent-MailNFCosplayNurse = { ent-BaseMail }
+    .suffix = cosplay-nurse, extended
+    .desc = { ent-BaseMail.desc }
+ent-MailNFCheese = { ent-BaseMail }
+    .suffix = cheese, extended
+    .desc = { ent-BaseMail.desc }
+ent-MailNFCigarettes = { ent-BaseMail }
+    .suffix = cigs, random
+    .desc = { ent-BaseMail.desc }
+ent-MailNFEMP = { ent-BaseMail }
+    .suffix = emp
+    .desc = { ent-BaseMail.desc }
+ent-MailNFSmoke = { ent-BaseMail }
+    .suffix = smoke
+    .desc = { ent-BaseMail.desc }
+ent-MailNFGoldCigars = { ent-BaseMail }
+    .suffix = cigars, premium
+    .desc = { ent-BaseMail.desc }
+ent-MailNFCookies = { ent-BaseMail }
+    .suffix = cookies, random
+    .desc = { ent-BaseMail.desc }
+ent-MailNFKnife = { ent-BaseMail }
+    .suffix = knife, extended
+    .desc = { ent-BaseMail.desc }
+ent-MailNFSword = { ent-BaseMailLarge }
+    .suffix = sword
+    .desc = { ent-BaseMailLarge.desc }
+ent-MailNFMuffins = { ent-BaseMail }
+    .suffix = muffins, random
+    .desc = { ent-BaseMail.desc }
+ent-MailNFPAI = { ent-BaseMail }
+    .suffix = PAI, extended
+    .desc = { ent-BaseMail.desc }
+ent-MailNFPlushie = { ent-BaseMail }
+    .suffix = plushie, extended
+    .desc = { ent-BaseMail.desc }
+ent-MailNFSnacks = { ent-BaseMail }
+    .suffix = snacks, random
+    .desc = { ent-BaseMail.desc }
+ent-MailNFVagueThreat = { ent-BaseMail }
+    .suffix = vague-threat
+    .desc = { ent-BaseMail.desc }
+ent-MailNFDonkPockets = { ent-BaseMail }
+    .suffix = donk pockets, random
+    .desc = { ent-BaseMail.desc }
+ent-MailNFSodaPwrGame = { ent-BaseMail }
+    .suffix = Pwrgame
+    .desc = { ent-BaseMail.desc }
+ent-MailNFSodaRedBool = { ent-BaseMail }
+    .suffix = Red Bool
+    .desc = { ent-BaseMail.desc }
+ent-MailNFSodaSpaceCola = { ent-BaseMail }
+    .suffix = Space Cola
+    .desc = { ent-BaseMail.desc }
+ent-MailNFSodaSpaceMountainWind = { ent-BaseMail }
+    .suffix = Space Mountain Wind
+    .desc = { ent-BaseMail.desc }
+ent-MailNFSodaSpaceUp = { ent-BaseMail }
+    .suffix = Space Up
+    .desc = { ent-BaseMail.desc }
+ent-MailNFJoints = { ent-BaseMail }
+    .suffix = joints
+    .desc = { ent-BaseMail.desc }
+ent-MailNFUnusualFood = { ent-BaseMail }
+    .suffix = unusual food
+    .desc = { ent-BaseMail.desc }
+ent-MailNFBakedGoods = { ent-BaseMail }
+    .suffix = baked goods
+    .desc = { ent-BaseMail.desc }
+ent-MailNFUnusualProduce = { ent-BaseMail }
+    .suffix = unusual produce
+    .desc = { ent-BaseMail.desc }
+ent-MailNFSoaps = { ent-BaseMail }
+    .suffix = soap sampler
+    .desc = { ent-BaseMail.desc }
+ent-MailNFSoapsOmega = { ent-BaseMail }
+    .suffix = soap sampler, omega
+    .desc = { ent-BaseMail.desc }
+ent-MailNFFigurineBulk = { ent-BaseMail }
+    .suffix = figurine, bulk
+    .desc = { ent-BaseMail.desc }
+ent-MailNFPen = { ent-BaseMail }
+    .suffix = fancy pen
+    .desc = { ent-BaseMail.desc }
+ent-MailNFThrongler = { ent-BaseMailLarge }
+    .suffix = throngler
+    .desc = { ent-BaseMailLarge.desc }
+ent-MailNFInstrumentSmall = { ent-BaseMail }
+    .suffix = instrument, expanded
+    .desc = { ent-BaseMail.desc }
+ent-MailNFUnusualClothing = { ent-BaseMail }
+    .suffix = unusual clothing
+    .desc = { ent-BaseMail.desc }
+ent-MailNFCritter = { ent-BaseMail }
+    .suffix = critter
+    .desc = { ent-BaseMail.desc }
+ent-MailNFTacticalMaid = { ent-BaseMail }
+    .suffix = tactical maid
+    .desc = { ent-BaseMail.desc }
+ent-MailNFKendoKit = { ent-BaseMailLarge }
+    .suffix = kendo kit
+    .desc = { ent-BaseMailLarge.desc }
+ent-MailSake = { ent-BaseMail }
+    .suffix = osake
+    .desc = { ent-BaseMail.desc }
+ent-MailBlockGameDIY = { ent-BaseMail }
+    .suffix = blockgamediy
+    .desc = { ent-BaseMail.desc }
+ent-MailCigars = { ent-BaseMail }
+    .suffix = Cigars
+    .desc = { ent-BaseMail.desc }
+ent-MailCrayon = { ent-BaseMail }
+    .suffix = Crayon
+    .desc = { ent-BaseMail.desc }
+ent-MailCosplayArc = { ent-BaseMail }
+    .suffix = cosplay-arc
+    .desc = { ent-BaseMail.desc }
+ent-MailCosplayGeisha = { ent-BaseMail }
+    .suffix = cosplay-geisha
+    .desc = { ent-BaseMail.desc }
+ent-MailCosplaySchoolgirl = { ent-BaseMail }
+    .suffix = cosplay-schoolgirl
+    .desc = { ent-BaseMail.desc }
+ent-MailFlowers = { ent-BaseMail }
+    .suffix = flowers
+    .desc = { ent-BaseMail.desc }
+ent-MailSignallerKit = { ent-BaseMail }
+    .suffix = signallerkit
+    .desc = { ent-BaseMail.desc }
+ent-MailNoir = { ent-BaseMail }
+    .suffix = noir
+    .desc = { ent-BaseMail.desc }
+ent-MailRestraints = { ent-BaseMail }
+    .suffix = restraints
+    .desc = { ent-BaseMail.desc }
+ent-MailFishingCap = { ent-BaseMail }
+    .suffix = fishingcap
+    .desc = { ent-BaseMail.desc }
+ent-MailFlashlight = { ent-BaseMail }
+    .suffix = Flashlight
+    .desc = { ent-BaseMail.desc }
+ent-MailSpaceVillainDIY = { ent-BaseMail }
+    .suffix = spacevilliandiy
+    .desc = { ent-BaseMail.desc }
+ent-MailSunglasses = { ent-BaseMail }
+    .suffix = Sunglasses
+    .desc = { ent-BaseMail.desc }
+ent-MailWinterCoat = { ent-BaseMail }
+    .suffix = wintercoat
+    .desc = { ent-BaseMail.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_civilian.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/specific/mail/mail_civilian.ftl
similarity index 74%
rename from Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_civilian.ftl
rename to Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/specific/mail/mail_civilian.ftl
index d46a995e1ac..05e356f52b6 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_civilian.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/specific/mail/mail_civilian.ftl
@@ -1,5 +1,8 @@
+ent-MailNFInstrumentLarge = { ent-BaseMailLarge }
+    .suffix = instrument, large
+    .desc = { ent-BaseMailLarge.desc }
 ent-MailBotanistChemicalBottles = { ent-BaseMail }
-    .suffix = botanistchemicals
+    .suffix = botanist chemicals
     .desc = { ent-BaseMail.desc }
 ent-MailBotanistMutagen = { ent-BaseMail }
     .suffix = mutagen
@@ -14,23 +17,20 @@ ent-MailClownHonkSupplement = { ent-BaseMail }
     .suffix = honk
     .desc = { ent-BaseMail.desc }
 ent-MailHoPBureaucracy = { ent-BaseMail }
-    .suffix = hoppaper
+    .suffix = hop paper
     .desc = { ent-BaseMail.desc }
 ent-MailHoPSupplement = { ent-BaseMail }
-    .suffix = hopsupplement
+    .suffix = hop supplement
     .desc = { ent-BaseMail.desc }
 ent-MailMimeArtsCrafts = { ent-BaseMail }
-    .suffix = artscrafts
+    .suffix = arts and crafts
     .desc = { ent-BaseMail.desc }
 ent-MailMimeBlankBook = { ent-BaseMail }
-    .suffix = blankbook
+    .suffix = blank book
     .desc = { ent-BaseMail.desc }
 ent-MailMimeBottleOfNothing = { ent-BaseMail }
-    .suffix = bottleofnothing
-    .desc = { ent-BaseMail.desc }
-ent-MailMusicianInstrumentSmall = { ent-BaseMail }
-    .suffix = instrument-small
+    .suffix = bottle of nothing
     .desc = { ent-BaseMail.desc }
 ent-MailPassengerMoney = { ent-BaseMail }
-    .suffix = passengermoney
+    .suffix = passenger money
     .desc = { ent-BaseMail.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/specific/mail/mail_command.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/specific/mail/mail_command.ftl
new file mode 100644
index 00000000000..ecea3f6fddb
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/specific/mail/mail_command.ftl
@@ -0,0 +1,9 @@
+ent-MailCommandPinpointerNuclear = { ent-BaseMail }
+    .suffix = pinpointer mail ops
+    .desc = { ent-BaseMail.desc }
+ent-MailStationRepNFNukeDisk = { ent-BaseMail }
+    .suffix = nuke disk
+    .desc = { ent-BaseMail.desc }
+ent-MailCommandNFPipebombIntern = { ent-BaseMail }
+    .suffix = pipe and bomb
+    .desc = { ent-BaseMail.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_engineering.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/specific/mail/mail_engineering.ftl
similarity index 55%
rename from Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_engineering.ftl
rename to Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/specific/mail/mail_engineering.ftl
index ecddc5a47b9..c58f53aa973 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_engineering.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/specific/mail/mail_engineering.ftl
@@ -10,3 +10,12 @@ ent-MailEngineeringSheetGlass = { ent-BaseMail }
 ent-MailEngineeringWelderReplacement = { ent-BaseMail }
     .suffix = welder
     .desc = { ent-BaseMail.desc }
+ent-MailNFCircuitboardIndustrial = { ent-BaseMail }
+    .suffix = industrial circuitboard
+    .desc = { ent-BaseMail.desc }
+ent-MailNFCircuitboardService = { ent-BaseMail }
+    .suffix = service circuitboard
+    .desc = { ent-BaseMail.desc }
+ent-MailNFPowerTool = { ent-BaseMailLarge }
+    .suffix = power tool
+    .desc = { ent-BaseMailLarge.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_epistemology.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/specific/mail/mail_epistemology.ftl
similarity index 77%
rename from Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_epistemology.ftl
rename to Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/specific/mail/mail_epistemology.ftl
index 3c1b9a08742..b8fd7aff85e 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_epistemology.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/specific/mail/mail_epistemology.ftl
@@ -10,6 +10,3 @@ ent-MailEpistemologyResearchDisk = { ent-BaseMail }
 ent-MailEpistemologyTinfoilHat = { ent-BaseMail }
     .suffix = tinfoilhat
     .desc = { ent-BaseMail.desc }
-ent-MailDetectiveForensicSupplement = { ent-BaseMail }
-    .suffix = detectivesupplement
-    .desc = { ent-BaseMail.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_medical.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/specific/mail/mail_medical.ftl
similarity index 86%
rename from Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_medical.ftl
rename to Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/specific/mail/mail_medical.ftl
index 38063e87419..50461918b63 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_medical.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/specific/mail/mail_medical.ftl
@@ -16,3 +16,6 @@ ent-MailMedicalSheetPlasma = { ent-BaseMail }
 ent-MailMedicalStabilizers = { ent-BaseMail }
     .suffix = stabilizers
     .desc = { ent-BaseMail.desc }
+ent-MailNFMedkit = { ent-BaseMailLarge }
+    .suffix = medkit
+    .desc = { ent-BaseMailLarge.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_security.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/specific/mail/mail_security.ftl
similarity index 54%
rename from Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_security.ftl
rename to Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/specific/mail/mail_security.ftl
index 6b24b0e6046..0b91c0ba684 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_security.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/specific/mail/mail_security.ftl
@@ -10,3 +10,12 @@ ent-MailSecurityNonlethalsKit = { ent-BaseMail }
 ent-MailWardenCrowdControl = { ent-BaseMail }
     .suffix = crowdcontrol
     .desc = { ent-BaseMail.desc }
+ent-MailDetectiveForensicSupplement = { ent-BaseMail }
+    .suffix = detectivesupplement
+    .desc = { ent-BaseMail.desc }
+ent-MailSecurityNFMusket = { ent-BaseMailLarge }
+    .suffix = musket
+    .desc = { ent-BaseMailLarge.desc }
+ent-MailSecurityDVSpaceLaw = { ent-BaseMail }
+    .suffix = spacelaw, extended
+    .desc = { ent-BaseMail.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl
index 470705c2727..43fe0295045 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl
@@ -162,6 +162,22 @@ ent-ClothingUniformJumpsuitLibrarianOrion = orion express librarian jumpsuit
     .desc = A cosy brown jumper fit for a curator of books.
 ent-ClothingUniformJumpsuitLibrarianOrionFlipped = orion express librarian jumpsuit
     .desc = { ent-ClothingUniformBaseFlipped.desc }
+ent-ClothingUniformJumpsuitLibrarianHeph = hephaestus industries librarian jumpsuit
+    .desc = A cosy green jumper fit for a curator of books.
+ent-ClothingUniformJumpsuitLibrarianHephFlipped = hephaestus industries librarian jumpsuit
+    .desc = { ent-ClothingUniformBaseFlipped.desc }
+ent-ClothingUniformJumpsuitLibrarianPMCG = private military contracting group librarian jumpsuit
+    .desc = A cosy white jumper fit for a curator of books.
+ent-ClothingUniformJumpsuitLibrarianPMCGFlipped = private military contracting group librarian jumpsuit
+    .desc = { ent-ClothingUniformBaseFlipped.desc }
+ent-ClothingUniformJumpsuitLibrarianZav = zavodskoi interstellar librarian jumpsuit
+    .desc = A blood brown jumper fit for a curator of books.
+ent-ClothingUniformJumpsuitLibrarianZavFlipped = zavodskoi interstellar librarian jumpsuit
+    .desc = { ent-ClothingUniformBaseFlipped.desc }
+ent-ClothingUniformJumpsuitLibrarianZeng = zeng-hu pharmaceuticals librarian jumpsuit
+    .desc = A blood brown jumper fit for a curator of books.
+ent-ClothingUniformJumpsuitLibrarianZengFlipped = zeng-hu pharmaceuticals librarian jumpsuit
+    .desc = { ent-ClothingUniformBaseFlipped.desc }
 ent-ClothingUniformJumpsuitCurator = sensible suit
     .desc = It's sensible. Too sensible...
 ent-ClothingUniformJumpsuitLawyerRed = red lawyer suit
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/ore.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/ore.ftl
index 261704b81e4..99ef1d23309 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/ore.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/ore.ftl
@@ -54,3 +54,15 @@ ent-SaltOre = salt
 ent-Salt1 = { ent-SaltOre }
     .suffix = Single
     .desc = { ent-SaltOre.desc }
+ent-BluespaceOre = bluespace ore
+    .suffix = Full
+    .desc = { ent-OreBase.desc }
+ent-BluespaceOre1 = { ent-BluespaceOre }
+    .suffix = Single
+    .desc = { ent-BluespaceOre.desc }
+ent-NormalityOre = normality ore
+    .suffix = Full
+    .desc = { ent-OreBase.desc }
+ent-NormalityOre1 = { ent-NormalityOre }
+    .suffix = Single
+    .desc = { ent-NormalityOre.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/mail_capsule.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/mail_capsule.ftl
new file mode 100644
index 00000000000..1ed48042c9d
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/mail_capsule.ftl
@@ -0,0 +1,5 @@
+ent-MailCapsulePrimed = mail capsule
+    .suffix = Primed
+    .desc = { ent-BaseItem.desc }
+ent-BoxMailCapsulePrimed = mail capsule box
+    .desc = A box of primed mail capsules.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/mail/base_mail_large.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/mail/base_mail_large.ftl
new file mode 100644
index 00000000000..e8ad9c85747
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/mail/base_mail_large.ftl
@@ -0,0 +1,5 @@
+ent-BaseMailLarge = mail-large-item-name-unaddressed
+    .desc = { ent-BaseMail.desc }
+ent-MailLargeAdminFun = { ent-BaseMailLarge }
+    .suffix = adminfun
+    .desc = { ent-BaseMailLarge.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/mail/items/boxes.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/mail/items/boxes.ftl
new file mode 100644
index 00000000000..b43b819d853
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/mail/items/boxes.ftl
@@ -0,0 +1,16 @@
+ent-BoxSoapsAssorted = scented soap sampler pack
+    .desc = A box of various scented soaps. Ooh, lavender.
+ent-BoxSoapsAssortedOmega = scented soap sampler pack
+    .desc = A box of various scented soaps. Ooh, bluespace.
+ent-BoxBuildABuddyHuman = Build-a-Buddy kit
+    .desc = "Henry the Human" Build-a-Buddy kit. Some assembly required.
+    .suffix = Human
+ent-BoxBuildABuddyReptilian = Build-a-Buddy kit
+    .desc = "Randy the Reptilian" Build-a-Buddy kit. Some assembly required.
+    .suffix = Reptilian
+ent-BoxBuildABuddySlime = Build-a-Buddy kit
+    .desc = "Steven the Slime" Build-a-Buddy kit. Some assembly required.
+    .suffix = Slime
+ent-BoxBuildABuddyVulpkanin = Build-a-Buddy kit
+    .desc = "Valerie the Vulpkanin" Build-a-Buddy kit. Some assembly required.
+    .suffix = Vulpkanin
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/mail/items/misc.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/mail/items/misc.ftl
new file mode 100644
index 00000000000..63c01b835ff
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/mail/items/misc.ftl
@@ -0,0 +1,26 @@
+ent-DelayedSmoke = delayed smoke
+    .suffix = (10s)
+    .desc = { ent-BaseItem.desc }
+ent-AdminInstantEffectEMP7 = { ent-AdminInstantEffectBase }
+    .suffix = EMP, 7 meters
+    .desc = { ent-AdminInstantEffectBase.desc }
+ent-DelayedEMP = delayed EMP (7 meters)
+    .desc = { ent-BaseItem.desc }
+ent-SyringeCognizine = cognizine syringe
+    .desc = { ent-Syringe.desc }
+ent-SyringeOpporozidone = opporozidone syringe
+    .desc = { ent-Syringe.desc }
+ent-NecrosolChemistryBottle = necrosol bottle
+    .desc = { ent-BaseChemistryBottleFilled.desc }
+ent-DrinkPremiumVodkaBottleFull = Moment of Clarity vodka bottle
+    .desc = When things get a bit hectic, all you need is a Moment of Clarity.
+ent-DrinkPremiumGinBottleFull = Harry's gin bottle
+    .desc = An interesting set of botanicals, for sure. Is that pumpkin?
+ent-DrinkPremiumTequilaBottleFull = Casa del Eorg tequila bottle
+    .desc = Save the best for last. Casa del Eorg, 100% agave.
+ent-DrinkPremiumWhiskeyBottleFull = Ol' Prowler 18 whiskey bottle
+    .desc = Surprisingly smooth, it has a nasty habit of sneaking up on you.
+ent-DrinkPremiumRumBottleFull = Redeemer's Bounty rum bottle
+    .desc = Well, you asked for it. Navy strength.
+ent-DrinkPremiumAbsintheBottleFull = Bureaucracy's Kiss absinthe bottle
+    .desc = A refined taste that tends to linger.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/mail/items/paper.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/mail/items/paper.ftl
new file mode 100644
index 00000000000..0577932dd01
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/mail/items/paper.ftl
@@ -0,0 +1,90 @@
+ent-PaperMailNFPowerTool = Hazard Fraught advertisement
+    .suffix = power tool ad, formatted
+    .desc = { ent-Paper.desc }
+ent-PaperMailNFVagueThreat1 = { ent-Paper }
+    .suffix = vague mail threat 1, formatted
+    .desc = { ent-Paper.desc }
+ent-PaperMailNFVagueThreat2 = { ent-Paper }
+    .suffix = vague mail threat 2, formatted
+    .desc = { ent-Paper.desc }
+ent-PaperMailNFVagueThreat3 = { ent-Paper }
+    .suffix = vague mail threat 3, formatted
+    .desc = { ent-Paper.desc }
+ent-PaperMailNFVagueThreat4 = { ent-Paper }
+    .suffix = vague mail threat 4, formatted
+    .desc = { ent-Paper.desc }
+ent-PaperMailNFVagueThreat5 = { ent-Paper }
+    .suffix = vague mail threat 5, formatted
+    .desc = { ent-Paper.desc }
+ent-PaperMailNFVagueThreat6 = { ent-Paper }
+    .suffix = vague mail threat 6, formatted
+    .desc = { ent-Paper.desc }
+ent-PaperMailNFVagueThreat7 = { ent-Paper }
+    .suffix = vague mail threat 7, formatted
+    .desc = { ent-Paper.desc }
+ent-PaperMailNFVagueThreat8 = { ent-Paper }
+    .suffix = vague mail threat 8, formatted
+    .desc = { ent-Paper.desc }
+ent-PaperMailNFVagueThreat9 = { ent-Paper }
+    .suffix = vague mail threat 9, formatted
+    .desc = { ent-Paper.desc }
+ent-PaperMailNFVagueThreat10 = { ent-Paper }
+    .suffix = vague mail threat 10, formatted
+    .desc = { ent-Paper.desc }
+ent-PaperMailNFVagueThreat11 = { ent-Paper }
+    .suffix = vague mail threat 11, formatted
+    .desc = { ent-Paper.desc }
+ent-PaperMailNFVagueThreat12 = { ent-Paper }
+    .suffix = vague mail threat 12, formatted
+    .desc = { ent-Paper.desc }
+ent-PaperMailNFPwrGameAd = pwr game advertisement
+    .suffix = pwr game ad
+    .desc = { ent-Paper.desc }
+ent-PaperMailNFRedBoolAd = red bool advertisement
+    .suffix = red bool ad
+    .desc = { ent-Paper.desc }
+ent-PaperMailNFSpaceColaAd = space cola advertisement
+    .suffix = space cola ad
+    .desc = { ent-Paper.desc }
+ent-PaperMailNFSpaceMountainWindAd = space mountain wind advertisement
+    .suffix = space mountain wind ad
+    .desc = { ent-Paper.desc }
+ent-PaperMailNFSpaceUpAd = space up advertisement
+    .suffix = space up ad
+    .desc = { ent-Paper.desc }
+ent-PaperMailNTSoapAd1 = { ent-Paper }
+    .suffix = soap ad 1
+    .desc = { ent-Paper.desc }
+ent-PaperMailNTSoapAd2 = { ent-Paper }
+    .suffix = soap ad 2
+    .desc = { ent-Paper.desc }
+ent-PaperMailNTConscript = { ent-Paper }
+    .suffix = conscript
+    .desc = { ent-Paper.desc }
+ent-PaperMailNTMusket = { ent-Paper }
+    .suffix = musket
+    .desc = { ent-Paper.desc }
+ent-PaperMailNFPaperPusherAd = { ent-Paper }
+    .suffix = paper pusher
+    .desc = { ent-Paper.desc }
+ent-PaperMailNFPetBedAssemblyManual = pet bed assembly manual
+    .suffix = pet bed assembly manual
+    .desc = { ent-Paper.desc }
+ent-PaperMailNTBoxer = { ent-Paper }
+    .suffix = boxer
+    .desc = { ent-Paper.desc }
+ent-PaperMailNFPipebombIntern = { ent-Paper }
+    .suffix = pipe bomb intern
+    .desc = { ent-Paper.desc }
+ent-PaperMailNFAntivirus = Snortin Antivirus invoice
+    .suffix = antivirus ad
+    .desc = { ent-Paper.desc }
+ent-PaperMailNFEMPPreparedness = EMP preparedness response form
+    .suffix = emp preparedness
+    .desc = { ent-Paper.desc }
+ent-PaperMailNFBuildABuddy = Build-a-Buddy adoption letter
+    .suffix = build-a-buddy
+    .desc = { ent-Paper.desc }
+ent-PaperMailNFSpaceLaw = { ent-Paper }
+    .suffix = space-law
+    .desc = { ent-Paper.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/launchers/launchers.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/launchers/launchers.ftl
index a933fb4c5e6..4d779c8efce 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/launchers/launchers.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/launchers/launchers.ftl
@@ -26,3 +26,5 @@ ent-WeaponLauncherAdmemeMeteorLarge = meteor launcher
 ent-WeaponLauncherAdmemeImmovableRodSlow = immovable rod launcher
     .desc = It fires slow immovable rods.
     .suffix = Admeme
+ent-WeaponMailLake = mail RPDS
+    .desc = Rap(b?)id Parcel Delivery System
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/e_sword.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/e_sword.ftl
index 844ea3de085..6db849c29d8 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/e_sword.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/e_sword.ftl
@@ -2,6 +2,8 @@ ent-EnergySword = energy sword
     .desc = A very loud & dangerous sword with a beam made of pure, concentrated plasma. Cuts through unarmored targets like butter.
 ent-EnergySwordHoS = antique energy sword
     .desc = An elegant weapon fit for a prince, this otherwise plain silver hilt is engraved with, "My Love".
+ent-EnergySwordHoS = antique energy sword
+    .desc = An elegant weapon fit for a prince, this otherwise plain silver hilt is engraved with, "My Love".
 ent-EnergyDagger = pen
     .desc = A dark ink pen.
     .suffix = E-Dagger
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/asteroid.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/asteroid.ftl
index 2869d379528..f13ad8a27dd 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/asteroid.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/asteroid.ftl
@@ -39,6 +39,12 @@ ent-AsteroidRockBananium = { ent-AsteroidRock }
 ent-AsteroidRockArtifactFragment = { ent-AsteroidRock }
     .desc = A rock wall. What's that sticking out of it?
     .suffix = Artifact Fragment
+ent-AsteroidRockBluespace = { ent-AsteroidRock }
+    .desc = A rock wall. What's that sticking out of it?
+    .suffix = Bluespace
+ent-AsteroidRockNormality = { ent-AsteroidRock }
+    .desc = A rock wall. What's that sticking out of it?
+    .suffix = Normality
 ent-AsteroidRockMining = asteroid rock
     .desc = An asteroid.
     .suffix = higher ore yield .33
@@ -84,6 +90,12 @@ ent-WallRockArtifactFragment = { ent-WallRock }
 ent-WallRockSalt = { ent-WallRock }
     .desc = An ore vein rich with salt.
     .suffix = Salt
+ent-WallRockBluespace = { ent-WallRock }
+    .desc = A rock wall. What's that sticking out of it?
+    .suffix = Bluespace
+ent-WallRockNormality = { ent-WallRock }
+    .desc = A rock wall. What's that sticking out of it?
+    .suffix = Normality
 ent-WallRockBasalt = basalt
     .desc = { ent-WallRock.desc }
 ent-WallRockBasaltCoal = { ent-WallRockBasalt }
@@ -116,6 +128,12 @@ ent-WallRockBasaltArtifactFragment = { ent-WallRockBasalt }
 ent-WallRockBasaltSalt = { ent-WallRockBasalt }
     .desc = An ore vein rich with salt.
     .suffix = Salt
+ent-WallRockBasaltBluespace = { ent-WallRockBluespace }
+    .desc = A rock wall. What's that sticking out of it?
+    .suffix = Bluespace
+ent-WallRockBasaltNormality = { ent-WallRockNormality }
+    .desc = A rock wall. What's that sticking out of it?
+    .suffix = Normality
 ent-WallRockSnow = snowdrift
     .desc = { ent-WallRock.desc }
 ent-WallRockSnowCoal = { ent-WallRockSnow }
@@ -148,6 +166,12 @@ ent-WallRockSnowArtifactFragment = { ent-WallRockSnow }
 ent-WallRockSnowSalt = { ent-WallRockSnow }
     .desc = An ore vein rich with salt.
     .suffix = Salt
+ent-WallRockSnowBluespace = { ent-WallRockSnow }
+    .desc = A rock wall. What's that sticking out of it?
+    .suffix = Bluespace
+ent-WallRockSnowNormality = { ent-WallRockSnow }
+    .desc = A rock wall. What's that sticking out of it?
+    .suffix = Normality
 ent-WallRockSand = sandstone
     .desc = { ent-WallRock.desc }
 ent-WallRockSandCoal = { ent-WallRockSand }
@@ -180,6 +204,12 @@ ent-WallRockSandArtifactFragment = { ent-WallRockSand }
 ent-WallRockSandSalt = { ent-WallRockSand }
     .desc = An ore vein rich with salt.
     .suffix = Salt
+ent-WallRockSandBluespace = { ent-WallRockSand }
+    .desc = A rock wall. What's that sticking out of it?
+    .suffix = Bluespace
+ent-WallRockSandNormality = { ent-WallRockSand }
+    .desc = A rock wall. What's that sticking out of it?
+    .suffix = Normality
 ent-WallRockChromite = chromite
     .desc = { ent-WallRock.desc }
 ent-WallRockChromiteCoal = { ent-WallRockChromite }
@@ -212,6 +242,12 @@ ent-WallRockChromiteArtifactFragment = { ent-WallRockChromite }
 ent-WallRockChromiteSalt = { ent-WallRockChromite }
     .desc = An ore vein rich with salt.
     .suffix = Salt
+ent-WallRockChromiteBluespace = { ent-WallRockChromite }
+    .desc = A rock wall. What's that sticking out of it?
+    .suffix = Bluespace
+ent-WallRockChromiteNormality = { ent-WallRockChromite }
+    .desc = A rock wall. What's that sticking out of it?
+    .suffix = Normality
 ent-WallRockAndesite = andesite
     .desc = { ent-WallRock.desc }
 ent-WallRockAndesiteCoal = { ent-WallRockAndesite }
@@ -244,3 +280,9 @@ ent-WallRockAndesiteArtifactFragment = { ent-WallRockAndesite }
 ent-WallRockAndesiteSalt = { ent-WallRockAndesite }
     .desc = An ore vein rich with salt.
     .suffix = Salt
+ent-WallRockAndesiteBluespace = { ent-WallRockAndesite }
+    .desc = A rock wall. What's that sticking out of it?
+    .suffix = Bluespace
+ent-WallRockAndesiteNormality = { ent-WallRockAndesite }
+    .desc = A rock wall. What's that sticking out of it?
+    .suffix = Normality
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/research/crystals.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/research/crystals.ftl
index 7cda2dc404c..dc19661ab29 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/research/crystals.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/research/crystals.ftl
@@ -1,2 +1,14 @@
 ent-CrystalNormality = normality crystal
     .desc = It looks... normal. Placeholder sprite.
+ent-MaterialNormality = normality crystal
+    .suffix = Full
+    .desc = { ent-MaterialBase.desc }
+ent-MaterialNormality1 = { ent-MaterialNormality }
+    .suffix = 1
+    .desc = { ent-MaterialNormality.desc }
+ent-MaterialNormality3 = { ent-MaterialNormality1 }
+    .suffix = 3
+    .desc = { ent-MaterialNormality1.desc }
+ent-MaterialNormality5 = { ent-MaterialNormality1 }
+    .suffix = 5
+    .desc = { ent-MaterialNormality1.desc }
diff --git a/Resources/Locale/en-US/traits/misc.ftl b/Resources/Locale/en-US/traits/misc.ftl
new file mode 100644
index 00000000000..b76dfa97299
--- /dev/null
+++ b/Resources/Locale/en-US/traits/misc.ftl
@@ -0,0 +1 @@
+examine-cybereyes-message = {$entity}'s eyes shine with a faint inner light.
diff --git a/Resources/Locale/en-US/traits/traits.ftl b/Resources/Locale/en-US/traits/traits.ftl
index 31770a33e45..1c16a944216 100644
--- a/Resources/Locale/en-US/traits/traits.ftl
+++ b/Resources/Locale/en-US/traits/traits.ftl
@@ -352,4 +352,45 @@ trait-description-HighDampening =
 trait-name-Azaziba = Sinta'Azaziba
 trait-description-Azaziba =
     A language of Moghes consisting of a combination of spoken word and gesticulation.
-    While waning since Moghes entered the galactic stage - it enjoys popular use by Unathi that never fell to the Hegemony's cultural dominance.
\ No newline at end of file
+    While waning since Moghes entered the galactic stage - it enjoys popular use by Unathi that never fell to the Hegemony's cultural dominance.
+
+trait-name-BionicArm = Bionic Arm
+trait-description-BionicArm =
+    One or more of your limbs have been replaced with an expensive, state of the art bionic. It could be either one made of highly realistic synthflesh,
+    or a more obvious metal limb. This limb provides enhanced strength to its user, allowing one to pry open barriers with their bare hands.
+
+trait-name-PlateletFactories = Platelet Factories
+trait-description-PlateletFactories =
+    Your body has been augmented with a series of biotailored organs that enhance the owner's long term survivability. These organs will attempt
+    to keep the user alive, even in the face of advanced trauma, all the way up until - but not including - death.
+    Your natural healing is no longer capped, and will now slowly heal any damage type. This includes more exotic injuries like radiation exposure, or cancer.
+
+trait-name-DermalArmor = Dermal Armor
+trait-description-DermalArmor =
+    Your skin has been replaced with a flexible, yet sturdy, hard-polymer shell wrapped in a layer of synthetic flesh.
+    This augmentation provides an innate 10% resistance to physical damage.
+
+trait-name-CyberEyes = Cyber-Eyes Basic System
+trait-description-CyberEyes =
+    One or more of your eyes have been replaced with a highly modular mechanical ocular implant.
+    Their most basic functionality is to provide amelioration for weaknesses of the wearer's natural eyes,
+    but additionally these implants provide protection from bright flashes of light.
+
+trait-name-CyberEyesSecurity = Cyber-Eyes SecHud
+trait-description-CyberEyesSecurity =
+    Your Cyber-Eyes have been upgraded to include a built-in Security Hud. Note that this augmentation is considered Contraband
+    for anyone not under the employ of station Security personel, and may be disabled by your employer before dispatch to the station.
+
+trait-name-CyberEyesMedical = Cyber-Eyes MedHud
+trait-description-CyberEyesMedical =
+    Your Cyber-Eyes have been upgraded to include a built-in Medical Hud, allowing you to track the relative health condition of biological organisms.
+
+trait-name-CyberEyesDiagnostic = Cyber-Eyes DiagHud
+trait-description-CyberEyesDiagnostic =
+    Your Cyber-Eyes have been upgraded to include a built-in Diagnostic Hud, allowing you to track the condition of synthetic entities.
+
+trait-name-CyberEyesOmni = Cyber-Eyes HudSuite
+trait-description-CyberEyesOmni =
+    This expensive implant provides the combined benefits of a SecHud, MedHud, and a DiagHud.
+    Note that this augmentation is considered Contraband for anyone not under the employ of station Security personel,
+    and may be disabled by your employer before dispatch to the station.
diff --git a/Resources/Locale/ru-RU/Mail/commands.ftl b/Resources/Locale/ru-RU/Mail/commands.ftl
new file mode 100644
index 00000000000..e74fb0caeb1
--- /dev/null
+++ b/Resources/Locale/ru-RU/Mail/commands.ftl
@@ -0,0 +1,18 @@
+# Mailto
+command-mailto-description = Поставьте посылку в очередь для доставки юридическому лицу. Пример использования: `mailto 1234 5678 false false`. Содержимое целевого контейнера будет перенесено в реальную почтовую посылку.
+command-mailto-help = Использование: { $command } <recipient entityUid> <container entityUid> [is-fragile: true or false] [is-priority: true or false] [is-large: true or false, optional]
+command-mailto-no-mailreceiver = Целевой объект не имеет получателя { $requiredComponent }.
+command-mailto-no-blankmail = Прототип { $blackmail } не существует. Что-то явно не так. Обратитесь к программисту.
+command-mailto-bogus-mail = { $blankMail } не было в { $requiredMailComponent }. Что-то явно не так. Обратитесь к программисту.
+command-mailto-invalid-container = Целевой объект-контейнер не имеет { $requiredContainer } контейнера.
+command-mailto-unable-to-receive = Не удалось настроить целевой объект-получателя для получения почты. Возможно, отсутствует ID.
+command-mailto-no-teleporter-found = Объект-получатель не удалось сопоставить с почтовым телепортом какой-либо станции. Возможно, получатель находится за пределами станции.
+command-mailto-success = Успех! Посылка почты поставлена в очередь на следующую телепортацию через { $timeToTeleport } секунд.
+# Mailnow
+command-mailnow = Заставьте все почтовые телепорты доставить еще одну партию почты как можно скорее. Это не позволит обойти ограничение на количество недоставленных писем.
+command-mailnow-help = Использование: { $command }
+command-mailnow-success = Успех! Все почтовые телепорты скоро доставят еще одну партию почты.
+# Mailtestbulk
+command-mailtestbulk = Отправляет по одной посылке каждого типа на указанный почтовый телепортатор.  Неявно вызывает партию почты сейчас.
+command-mailtestbulk-help = Использование: { $command } <teleporter_id>
+command-mailtestbulk-success = Успех! Все почтовые телепорты скоро доставят еще одну партию почты.
diff --git a/Resources/Locale/ru-RU/Mail/mail.ftl b/Resources/Locale/ru-RU/Mail/mail.ftl
index 655ce4d78ce..ebd9c1a39d4 100644
--- a/Resources/Locale/ru-RU/Mail/mail.ftl
+++ b/Resources/Locale/ru-RU/Mail/mail.ftl
@@ -3,26 +3,18 @@ mail-invalid-access = Имя получателя и должность совп
 mail-locked = Замок от несанкционированного доступа не снимался. Коснитесь ID.
 mail-desc-far = Посылка почты. С такого расстояния не разобрать, кому оно адресовано.
 mail-desc-close = Посылка почты, адресованная { CAPITALIZE($name) }, { $job }.
-mail-desc-fragile = Оно имеет [color=red]красную хрупкую этикетку.[/color].
+mail-desc-fragile = На нем есть красная этикетка [color=red]'хрупкий'[/color].
 mail-desc-priority = Замок с защитой от несанкционированного доступа [color=yellow]с желтой приоритетной лентой[/color] активна. Лучше доставить это вовремя!
 mail-desc-priority-inactive = Замок с защитой от несанкционированного доступа [color=#886600]с желтой приоритетной лентой[/color] неактивен.
 mail-unlocked = Система защиты от взлома разблокирована.
 mail-unlocked-by-emag = Система защиты от взлома *БЗЗЗТ*.
-mail-unlocked-reward = Система защиты от взлома { $bounty } спесо добавлены на аккаунт отдела снабжения.
+mail-unlocked-reward = Система защиты от взлома { $bounty } кредиты добавлены на аккаунт отдела снабжения.
 mail-penalty-lock = ЗАМОК ЗАЩИТЫ ОТ ВЗЛОМА СЛОМАН. ОТДЕЛ СНАБЖЕНИЯ ПОЛУЧИЛ САНКЦИЮ В { $credits } КРЕДИТОВ.
 mail-penalty-fragile = ЦЕЛОСТНОСТЬ НАРУШЕНА. ОТДЕЛ СНАБЖЕНИЯ ПОЛУЧИЛ САНКЦИЮ В { $credits } КРЕДИТОВ.
 mail-penalty-expired = СРОК ДОСТАВКИ НАРУШЕН. ОТДЕЛ СНАБЖЕНИЯ ПОЛУЧИЛ САНКЦИЮ В { $credits } КРЕДИТОВ.
 mail-item-name-unaddressed = почта
 mail-item-name-addressed = почта ({ $recipient })
-command-mailto-description = Queue a parcel to be delivered to an entity. Example usage: `mailto 1234 5678 false false`. The target container's contents will be transferred to an actual mail parcel.
-command-mailto-help = Usage: { $command } <recipient entityUid> <container entityUid> [is-fragile: true or false] [is-priority: true or false]
-command-mailto-no-mailreceiver = Target recipient entity does not have a { $requiredComponent }.
-command-mailto-no-blankmail = The { $blankMail } prototype doesn't exist. Something is very wrong. Contact a programmer.
-command-mailto-bogus-mail = { $blankMail } did not have { $requiredMailComponent }. Something is very wrong. Contact a programmer.
-command-mailto-invalid-container = Target container entity does not have a { $requiredContainer } container.
-command-mailto-unable-to-receive = Target recipient entity was unable to be setup for receiving mail. ID may be missing.
-command-mailto-no-teleporter-found = Target recipient entity was unable to be matched to any station's mail teleporter. Recipient may be off-station.
-command-mailto-success = Success! Mail parcel has been queued for next teleport in { $timeToTeleport } seconds.
-command-mailnow = Force all mail teleporters to deliver another round of mail as soon as possible. This will not bypass the undelivered mail limit.
-command-mailnow-help = Usage: { $command }
-command-mailnow-success = Success! All mail teleporters will be delivering another round of mail soon.
+mail-large-item-name-unaddressed = посылка
+mail-large-item-name-addressed = посылка ({ $recipient })
+mail-large-desc-far = Большая посылка.
+mail-large-desc-close = Большая посылка адресованная { CAPITALIZE($name) }, { $job }.
diff --git a/Resources/Locale/ru-RU/deltav/cartridge-loader/cartridges.ftl b/Resources/Locale/ru-RU/deltav/cartridge-loader/cartridges.ftl
index f84c95de1f6..8766e3e77ff 100644
--- a/Resources/Locale/ru-RU/deltav/cartridge-loader/cartridges.ftl
+++ b/Resources/Locale/ru-RU/deltav/cartridge-loader/cartridges.ftl
@@ -119,3 +119,15 @@ crime-assist-sophont-explanation =
     • [bold]Чувствительность[/bold]: сущность обладает способностью воспринимать эмоции или их отсутствие, или, как минимум, способностью осознавать свою собственную боль.
     • [bold]Самосознание[/bold]: сущность способна изменять свое поведение разумным образом в результате воздействия раздражителей или, как минимум, способна осознавать свой собственный разум и чувствительность.
     Любое разумное существо считается юридическим лицом, независимо от происхождения или предшествующего когнитивного статуса. Как и любой другой разумный органик, разумное существо может выдвинуть обвинения против команды и предстать перед судом за преступления.
+mail-metrics-program-name = ПочтаOS
+mail-metrics-header = Доход от доставки почты
+mail-metrics-opened = Прибыль (Открытые)
+mail-metrics-expired = Потери (Истекшие)
+mail-metrics-damaged = Потери (Поврежденные)
+mail-metrics-tampered = Потери (Испорченные)
+mail-metrics-unopened = Неоткрытый
+mail-metrics-count-header = Набор
+mail-metrics-money-header = Кредиты
+mail-metrics-total = Всего
+mail-metrics-progress = { $opened } из { $total } открытых посылок!!
+mail-metrics-progress-percent = Процент успешности: { $successRate }%
diff --git a/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl b/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl
index abae09143e5..9595f266cf3 100644
--- a/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl
+++ b/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl
@@ -1,267 +1,260 @@
 ## General stuff
 
-ui-options-title = Game Options
-ui-options-tab-graphics = Graphics
-ui-options-tab-controls = Controls
-ui-options-tab-audio = Audio
-ui-options-tab-network = Network
-ui-options-tab-misc = General
-ui-options-apply = Apply
-ui-options-reset-all = Reset All
-ui-options-default = Default
+ui-options-title = Игровые настройки
+ui-options-tab-graphics = Графика
+ui-options-tab-controls = Управление
+ui-options-tab-audio = Аудио
+ui-options-tab-network = Сеть
+ui-options-tab-misc = Основные
+ui-options-apply = Сохранить и применить
+ui-options-reset-all = Сброс изменений
+ui-options-default = Сброс к настройкам по умолчанию
 
 # Misc/General menu
 
-ui-options-discordrich = Enable Discord Rich Presence
-ui-options-general-ui-style = UI Style
+ui-options-discordrich = Включить Discord Rich Presence
+ui-options-general-ui-style = Стиль UI
 ui-options-general-discord = Discord
-ui-options-general-cursor = Cursor
-ui-options-general-speech = Speech
-ui-options-general-storage = Storage
-ui-options-general-accessibility = Accessibility
+ui-options-general-cursor = Курсор
+ui-options-general-speech = Речь
+ui-options-general-storage = Инвентарь
+ui-options-general-accessibility = Доступность
 
 ## Audio menu
 
-ui-options-master-volume = Master Volume:
-ui-options-midi-volume = MIDI (Instrument) Volume:
-ui-options-ambient-music-volume = Ambient music volume:
-ui-options-ambience-volume = Ambience volume:
-ui-options-lobby-volume = Lobby & Round-end volume:
-ui-options-interface-volume = Interface volume:
-ui-options-ambience-max-sounds = Ambience simultaneous sounds:
-ui-options-announcer-volume = Announcer volume:
-ui-options-lobby-music = Lobby & Round-end Music
-ui-options-restart-sounds = Round Restart Sounds
-ui-options-event-music = Event Music
-ui-options-announcer-disable-multiple-sounds = Disable Overlapping Announcer Sounds
-ui-options-announcer-disable-multiple-sounds-tooltip = Some announcements will not sound right, this setting isn't recommended
-ui-options-admin-sounds = Play Admin Sounds
-ui-options-volume-label = Volume
+ui-options-master-volume = Основная громкость:
+ui-options-midi-volume = Громкость MIDI (Муз. инструменты):
+ui-options-ambient-music-volume = Громкость музыки окружения:
+ui-options-ambience-volume = Громкость окружения:
+ui-options-lobby-volume = Громкость лобби и окончания раунда:
+ui-options-announcer-volume = Громкость диктора:
+ui-options-interface-volume = Громкость интерфейса:
+ui-options-ambience-max-sounds = Кол-во одновременных звуков окружения:
+ui-options-lobby-music = Музыка в лобби
+ui-options-announcer-disable-multiple-sounds = Выключить многократное объявления.
+ui-options-announcer-disable-multiple-sounds-tooltip = Некоторые объявления будут звучать неправильно, эта настройка не рекомендуется
+ui-options-restart-sounds = Звуки перезапуска раунда
+ui-options-event-music = Музыка событий
 ui-options-volume-percent = { TOSTRING($volume, "P0") }
+ui-options-admin-sounds = Музыка админов
+ui-options-volume-label = Громкость
+ui-options-show-offer-mode-indicators = Показывать индикаторы режима предложения с помощью курсора
 
 ## Graphics menu
 
-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-ooc-patron-color = Show OOC Patreon color
-ui-options-show-looc-on-head = Show LOOC chat above characters head
-ui-options-fancy-speech = Show names in speech bubbles
-ui-options-fancy-name-background = Add background to speech bubble names
-ui-options-enable-color-name = Add colors to character names
-ui-options-colorblind-friendly = Colorblind friendly mode
-ui-options-no-filters = Disable species vision filters
-ui-options-reduced-motion = Reduce motion of visual effects
-ui-options-chat-window-opacity = Chat window opacity
+ui-options-show-held-item = Показать удерживаемый элемент рядом с курсором
+ui-options-show-combat-mode-indicators = Показать индикатор боевого режима рядом с курсором
+ui-options-opaque-storage-window = Непрозрачность окна хранилища
+ui-options-no-filters = Отключить фильтры зрения
+ui-options-show-ooc-patron-color = Цветной ник в OOC для патронов с Patreon
+ui-options-show-looc-on-head = Показывать LOOC-чат над головами персонажей
 ui-options-chat-window-opacity-percent = { TOSTRING($opacity, "P0") }
-ui-options-screen-shake-intensity = Screen shake intensity
+ui-options-fancy-speech = Показывать имена в облачках с текстом
 ui-options-screen-shake-percent = { TOSTRING($intensity, "P0") }
-ui-options-vsync = VSync
-ui-options-fullscreen = Fullscreen
-ui-options-lighting-label = Lighting Quality:
-ui-options-lighting-very-low = Very Low
-ui-options-lighting-low = Low
-ui-options-lighting-medium = Medium
-ui-options-lighting-high = High
-ui-options-scale-label = UI Scale:
-ui-options-scale-auto = Automatic ({ TOSTRING($scale, "P0") })
+ui-options-fancy-name-background = Добавить фон облачкам с текстом
+ui-options-vsync = Вертикальная синхронизация
+ui-options-fullscreen = Полный экран
+ui-options-lighting-label = Качество освещения:
+ui-options-lighting-very-low = Очень низкое
+ui-options-lighting-low = Низкое
+ui-options-lighting-medium = Среднее
+ui-options-lighting-high = Высокое
+ui-options-scale-label = Масштаб UI:
+ui-options-scale-auto = Автоматическое ({ TOSTRING($scale, "P0") })
 ui-options-scale-75 = 75%
 ui-options-scale-100 = 100%
 ui-options-scale-125 = 125%
 ui-options-scale-150 = 150%
 ui-options-scale-175 = 175%
 ui-options-scale-200 = 200%
-ui-options-hud-theme = HUD theme:
-ui-options-hud-theme-default = Default
-ui-options-hud-theme-plasmafire = Plasmafire
-ui-options-hud-theme-slimecore = Slimecore
-ui-options-hud-theme-clockwork = Clockwork
-ui-options-hud-theme-retro = Retro
-ui-options-hud-theme-minimalist = Minimalist
-ui-options-hud-theme-ashen = Ashen
-ui-options-vp-stretch = Stretch viewport to fit game window
-ui-options-vp-scale = Fixed viewport scale: x{ $scale }
-ui-options-vp-integer-scaling = Prefer integer scaling (might cause black bars/clipping)
+ui-options-hud-theme = Тема HUD:
+ui-options-hud-theme-default = По умолчанию
+ui-options-hud-theme-plasmafire = Плазма
+ui-options-hud-theme-slimecore = Слаймкор
+ui-options-hud-theme-clockwork = Механизм
+ui-options-hud-theme-retro = Ретро
+ui-options-hud-theme-minimalist = Минимализм
+ui-options-hud-theme-ashen = Пепел
+ui-options-vp-stretch = Растянуть изображение для соответствия окну игры
+ui-options-vp-scale = Фиксированный масштаб окна игры:
+ui-options-vp-integer-scaling = Использовать целочисленное масштабирование (может вызывать появление чёрных полос/обрезания)
 ui-options-vp-integer-scaling-tooltip =
-    If this option is enabled, the viewport will be scaled using an integer value
-    at specific resolutions. While this results in crisp textures, it also often
-    means that black bars appear at the top/bottom of the screen or that part
-    of the viewport is not visible.
-ui-options-vp-low-res = Low-resolution viewport
-ui-options-parallax-low-quality = Low-quality Parallax (background)
-ui-options-fps-counter = Show FPS counter
-ui-options-vp-width = Viewport width: { $width }
-ui-options-hud-layout = HUD layout:
+    Если эта опция включена, область просмотра будет масштабироваться,
+    используя целочисленное значение при определённых разрешениях. Хотя это и
+    приводит к чётким текстурам, это часто означает, что сверху/снизу экрана будут
+    чёрные полосы или что часть окна не будет видна.
+    Когда функция включена, основное окно просмотра не будет учитывать горизонтальную ось
+    при подгонке под ваш экран. Если ваш экран меньше, чем окно просмотра,
+    то это приведёт к его обрезанию по горизонтальной оси.
+ui-options-vp-low-res = Изображение низкого разрешения
+ui-options-parallax-low-quality = Низкокачественный параллакс (фон)
+ui-options-fps-counter = Показать счётчик FPS
+ui-options-vp-width = Ширина окна игры:
+ui-options-hud-layout = Тип HUD:
 
 ## Controls menu
 
-ui-options-binds-reset-all = Reset ALL keybinds
-ui-options-binds-explanation = Click to change binding, right-click to clear
-ui-options-unbound = Unbound
-ui-options-bind-reset = Reset
-ui-options-key-prompt = Press a key...
-ui-options-header-movement = Movement
-ui-options-header-camera = Camera
-ui-options-header-interaction-basic = Basic Interaction
-ui-options-header-interaction-adv = Advanced Interaction
-ui-options-header-ui = User Interface
-ui-options-header-misc = Miscellaneous
-ui-options-header-hotbar = Hotbar
-ui-options-header-shuttle = Shuttle
-ui-options-header-map-editor = Map Editor
-ui-options-header-dev = Development
-ui-options-header-general = General
-ui-options-hotkey-keymap = Use US QWERTY Keys
-ui-options-hotkey-toggle-walk = Toggle Speed
-ui-options-hotkey-default-walk = Walk by default
-ui-options-function-move-up = Move Up
-ui-options-function-move-left = Move Left
-ui-options-function-move-down = Move Down
-ui-options-function-move-right = Move Right
-ui-options-function-walk = Change Speed
-ui-options-function-camera-rotate-left = Rotate left
-ui-options-function-camera-rotate-right = Rotate right
-ui-options-function-camera-reset = Reset
-ui-options-function-zoom-in = Zoom in
-ui-options-function-zoom-out = Zoom out
-ui-options-function-reset-zoom = Reset zoom
-ui-options-function-use = Use
-ui-options-function-use-secondary = Use secondary
-ui-options-function-alt-use = Alt use
-ui-options-function-wide-attack = Wide attack
-ui-options-function-activate-item-in-hand = Activate item in hand
-ui-options-function-alt-activate-item-in-hand = Alternative activate item in hand
-ui-options-function-activate-item-in-world = Activate item in world
-ui-options-function-alt-activate-item-in-world = Alternative activate item in world
-ui-options-function-drop = Drop item
-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-function-save-item-location = Save item location
-ui-options-function-toggle-standing = Toggle standing
-ui-options-static-storage-ui = Lock storage window to hotbar
-ui-options-function-smart-equip-backpack = Smart-equip to backpack
-ui-options-function-smart-equip-belt = Smart-equip to belt
-ui-options-function-open-backpack = Open backpack
-ui-options-function-open-belt = Open belt
-ui-options-function-throw-item-in-hand = Throw item
-ui-options-function-try-pull-object = Pull object
-ui-options-function-move-pulled-object = Move pulled object
-ui-options-function-release-pulled-object = Release pulled object
-ui-options-function-point = Point at location
-ui-options-function-focus-chat-input-window = Focus chat
-ui-options-function-focus-local-chat-window = Focus chat (IC)
-ui-options-function-focus-emote = Focus chat (Emote)
-ui-options-function-focus-whisper-chat-window = Focus chat (Whisper)
-ui-options-function-focus-radio-window = Focus chat (Radio)
-ui-options-function-focus-looc-window = Focus chat (LOOC)
-ui-options-function-focus-ooc-window = Focus chat (OOC)
-ui-options-function-focus-admin-chat-window = Focus chat (Admin)
-ui-options-function-focus-dead-chat-window = Focus chat (Dead)
-ui-options-function-focus-console-chat-window = Focus chat (Console)
-ui-options-function-cycle-chat-channel-forward = Cycle channel (Forward)
-ui-options-function-cycle-chat-channel-backward = Cycle channel (Backward)
-ui-options-function-open-character-menu = Open character menu
-ui-options-function-open-context-menu = Open context menu
-ui-options-function-open-crafting-menu = Open crafting menu
-ui-options-function-open-inventory-menu = Open inventory
-ui-options-function-open-a-help = Open admin help
-ui-options-function-open-abilities-menu = Open action menu
-ui-options-function-open-entity-spawn-window = Open entity spawn menu
-ui-options-function-open-sandbox-window = Open sandbox menu
-ui-options-function-open-tile-spawn-window = Open tile spawn menu
-ui-options-function-open-decal-spawn-window = Open decal spawn menu
-ui-options-function-open-admin-menu = Open admin menu
-ui-options-function-open-guidebook = Open guidebook
-ui-options-function-window-close-all = Close all windows
-ui-options-function-window-close-recent = Close recent window
-ui-options-function-show-escape-menu = Toggle game menu
-ui-options-function-escape-context = Close recent window or toggle game menu
-ui-options-function-take-screenshot = Take screenshot
-ui-options-function-take-screenshot-no-ui = Take screenshot (without UI)
-ui-options-function-toggle-fullscreen = Toggle fullscreen
-ui-options-function-editor-place-object = Place object
-ui-options-function-editor-cancel-place = Cancel placement
-ui-options-function-editor-grid-place = Place in grid
-ui-options-function-editor-line-place = Place line
-ui-options-function-editor-rotate-object = Rotate
-ui-options-function-editor-flip-object = Flip
-ui-options-function-editor-copy-object = Copy
-ui-options-function-open-abilities-menu = Open action menu
-ui-options-function-show-debug-console = Open Console
-ui-options-function-show-debug-monitors = Show Debug Monitors
-ui-options-function-inspect-entity = Inspect Entity
-ui-options-function-hide-ui = Hide UI
-ui-options-function-hotbar1 = Hotbar slot 1
-ui-options-function-hotbar2 = Hotbar slot 2
-ui-options-function-hotbar3 = Hotbar slot 3
-ui-options-function-hotbar4 = Hotbar slot 4
-ui-options-function-hotbar5 = Hotbar slot 5
-ui-options-function-hotbar6 = Hotbar slot 6
-ui-options-function-hotbar7 = Hotbar slot 7
-ui-options-function-hotbar8 = Hotbar slot 8
-ui-options-function-hotbar9 = Hotbar slot 9
-ui-options-function-hotbar0 = Hotbar slot 0
-ui-options-function-loadout1 = Hotbar Loadout 1
-ui-options-function-loadout2 = Hotbar Loadout 2
-ui-options-function-loadout3 = Hotbar Loadout 3
-ui-options-function-loadout4 = Hotbar Loadout 4
-ui-options-function-loadout5 = Hotbar Loadout 5
-ui-options-function-loadout6 = Hotbar Loadout 6
-ui-options-function-loadout7 = Hotbar Loadout 7
-ui-options-function-loadout8 = Hotbar Loadout 8
-ui-options-function-loadout9 = Hotbar Loadout 9
-ui-options-function-loadout0 = Hotbar Loadout 0
-ui-options-function-shuttle-strafe-up = Strafe up
-ui-options-function-shuttle-strafe-right = Strafe right
-ui-options-function-shuttle-strafe-left = Strafe left
-ui-options-function-shuttle-strafe-down = Strafe down
-ui-options-function-shuttle-rotate-left = Rotate left
-ui-options-function-shuttle-rotate-right = Rotate right
-ui-options-function-shuttle-brake = Brake
-
-## Network menu
-
-ui-options-net-predict = Client-side prediction
-ui-options-net-interp-ratio = State buffer size
+ui-options-binds-reset-all = Сбросить ВСЕ привязки
+ui-options-binds-explanation = ЛКМ — изменить кнопку, ПКМ — убрать кнопку
+ui-options-unbound = Пусто
+ui-options-bind-reset = Сбросить
+ui-options-key-prompt = Нажмите кнопку...
+ui-options-header-movement = Перемещение
+ui-options-header-camera = Камера
+ui-options-header-interaction-basic = Базовые взаимодействия
+ui-options-header-interaction-adv = Продвинутые взаимодействия
+ui-options-header-ui = Интерфейс
+ui-options-header-misc = Разное
+ui-options-header-hotbar = Хотбар
+ui-options-header-shuttle = Шаттл
+ui-options-header-map-editor = Редактор карт
+ui-options-hotkey-default-walk = Ходить по умолчанию
+ui-options-header-dev = Разработка
+ui-options-header-general = Основное
+ui-options-hotkey-keymap = Использовать клавиши QWERTY (США)
+ui-options-hotkey-toggle-walk = Переключать шаг\бег
+ui-options-function-move-up = Двигаться вверх
+ui-options-function-move-left = Двигаться налево
+ui-options-function-move-down = Двигаться вниз
+ui-options-function-move-right = Двигаться направо
+ui-options-function-walk = Идти
+ui-options-function-camera-rotate-left = Повернуть налево
+ui-options-function-camera-rotate-right = Повернуть направо
+ui-options-function-camera-reset = Сбросить камеру
+ui-options-function-zoom-in = Приблизить
+ui-options-function-zoom-out = Отдалить
+ui-options-function-reset-zoom = Сбросить
+ui-options-function-use = Использовать
+ui-options-function-use-secondary = Использовать вторично
+ui-options-function-alt-use = Альтернативное использование
+ui-options-function-wide-attack = Размашистая атака
+ui-options-function-activate-item-in-hand = Использовать предмет в руке
+ui-options-function-alt-activate-item-in-hand = Альтернативно использовать предмет в руке
+ui-options-function-activate-item-in-world = Использовать предмет в мире
+ui-options-function-alt-activate-item-in-world = Альтернативно использовать предмет в мире
+ui-options-function-drop = Положить предмет
+ui-options-function-offer-item = Предложи что-нибудь
+ui-options-function-examine-entity = Осмотреть
+ui-options-function-toggle-standing = Переключать лежание
+ui-options-function-swap-hands = Поменять руки
+ui-options-function-move-stored-item = Переместить хранящийся объект
+ui-options-function-rotate-stored-item = Повернуть хранящийся объект
+ui-options-function-save-item-location = Сохранить расположение объекта
+ui-options-static-storage-ui = Закрепить интерфейс хранилища на хотбаре
+ui-options-function-smart-equip-backpack = Умная экипировка в рюкзак
+ui-options-function-smart-equip-belt = Умная экипировка на пояс
+ui-options-function-open-backpack = Открыть рюкзак
+ui-options-function-open-belt = Открыть пояс
+ui-options-function-throw-item-in-hand = Бросить предмет
+ui-options-function-try-pull-object = Тянуть объект
+ui-options-function-move-pulled-object = Тянуть объект в сторону
+ui-options-function-release-pulled-object = Перестать тянуть объект
+ui-options-function-point = Указать на что-либо
+ui-options-function-focus-chat-input-window = Писать в чат
+ui-options-function-focus-local-chat-window = Писать в чат (IC)
+ui-options-function-focus-emote = Писать в чат (Emote)
+ui-options-function-focus-whisper-chat-window = Писать в чат (Шёпот)
+ui-options-function-focus-radio-window = Писать в чат (Радио)
+ui-options-function-focus-looc-window = Писать в чат (LOOC)
+ui-options-function-focus-ooc-window = Писать в чат (OOC)
+ui-options-function-focus-admin-chat-window = Писать в чат (Админ)
+ui-options-function-focus-dead-chat-window = Писать в чат (Мёртвые)
+ui-options-function-focus-console-chat-window = Писать в чат (Консоль)
+ui-options-function-cycle-chat-channel-forward = Переключение каналов чата (Вперёд)
+ui-options-function-cycle-chat-channel-backward = Переключение каналов чата (Назад)
+ui-options-function-open-character-menu = Открыть меню персонажа
+ui-options-function-open-context-menu = Открыть контекстное меню
+ui-options-function-open-crafting-menu = Открыть меню строительства
+ui-options-function-open-inventory-menu = Открыть снаряжение
+ui-options-function-open-a-help = Открыть админ помощь
+ui-options-function-open-abilities-menu = Открыть меню действий
+ui-options-function-open-entity-spawn-window = Открыть меню спавна сущностей
+ui-options-function-open-sandbox-window = Открыть меню песочницы
+ui-options-function-open-tile-spawn-window = Открыть меню спавна тайлов
+ui-options-function-open-decal-spawn-window = Открыть меню спавна декалей
+ui-options-function-open-admin-menu = Открыть админ меню
+ui-options-function-open-guidebook = Открыть руководство
+ui-options-function-window-close-all = Закрыть все окна
+ui-options-function-window-close-recent = Закрыть текущее окно
+ui-options-function-show-escape-menu = Переключить игровое меню
+ui-options-function-escape-context = Закрыть текущее окно или переключить игровое меню
+ui-options-function-take-screenshot = Сделать скриншот
+ui-options-function-take-screenshot-no-ui = Сделать скриншот (без интерфейса)
+ui-options-function-toggle-fullscreen = Переключить полноэкранный режим
+ui-options-function-editor-place-object = Разместить объект
+ui-options-function-editor-cancel-place = Отменить размещение
+ui-options-function-editor-grid-place = Размещать в сетке
+ui-options-function-editor-line-place = Размещать в линию
+ui-options-function-editor-rotate-object = Повернуть
+ui-options-function-editor-flip-object = Перевернуть
+ui-options-function-editor-copy-object = Копировать
+ui-options-function-show-debug-console = Открыть консоль
+ui-options-function-show-debug-monitors = Показать дебаг информацию
+ui-options-function-inspect-entity = Изучить сущность
+ui-options-function-hide-ui = Спрятать интерфейс
+ui-options-function-hotbar1 = 1 слот хотбара
+ui-options-function-hotbar2 = 2 слот хотбара
+ui-options-function-hotbar3 = 3 слот хотбара
+ui-options-function-hotbar4 = 4 слот хотбара
+ui-options-function-hotbar5 = 5 слот хотбара
+ui-options-function-hotbar6 = 6 слот хотбара
+ui-options-function-hotbar7 = 7 слот хотбара
+ui-options-function-hotbar8 = 8 слот хотбара
+ui-options-function-hotbar9 = 9 слот хотбара
+ui-options-function-hotbar0 = 0 слот хотбара
+ui-options-function-loadout1 = 1 страница хотбара
+ui-options-function-loadout2 = 2 страница хотбара
+ui-options-function-loadout3 = 3 страница хотбара
+ui-options-function-loadout4 = 4 страница хотбара
+ui-options-function-loadout5 = 5 страница хотбара
+ui-options-function-loadout6 = 6 страница хотбара
+ui-options-function-loadout7 = 7 страница хотбара
+ui-options-function-loadout8 = 8 страница хотбара
+ui-options-function-loadout9 = 9 страница хотбара
+ui-options-function-loadout0 = 0 страница хотбара
+ui-options-function-shuttle-strafe-up = Стрейф вверх
+ui-options-function-shuttle-strafe-right = Стрейф вправо
+ui-options-function-shuttle-strafe-left = Стрейф влево
+ui-options-function-shuttle-strafe-down = Стрейф вниз
+ui-options-function-shuttle-rotate-left = Поворот налево
+ui-options-function-shuttle-rotate-right = Поворот направо
+ui-options-function-shuttle-brake = Торможение
+ui-options-net-interp-ratio = Сетевое сглаживание
+ui-options-net-predict = Предугадывание на стороне клиента
 ui-options-net-interp-ratio-tooltip =
-    Increasing this will generally make the game more resistant
-    to server->client packet-loss, however in doing so it
-    effectively adds slightly more latency and requires the
-    client to predict more future ticks.
-ui-options-net-predict-tick-bias = Prediction tick bias
+    Увеличение этого параметра, как правило, делает игру
+    более устойчивой к потере пакетов, однако при этом
+    это так же добавляет немного больше задержки и
+    требует от клиента предсказывать больше будущих тиков.
+ui-options-net-predict-tick-bias = Погрешность тиков предугадывания
 ui-options-net-predict-tick-bias-tooltip =
-    Increasing this will generally make the game more resistant
-    to client->server packet-loss, however in doing so it
-    effectively adds slightly more latency and requires the
-    client to predict more future ticks.
-ui-options-net-pvs-spawn = PVS entity spawn budget
+    Увеличение этого параметра, как правило, делает игру более устойчивой
+    к потере пакетов между клиентом и сервером, однако при этом
+    немного возрастает задержка, и клиенту требуется предугадывать
+    больше будущих тиков
+ui-options-net-pvs-spawn = Лимит появление PVS сущностей
 ui-options-net-pvs-spawn-tooltip =
-    This limits the rate at which the server will send newly spawned
-    entities to the client. Lowering this can help reduce
-    stuttering due to entity spawning, but can lead to pop-in.
-ui-options-net-pvs-entry = PVS entity budget
+    Ограничение частоты отправки новых появившихся сущностей сервером на клиент.
+    Снижение этого параметра может помочь уменьшить "захлёбывания",
+    вызываемые спавном сущностей, но может привести к их резкому появлению.
+ui-options-net-pvs-entry = Лимит PVS сущностей
 ui-options-net-pvs-entry-tooltip =
-    This limits the rate at which the server will send newly visible
-    entities to the client. Lowering this can help reduce
-    stuttering, but can lead to pop-in.
-ui-options-net-pvs-leave = PVS detach rate
+    Ограничение частоты отправки новых видимых сущностей сервером на клиент.
+    Снижение этого параметра может помочь уменьшить "захлёбывания",
+    вызываемые спавном сущностей, но может привести к их резкому появлению.
+ui-options-net-pvs-leave = Частота удаления PVS
 ui-options-net-pvs-leave-tooltip =
-    This limits the rate at which the client will remove
-    out-of-view entities. Lowering this can help reduce
-    stuttering when walking around, but could occasionally
-    lead to mispredicts and other issues.
-
-## Toggle window console command
-
-cmd-options-desc = Opens options menu, optionally with a specific tab selected.
-cmd-options-help = Usage: options [tab]
-
-## Combat Options
-
-ui-options-function-look-up = Look up/Take aim
-ui-options-function-auto-get-up = Automatically get up after falling
-ui-options-function-hold-look-up = Hold down the key to aim
+    Ограничение частоты, с которой клиент будет удалять
+    сущности вне поля зрения. Снижение этого параметра может помочь
+    уменьшить "захлёбывания" при ходьбе, но иногда может
+    привести к неправильным предугадываниям и другим проблемам.
+ui-options-function-look-up = Присмотреться/Прицелиться
+ui-options-function-auto-get-up = Автоматически вставать после падения
+ui-options-function-hold-look-up = Удерживайте клавишу, чтобы прицелиться
+cmd-options-desc = Открывает меню опций, опционально с конкретно выбранной вкладкой.
+cmd-options-help = Использование: options [tab]
+ui-options-enable-color-name = Цветные имена персонажей
+ui-options-colorblind-friendly = Режим для дальтоников
+ui-options-reduced-motion = Снижение интенсивности визуальных эффектов
+ui-options-chat-window-opacity = Прозрачность окна чата
+ui-options-screen-shake-intensity = Интенсивность дрожания экрана
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/loadouts/categories.ftl b/Resources/Locale/ru-RU/loadouts/categories.ftl
index 080aad75726..5da48e640b2 100644
--- a/Resources/Locale/ru-RU/loadouts/categories.ftl
+++ b/Resources/Locale/ru-RU/loadouts/categories.ftl
@@ -26,6 +26,9 @@ loadout-category-JobsSecurity = Безопасность
 loadout-category-JobsService = Сервис
 loadout-category-JobsServiceUncategorized = Без категории
 loadout-category-JobsServiceBartender = Бармен
+loadout-category-JobsServiceBotanist = Ботаник
+loadout-category-JobsServiceChef = Шеф-Повар
+loadout-category-JobsServiceJanitor = Уборщик
 loadout-category-Mask = Маска
 loadout-category-Shoes = Обувь
 loadout-category-Species = Расовые
diff --git a/Resources/Locale/ru-RU/loadouts/itemgroups.ftl b/Resources/Locale/ru-RU/loadouts/itemgroups.ftl
index 5df823c9215..b98eadaf4ea 100644
--- a/Resources/Locale/ru-RU/loadouts/itemgroups.ftl
+++ b/Resources/Locale/ru-RU/loadouts/itemgroups.ftl
@@ -27,6 +27,17 @@ character-item-group-LoadoutEyesEngineering = Очки Инженерного О
 character-item-group-LoadoutHeadEngineering = Головные Уборы Инженерного Отдела
 character-item-group-LoadoutOuterEngineering = Верхняя Одежда Инженерного Отдела
 character-item-group-LoadoutUniformsEngineering = Униформа Инженерного Отдела
+# Epistemics
+character-item-group-LoadoutEyesScience = Очки Научного Отдела
+character-item-group-LoadoutGlovesScience = Перчатки Научного Отдела
+character-item-group-LoadoutHeadScience = Головные Уборы Научного Отдела
+character-item-group-LoadoutMaskScience = Маски Научного Отдела
+character-item-group-LoadoutNeckScience = Одежда На Шею Научного отдела
+character-item-group-LoadoutOuterScience = Верхняя Одежда Научного Отдела
+character-item-group-LoadoutShoesScience = Обувь Научного Отдела
+character-item-group-LoadoutUniformsScience = Униформа Научного Отдела
+# Epistemics - Cataloguer
+character-item-group-LoadoutCataloguerUniforms = Униформа Катаголизатора
 # Medical
 character-item-group-LoadoutEyesMedical = Очки Медицинского Отдела
 character-item-group-LoadoutGlovesMedical = Перчатки Медицинского отдела
@@ -52,6 +63,7 @@ character-item-group-LoadoutWeaponSecurity = Оружие Отдела Служ
 character-item-group-LoadoutHoSWeapon = Антикварная коллекция оружия Главы Службы Безопасности
 # Service
 character-item-group-LoadoutEquipmentService = Снаряжение Сервиса
+character-item-group-LoadoutHeadService = Головные Уборы Сервиса
 character-item-group-LoadoutMaskService = Маски Сервиса
 character-item-group-LoadoutNeckService = Одежда На Шею Сервиса
 character-item-group-LoadoutOuterService = Верхняя Одежда Сервиса
@@ -59,8 +71,18 @@ character-item-group-LoadoutShoesService = Обувь Сервиса
 character-item-group-LoadoutUniformsService = Униформа Сервиса
 # Service - Bartender
 character-item-group-LoadoutBartenderAmmo = Аммуниция Бармена
+character-item-group-LoadoutBartenderHead = Головные Уборы Бармена
 character-item-group-LoadoutBartenderOuterwear = Верхняя Одежда Бармена
+character-item-group-LoadoutBartenderUniforms = Униформа Бармена
 character-item-group-LoadoutBartenderWeapon = Оружие Бармена
+# Service - Botanist
+character-item-group-LoadoutBotanistUniforms = Униформа Ботаника
+# Service - Chef
+character-item-group-LoadoutChefHead = Головные Уборы Шеф-Повара
+character-item-group-LoadoutChefOuter = Верхняя Одежда Шеф-Повара
+character-item-group-LoadoutChefUniforms = Униформа Шеф-Повара
+# Service - Janitor
+character-item-group-LoadoutJanitorUniforms = Униформа Уборщика
 # Service - Musician
 character-item-group-LoadoutMusicianInstruments = Музыкальные Инструменты
 # Traits - Languages
diff --git a/Resources/Locale/ru-RU/materials/materials.ftl b/Resources/Locale/ru-RU/materials/materials.ftl
index 1a131c7f15a..f8aced4818c 100644
--- a/Resources/Locale/ru-RU/materials/materials.ftl
+++ b/Resources/Locale/ru-RU/materials/materials.ftl
@@ -32,5 +32,7 @@ materials-raw-plasma = руда плазмы
 materials-raw-uranium = руда урана
 materials-raw-bananium = руда бананиума
 materials-raw-salt = каменная соль
+materials-raw-bluespace = руда блюспейса
+materials-raw-normality = руда обыкновенности
 # Material Reclaimer
 material-reclaimer-upgrade-process-rate = Скорость обработки
diff --git a/Resources/Locale/ru-RU/movement/laying.ftl b/Resources/Locale/ru-RU/movement/laying.ftl
index 631f5d22eb5..e9f5a571bb4 100644
--- a/Resources/Locale/ru-RU/movement/laying.ftl
+++ b/Resources/Locale/ru-RU/movement/laying.ftl
@@ -1,3 +1,4 @@
+crawling-under-tables-disabled-popup = Ползание под столами запрещено на этом сервере
 laying-comp-lay-success-self = Вы ложитесь.
 laying-comp-lay-success-other = { THE($entity) } ложится.
 laying-comp-lay-fail-self = Вы не можете лечь сейчас.
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/lpp/socks/socks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/lpp/socks/socks.ftl
index 27696473d16..94a48061f0b 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/lpp/socks/socks.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/lpp/socks/socks.ftl
@@ -10,7 +10,7 @@ ent-LPPClothingUnderCommieKnee = Коммунистические носочки
     .desc = Пинайте врагов СССП не только ботинками, но и носочками!
 ent-LPPClothingUnderCommieThigh = { ent-LPPClothingUnderCommieKnee }
     .desc = { ent-LPPClothingUnderCommieKnee.desc }
-ent-LPPClothingUnderPantyhoseBlack = Чёрные колготки
+ent-LPPClothingUnderPantyhoseBlack = Колготки
     .desc = { ent-LPPClothingUnderwearSocksBase.desc }
 ent-LPPClothingUnderPantyhoseBlue = { ent-LPPClothingUnderPantyhoseBlack }
     .desc = { ent-LPPClothingUnderwearSocksBase.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/devices/cartridges.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/devices/cartridges.ftl
index 82fb71ab418..15327522d27 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/devices/cartridges.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/devices/cartridges.ftl
@@ -2,3 +2,5 @@ ent-CrimeAssistCartridge = Картридж для помощи в престу
     .desc = Картридж, помогающий в разборе преступлений и выдаче справедливых наказаний
 ent-SecWatchCartridge = Картридж СБ
     .desc = Картридж, который отслеживает статус лиц, находящихся в настоящее время в розыске.
+ent-MailMetricsCartridge = Картридж почты
+    .desc = Картридж, отслеживающий статистику доставки почты.
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/specific/mail/mail.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/specific/mail/mail.ftl
index 89b823cd788..82d50b42445 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/specific/mail/mail.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/specific/mail/mail.ftl
@@ -4,3 +4,183 @@ ent-MailBooksAll = { ent-BaseMail }
 ent-MailPumpkinPie = { ent-BaseMail }
     .suffix = Тыквенный пирог
     .desc = { ent-BaseMail.desc }
+ent-MailDVCosplayFakeWizard = { ent-BaseMail }
+    .suffix = Косплей волшебника, Фальшивый
+    .desc = { ent-BaseMail.desc }
+ent-MailDVScarves = { ent-BaseMail }
+    .suffix = Шарфы
+    .desc = { ent-BaseMail.desc }
+ent-MailDVBoxes = { ent-BaseMailLarge }
+    .suffix = Коробки
+    .desc = { ent-BaseMailLarge.desc }
+ent-MailNFAlcohol = { ent-BaseMail }
+    .suffix = Алкоголь, Расширенный
+    .desc = { ent-BaseMail.desc }
+ent-MailNFBible = { ent-BaseMailLarge }
+    .suffix = Библия, Расширенный
+    .desc = { ent-BaseMailLarge.desc }
+ent-MailNFBikeHorn = { ent-BaseMail }
+    .suffix = Велосипедный гудок, Рандом
+    .desc = { ent-BaseMail.desc }
+ent-MailNFBuildABuddy = { ent-BaseMailLarge }
+    .suffix = Завести приятеля
+    .desc = { ent-BaseMailLarge.desc }
+ent-MailNFCake = { ent-BaseMailLarge }
+    .suffix = Торт, Расширенный
+    .desc = { ent-BaseMailLarge.desc }
+ent-MailNFCosplayWizard = { ent-BaseMail }
+    .suffix = Косплей волшебника, Расширенный
+    .desc = { ent-BaseMail.desc }
+ent-MailNFCosplayMaid = { ent-BaseMail }
+    .suffix = Косплей горничной, Расширенный
+    .desc = { ent-BaseMail.desc }
+ent-MailNFCosplayNurse = { ent-BaseMail }
+    .suffix = Косплей мед сестры, Расширенный
+    .desc = { ent-BaseMail.desc }
+ent-MailNFCheese = { ent-BaseMail }
+    .suffix = Сыр, Расширенный
+    .desc = { ent-BaseMail.desc }
+ent-MailNFCigarettes = { ent-BaseMail }
+    .suffix = Сигареты, Рандом
+    .desc = { ent-BaseMail.desc }
+ent-MailNFEMP = { ent-BaseMail }
+    .suffix = ЭМИ
+    .desc = { ent-BaseMail.desc }
+ent-MailNFSmoke = { ent-BaseMail }
+    .suffix = Дым
+    .desc = { ent-BaseMail.desc }
+ent-MailNFGoldCigars = { ent-BaseMail }
+    .suffix = Сигары, Премиум
+    .desc = { ent-BaseMail.desc }
+ent-MailNFCookies = { ent-BaseMail }
+    .suffix = Печеньки, Рандом
+    .desc = { ent-BaseMail.desc }
+ent-MailNFKnife = { ent-BaseMail }
+    .suffix = Нож, Расширенный
+    .desc = { ent-BaseMail.desc }
+ent-MailNFSword = { ent-BaseMailLarge }
+    .suffix = Меч
+    .desc = { ent-BaseMailLarge.desc }
+ent-MailNFMuffins = { ent-BaseMail }
+    .suffix = Маффины, Рандом
+    .desc = { ent-BaseMail.desc }
+ent-MailNFPAI = { ent-BaseMail }
+    .suffix = пИИ, Расширенный
+    .desc = { ent-BaseMail.desc }
+ent-MailNFPlushie = { ent-BaseMail }
+    .suffix = Плюшевая игрушка, Расширенный
+    .desc = { ent-BaseMail.desc }
+ent-MailNFSnacks = { ent-BaseMail }
+    .suffix = Змеи, Рандом
+    .desc = { ent-BaseMail.desc }
+ent-MailNFVagueThreat = { ent-BaseMail }
+    .suffix = Неопределенная угроза
+    .desc = { ent-BaseMail.desc }
+ent-MailNFDonkPockets = { ent-BaseMail }
+    .suffix = Донк-покеты, Рандом
+    .desc = { ent-BaseMail.desc }
+ent-MailNFSodaPwrGame = { ent-BaseMail }
+    .suffix = PWRgame
+    .desc = { ent-BaseMail.desc }
+ent-MailNFSodaRedBool = { ent-BaseMail }
+    .suffix = Ред бул
+    .desc = { ent-BaseMail.desc }
+ent-MailNFSodaSpaceCola = { ent-BaseMail }
+    .suffix = Space Cola
+    .desc = { ent-BaseMail.desc }
+ent-MailNFSodaSpaceMountainWind = { ent-BaseMail }
+    .suffix = Space Mountain Wind
+    .desc = { ent-BaseMail.desc }
+ent-MailNFSodaSpaceUp = { ent-BaseMail }
+    .suffix = Space Up
+    .desc = { ent-BaseMail.desc }
+ent-MailNFJoints = { ent-BaseMail }
+    .suffix = Самокрутки
+    .desc = { ent-BaseMail.desc }
+ent-MailNFUnusualFood = { ent-BaseMail }
+    .suffix = Необычная еда
+    .desc = { ent-BaseMail.desc }
+ent-MailNFBakedGoods = { ent-BaseMail }
+    .suffix = Булочки
+    .desc = { ent-BaseMail.desc }
+ent-MailNFUnusualProduce = { ent-BaseMail }
+    .suffix = Необычный продукт
+    .desc = { ent-BaseMail.desc }
+ent-MailNFSoaps = { ent-BaseMail }
+    .suffix = Мыло
+    .desc = { ent-BaseMail.desc }
+ent-MailNFSoapsOmega = { ent-BaseMail }
+    .suffix = Мыло, Омега
+    .desc = { ent-BaseMail.desc }
+ent-MailNFFigurineBulk = { ent-BaseMail }
+    .suffix = Статуэтка
+    .desc = { ent-BaseMail.desc }
+ent-MailNFPen = { ent-BaseMail }
+    .suffix = Необычная ручка
+    .desc = { ent-BaseMail.desc }
+ent-MailNFThrongler = { ent-BaseMailLarge }
+    .suffix = throngler
+    .desc = { ent-BaseMailLarge.desc }
+ent-MailNFInstrumentSmall = { ent-BaseMail }
+    .suffix = Инструмент, expanded
+    .desc = { ent-BaseMail.desc }
+ent-MailNFUnusualClothing = { ent-BaseMail }
+    .suffix = Необычная одежда
+    .desc = { ent-BaseMail.desc }
+ent-MailNFCritter = { ent-BaseMail }
+    .suffix = Существо
+    .desc = { ent-BaseMail.desc }
+ent-MailNFTacticalMaid = { ent-BaseMail }
+    .suffix = Тактическая горничная
+    .desc = { ent-BaseMail.desc }
+ent-MailNFKendoKit = { ent-BaseMailLarge }
+    .suffix = Набор для кендо
+    .desc = { ent-BaseMailLarge.desc }
+ent-MailSake = { ent-BaseMail }
+    .suffix = Саке
+    .desc = { ent-BaseMail.desc }
+ent-MailBlockGameDIY = { ent-BaseMail }
+    .suffix = BlockGame
+    .desc = { ent-BaseMail.desc }
+ent-MailCigars = { ent-BaseMail }
+    .suffix = Сигары
+    .desc = { ent-BaseMail.desc }
+ent-MailCrayon = { ent-BaseMail }
+    .suffix = Цветной мелок
+    .desc = { ent-BaseMail.desc }
+ent-MailCosplayArc = { ent-BaseMail }
+    .suffix = Косплей Арк
+    .desc = { ent-BaseMail.desc }
+ent-MailCosplayGeisha = { ent-BaseMail }
+    .suffix = Коспелей Гейши
+    .desc = { ent-BaseMail.desc }
+ent-MailCosplaySchoolgirl = { ent-BaseMail }
+    .suffix = Косплей школьницы
+    .desc = { ent-BaseMail.desc }
+ent-MailFlowers = { ent-BaseMail }
+    .suffix = Цветы
+    .desc = { ent-BaseMail.desc }
+ent-MailSignallerKit = { ent-BaseMail }
+    .suffix = Комплект сигналов
+    .desc = { ent-BaseMail.desc }
+ent-MailNoir = { ent-BaseMail }
+    .suffix = Нуар
+    .desc = { ent-BaseMail.desc }
+ent-MailRestraints = { ent-BaseMail }
+    .suffix = Наручники
+    .desc = { ent-BaseMail.desc }
+ent-MailFishingCap = { ent-BaseMail }
+    .suffix = Рыбловная шапочка
+    .desc = { ent-BaseMail.desc }
+ent-MailFlashlight = { ent-BaseMail }
+    .suffix = Фонарик
+    .desc = { ent-BaseMail.desc }
+ent-MailSpaceVillainDIY = { ent-BaseMail }
+    .suffix = SpaceVillain
+    .desc = { ent-BaseMail.desc }
+ent-MailSunglasses = { ent-BaseMail }
+    .suffix = Солнечные очки
+    .desc = { ent-BaseMail.desc }
+ent-MailWinterCoat = { ent-BaseMail }
+    .suffix = Зимнее пальто
+    .desc = { ent-BaseMail.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/specific/mail/mail_civilian.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/specific/mail/mail_civilian.ftl
new file mode 100644
index 00000000000..89ea7715e79
--- /dev/null
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/specific/mail/mail_civilian.ftl
@@ -0,0 +1,36 @@
+ent-MailNFInstrumentLarge = { ent-BaseMailLarge }
+    .suffix = Инструмент, большой
+    .desc = { ent-BaseMailLarge.desc }
+ent-MailBotanistChemicalBottles = { ent-BaseMail }
+    .suffix = Химикаты ботаника
+    .desc = { ent-BaseMail.desc }
+ent-MailBotanistMutagen = { ent-BaseMail }
+    .suffix = Матаген
+    .desc = { ent-BaseMail.desc }
+ent-MailBotanistSeeds = { ent-BaseMail }
+    .suffix = Семена
+    .desc = { ent-BaseMail.desc }
+ent-MailClownGildedBikeHorn = { ent-BaseMail }
+    .suffix = Хонк
+    .desc = { ent-BaseMail.desc }
+ent-MailClownHonkSupplement = { ent-BaseMail }
+    .suffix = Хонк
+    .desc = { ent-BaseMail.desc }
+ent-MailHoPBureaucracy = { ent-BaseMail }
+    .suffix = Бумага
+    .desc = { ent-BaseMail.desc }
+ent-MailHoPSupplement = { ent-BaseMail }
+    .suffix = Снаряжение ГП
+    .desc = { ent-BaseMail.desc }
+ent-MailMimeArtsCrafts = { ent-BaseMail }
+    .suffix = Мим
+    .desc = { ent-BaseMail.desc }
+ent-MailMimeBlankBook = { ent-BaseMail }
+    .suffix = Пустая книга
+    .desc = { ent-BaseMail.desc }
+ent-MailMimeBottleOfNothing = { ent-BaseMail }
+    .suffix = Бутылочка нисчем
+    .desc = { ent-BaseMail.desc }
+ent-MailPassengerMoney = { ent-BaseMail }
+    .suffix = Пассажирские деньги
+    .desc = { ent-BaseMail.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/specific/mail/mail_command.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/specific/mail/mail_command.ftl
new file mode 100644
index 00000000000..cebf6efc61e
--- /dev/null
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/specific/mail/mail_command.ftl
@@ -0,0 +1,9 @@
+ent-MailCommandPinpointerNuclear = { ent-BaseMail }
+    .suffix = Пинпоинтер
+    .desc = { ent-BaseMail.desc }
+ent-MailStationRepNFNukeDisk = { ent-BaseMail }
+    .suffix = Диск ядерной авторизации
+    .desc = { ent-BaseMail.desc }
+ent-MailCommandNFPipebombIntern = { ent-BaseMail }
+    .suffix = Самодельная бомба
+    .desc = { ent-BaseMail.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/specific/mail/mail_engineering.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/specific/mail/mail_engineering.ftl
new file mode 100644
index 00000000000..7d55d4d1b9d
--- /dev/null
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/specific/mail/mail_engineering.ftl
@@ -0,0 +1,21 @@
+ent-MailEngineeringCables = { ent-BaseMail }
+    .suffix = Кабели
+    .desc = { ent-BaseMail.desc }
+ent-MailEngineeringKudzuDeterrent = { ent-BaseMail }
+    .suffix = Антикудзу
+    .desc = { ent-BaseMail.desc }
+ent-MailEngineeringSheetGlass = { ent-BaseMail }
+    .suffix = Стекло
+    .desc = { ent-BaseMail.desc }
+ent-MailEngineeringWelderReplacement = { ent-BaseMail }
+    .suffix = Сварочный аппарат
+    .desc = { ent-BaseMail.desc }
+ent-MailNFCircuitboardIndustrial = { ent-BaseMail }
+    .suffix = Плата
+    .desc = { ent-BaseMail.desc }
+ent-MailNFCircuitboardService = { ent-BaseMail }
+    .suffix = Сервисная плата
+    .desc = { ent-BaseMail.desc }
+ent-MailNFPowerTool = { ent-BaseMailLarge }
+    .suffix = Инструмент
+    .desc = { ent-BaseMailLarge.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_epistemology.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/specific/mail/mail_epistemology.ftl
similarity index 62%
rename from Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_epistemology.ftl
rename to Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/specific/mail/mail_epistemology.ftl
index 3537ab4b760..6baaff574d2 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_epistemology.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/specific/mail/mail_epistemology.ftl
@@ -2,14 +2,11 @@ ent-MailEpistemologyBluespace = { ent-BaseMail }
     .suffix = Блюспейс
     .desc = { ent-BaseMail.desc }
 ent-MailEpistemologyIngotGold = { ent-BaseMail }
-    .suffix = Золотой слиток
+    .suffix = Золотой самородок
     .desc = { ent-BaseMail.desc }
 ent-MailEpistemologyResearchDisk = { ent-BaseMail }
-    .suffix = Диск с очками исследования
+    .suffix = Диск сследования
     .desc = { ent-BaseMail.desc }
 ent-MailEpistemologyTinfoilHat = { ent-BaseMail }
     .suffix = Шапочка из фольги
     .desc = { ent-BaseMail.desc }
-ent-MailDetectiveForensicSupplement = { ent-BaseMail }
-    .suffix = Пополнение детектива
-    .desc = { ent-BaseMail.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_medical.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/specific/mail/mail_medical.ftl
similarity index 71%
rename from Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_medical.ftl
rename to Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/specific/mail/mail_medical.ftl
index 534cb148d63..e5d9fa28f67 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_medical.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/specific/mail/mail_medical.ftl
@@ -1,18 +1,21 @@
 ent-MailMedicalBasicSupplies = { ent-BaseMail }
-    .suffix = Медипен
+    .suffix = Базовая медицина
     .desc = { ent-BaseMail.desc }
 ent-MailMedicalChemistrySupplement = { ent-BaseMail }
-    .suffix = Пополнение химика
+    .suffix = Снаряжение химика
     .desc = { ent-BaseMail.desc }
 ent-MailMedicalEmergencyPens = { ent-BaseMail }
-    .suffix = Экстренный медипен
+    .suffix = Медипен
     .desc = { ent-BaseMail.desc }
 ent-MailMedicalMedicinePills = { ent-BaseMail }
     .suffix = Таблетки
     .desc = { ent-BaseMail.desc }
 ent-MailMedicalSheetPlasma = { ent-BaseMail }
-    .suffix = Лист плазмы
+    .suffix = Плазма
     .desc = { ent-BaseMail.desc }
 ent-MailMedicalStabilizers = { ent-BaseMail }
     .suffix = Стабилизаторы
     .desc = { ent-BaseMail.desc }
+ent-MailNFMedkit = { ent-BaseMailLarge }
+    .suffix = Мед наборы
+    .desc = { ent-BaseMailLarge.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/specific/mail/mail_security.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/specific/mail/mail_security.ftl
new file mode 100644
index 00000000000..76639253da7
--- /dev/null
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/specific/mail/mail_security.ftl
@@ -0,0 +1,21 @@
+ent-MailSecurityDonuts = { ent-BaseMail }
+    .suffix = Пончики
+    .desc = { ent-BaseMail.desc }
+ent-MailSecurityFlashlight = { ent-BaseMail }
+    .suffix = Фонарик
+    .desc = { ent-BaseMail.desc }
+ent-MailSecurityNonlethalsKit = { ent-BaseMail }
+    .suffix = Нелетал
+    .desc = { ent-BaseMail.desc }
+ent-MailWardenCrowdControl = { ent-BaseMail }
+    .suffix = Против толпы
+    .desc = { ent-BaseMail.desc }
+ent-MailDetectiveForensicSupplement = { ent-BaseMail }
+    .suffix = Снаряжение детектива
+    .desc = { ent-BaseMail.desc }
+ent-MailSecurityNFMusket = { ent-BaseMailLarge }
+    .suffix = Мушкет
+    .desc = { ent-BaseMailLarge.desc }
+ent-MailSecurityDVSpaceLaw = { ent-BaseMail }
+    .suffix = Космический закон, Расширенный
+    .desc = { ent-BaseMail.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl
index 4d7fbb12755..c7f1001146d 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl
@@ -162,6 +162,22 @@ ent-ClothingUniformJumpsuitLibrarianOrion = Комбинезон библеот
     .desc = Уютный коричневый джемпер, подходящий для хранителя книг.
 ent-ClothingUniformJumpsuitLibrarianOrionFlipped = Комбинезон библеотекаря Орион экспресс
     .desc = { ent-ClothingUniformBaseFlipped.desc }
+ent-ClothingUniformJumpsuitLibrarianHeph = Комбинезон библиотекаря от компании hephaestus
+    .desc = Уютный зеленый комбез. Подойдет хранителю книг..
+ent-ClothingUniformJumpsuitLibrarianHephFlipped = Комбинезон библиотекаря от компании hephaestus
+    .desc = { ent-ClothingUniformBaseFlipped.desc }
+ent-ClothingUniformJumpsuitLibrarianPMCG = Комбинезон библиотекаря частной военной компании
+    .desc = Уютный белый комбез. Подойдет хранителю книг..
+ent-ClothingUniformJumpsuitLibrarianPMCGFlipped = Комбинезон библиотекаря частной военной компании
+    .desc = { ent-ClothingUniformBaseFlipped.desc }
+ent-ClothingUniformJumpsuitLibrarianZav = Заводской межзвездный комбинезон библиотекаря
+    .desc = Кроваво-коричневый комбез. Подойдет хранителю книг..
+ent-ClothingUniformJumpsuitLibrarianZavFlipped = Заводской межзвездный комбинезон библиотекаря
+    .desc = { ent-ClothingUniformBaseFlipped.desc }
+ent-ClothingUniformJumpsuitLibrarianZeng = Комбинезон библиотекаря фармацевтической компании Zeng-hu
+    .desc = Кроваво-коричневый комбез. Подойдет хранителю книг..
+ent-ClothingUniformJumpsuitLibrarianZengFlipped = Комбинезон библиотекаря фармацевтической компании Zeng-hu
+    .desc = { ent-ClothingUniformBaseFlipped.desc }
 ent-ClothingUniformJumpsuitCurator = Практичный костюм
     .desc = Практично. Слишком практично...
 ent-ClothingUniformJumpsuitLawyerRed = Красный адвокатский костюм
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/materials/ore.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/materials/ore.ftl
index 0f63ae6a6ff..1a64d25ee0c 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/materials/ore.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/materials/ore.ftl
@@ -54,3 +54,15 @@ ent-SaltOre = Соль
 ent-Salt1 = { ent-SaltOre }
     .suffix = Один
     .desc = { ent-SaltOre.desc }
+ent-BluespaceOre = Блюспейс руда
+    .suffix = Полный
+    .desc = { ent-OreBase.desc }
+ent-BluespaceOre1 = { ent-BluespaceOre }
+    .suffix = Один
+    .desc = { ent-BluespaceOre.desc }
+ent-NormalityOre = Кристал обыкновенности
+    .suffix = Полный
+    .desc = { ent-OreBase.desc }
+ent-NormalityOre1 = { ent-NormalityOre }
+    .suffix = Один
+    .desc = { ent-NormalityOre.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/mail_capsule.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/mail_capsule.ftl
new file mode 100644
index 00000000000..e1ce8d0bf7a
--- /dev/null
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/mail_capsule.ftl
@@ -0,0 +1,5 @@
+ent-MailCapsulePrimed = Капсула почты
+    .suffix = Заряженная
+    .desc = { ent-BaseItem.desc }
+ent-BoxMailCapsulePrimed = Коробка капсул почты
+    .desc = Коробка с заряженными почтовыми капсулами.
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/mail/base_mail_large.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/mail/base_mail_large.ftl
new file mode 100644
index 00000000000..bbbb950143c
--- /dev/null
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/mail/base_mail_large.ftl
@@ -0,0 +1,5 @@
+ent-BaseMailLarge = mail-large-item-name-unaddressed
+    .desc = { ent-BaseMail.desc }
+ent-MailLargeAdminFun = { ent-BaseMailLarge }
+    .suffix = АДМЕМЫ
+    .desc = { ent-BaseMailLarge.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/mail/items/boxes.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/mail/items/boxes.ftl
new file mode 100644
index 00000000000..f3697f47980
--- /dev/null
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/mail/items/boxes.ftl
@@ -0,0 +1,16 @@
+ent-BoxSoapsAssorted = Упаковка ароматного мыла
+    .desc = Коробка мыла с разными ароматами. Ооу, Лаванда?
+ent-BoxSoapsAssortedOmega = Упаковка ароматного мыл
+    .desc = Коробка мыла с разными ароматами. Oоу, Блюспейс?
+ent-BoxBuildABuddyHuman = Комплект «Собери друга»
+    .desc = Набор для сборки приятеля «Человек Генри». Требуется некоторая сборка.
+    .suffix = Человек
+ent-BoxBuildABuddyReptilian = Комплект «Собери друга»
+    .desc = Набор для сборки приятеля «Унатх Рэнди». Требуется некоторая сборка.
+    .suffix = Рептилия
+ent-BoxBuildABuddySlime = Комплект «Собери друга»
+    .desc = Набор для сборки приятеля «Слаймолюд Стивен». Требуется некоторая сборка.
+    .suffix = Слайм
+ent-BoxBuildABuddyVulpkanin = Комплект «Собери друга»
+    .desc = Набор для сборки приятеля "Вульпканин Валерия". Требуется некоторая сборка.
+    .suffix = Вульпа
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/mail/items/misc.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/mail/items/misc.ftl
new file mode 100644
index 00000000000..58b215e1cfa
--- /dev/null
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/mail/items/misc.ftl
@@ -0,0 +1,26 @@
+ent-DelayedSmoke = Задержанный дым
+    .suffix = (10s)
+    .desc = { ent-BaseItem.desc }
+ent-AdminInstantEffectEMP7 = { ent-AdminInstantEffectBase }
+    .suffix = ЭМИ, 7 метров
+    .desc = { ent-AdminInstantEffectBase.desc }
+ent-DelayedEMP = Задержанный ЭМИ (7 метров)
+    .desc = { ent-BaseItem.desc }
+ent-SyringeCognizine = Шприц когнизина
+    .desc = { ent-Syringe.desc }
+ent-SyringeOpporozidone = Шприц оппорозидона
+    .desc = { ent-Syringe.desc }
+ent-NecrosolChemistryBottle = Бутылочка некрозола
+    .desc = { ent-BaseChemistryBottleFilled.desc }
+ent-DrinkPremiumVodkaBottleFull = Бутылка водки «Момент ясности»
+    .desc = Когда дела идут немного беспокойно, все, что вам нужно, — это Момент ясности.
+ent-DrinkPremiumGinBottleFull = Бутылка джина Гарри
+    .desc = Интересный привкус... Это тыква?
+ent-DrinkPremiumTequilaBottleFull = Бутылка текилы Casa del Eorg
+    .desc = Приберегите лучшее напоследок. Casa del Eorg, 100% agave.
+ent-DrinkPremiumWhiskeyBottleFull = Бутылка виски Ol'Prowler 18
+    .desc = Удивительно мягкий, он имеет неприятную привычку подкрадываться к вам..
+ent-DrinkPremiumRumBottleFull = Бутылка рома Redeemer's Bounty
+    .desc = Ну, вы просили об этом. Военно-морской флот сила!
+ent-DrinkPremiumAbsintheBottleFull = Бутылка абсента «Поцелуй бюрократии»
+    .desc = Изысканный вкус, который имеет тенденцию задерживаться.
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/mail/items/paper.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/mail/items/paper.ftl
new file mode 100644
index 00000000000..6e4fe111a1b
--- /dev/null
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/mail/items/paper.ftl
@@ -0,0 +1,90 @@
+ent-PaperMailNFPowerTool = Странная реклама.
+    .suffix = Эффективный инструмент запугивания, отформатированная
+    .desc = { ent-Paper.desc }
+ent-PaperMailNFVagueThreat1 = { ent-Paper }
+    .suffix = Расплывчатая почтовая угроза 1, отформатированная
+    .desc = { ent-Paper.desc }
+ent-PaperMailNFVagueThreat2 = { ent-Paper }
+    .suffix = Расплывчатая почтовая угроза 2, отформатированная
+    .desc = { ent-Paper.desc }
+ent-PaperMailNFVagueThreat3 = { ent-Paper }
+    .suffix = Расплывчатая почтовая угроза 3, отформатированная
+    .desc = { ent-Paper.desc }
+ent-PaperMailNFVagueThreat4 = { ent-Paper }
+    .suffix = Расплывчатая почтовая угроза 4, отформатированная
+    .desc = { ent-Paper.desc }
+ent-PaperMailNFVagueThreat5 = { ent-Paper }
+    .suffix = Расплывчатая почтовая угроза 5, отформатированная
+    .desc = { ent-Paper.desc }
+ent-PaperMailNFVagueThreat6 = { ent-Paper }
+    .suffix = Расплывчатая почтовая угроза 6, отформатированная
+    .desc = { ent-Paper.desc }
+ent-PaperMailNFVagueThreat7 = { ent-Paper }
+    .suffix = Расплывчатая почтовая угроза 7, отформатированная
+    .desc = { ent-Paper.desc }
+ent-PaperMailNFVagueThreat8 = { ent-Paper }
+    .suffix = Расплывчатая почтовая угроза 8, отформатированная
+    .desc = { ent-Paper.desc }
+ent-PaperMailNFVagueThreat9 = { ent-Paper }
+    .suffix = Расплывчатая почтовая угроза 9, отформатированная
+    .desc = { ent-Paper.desc }
+ent-PaperMailNFVagueThreat10 = { ent-Paper }
+    .suffix = Расплывчатая почтовая угроза 10, отформатированная
+    .desc = { ent-Paper.desc }
+ent-PaperMailNFVagueThreat11 = { ent-Paper }
+    .suffix = Расплывчатая почтовая угроза 11, отформатированная
+    .desc = { ent-Paper.desc }
+ent-PaperMailNFVagueThreat12 = { ent-Paper }
+    .suffix = Расплывчатая почтовая угроза 12, отформатированная
+    .desc = { ent-Paper.desc }
+ent-PaperMailNFPwrGameAd = Реклама pwr game
+    .suffix = Реклама pwr game
+    .desc = { ent-Paper.desc }
+ent-PaperMailNFRedBoolAd = Реклама red bool
+    .suffix = Реклама red bool
+    .desc = { ent-Paper.desc }
+ent-PaperMailNFSpaceColaAd = Реклама космической колы
+    .suffix = Реклама космической колы
+    .desc = { ent-Paper.desc }
+ent-PaperMailNFSpaceMountainWindAd = Реклама space mountain wind
+    .suffix = Реклама space mountain wind
+    .desc = { ent-Paper.desc }
+ent-PaperMailNFSpaceUpAd = Реклама спейс-апа
+    .suffix = Реклама спейс-апа
+    .desc = { ent-Paper.desc }
+ent-PaperMailNTSoapAd1 = { ent-Paper }
+    .suffix = soap ad 1
+    .desc = { ent-Paper.desc }
+ent-PaperMailNTSoapAd2 = { ent-Paper }
+    .suffix = soap ad 2
+    .desc = { ent-Paper.desc }
+ent-PaperMailNTConscript = { ent-Paper }
+    .suffix = conscript
+    .desc = { ent-Paper.desc }
+ent-PaperMailNTMusket = { ent-Paper }
+    .suffix = musket
+    .desc = { ent-Paper.desc }
+ent-PaperMailNFPaperPusherAd = { ent-Paper }
+    .suffix = paper pusher
+    .desc = { ent-Paper.desc }
+ent-PaperMailNFPetBedAssemblyManual = Инструкция по сборке кровати для домашних животных
+    .suffix = Инструкция по сборке кровати для домашних животных
+    .desc = { ent-Paper.desc }
+ent-PaperMailNTBoxer = { ent-Paper }
+    .suffix = Упаковщик
+    .desc = { ent-Paper.desc }
+ent-PaperMailNFPipebombIntern = { ent-Paper }
+    .suffix = Самодельная бомба
+    .desc = { ent-Paper.desc }
+ent-PaperMailNFAntivirus = Счет за антивирус Snortin
+    .suffix = Реклама антивируса
+    .desc = { ent-Paper.desc }
+ent-PaperMailNFEMPPreparedness = Форма NX371 EMP
+    .suffix = Форма NX371 EMP
+    .desc = { ent-Paper.desc }
+ent-PaperMailNFBuildABuddy = Рассылка от «Собери друга»
+    .suffix = Собери друга
+    .desc = { ent-Paper.desc }
+ent-PaperMailNFSpaceLaw = { ent-Paper }
+    .suffix = Космический закон
+    .desc = { ent-Paper.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/launchers/launchers.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/launchers/launchers.ftl
index 23cce63d43e..bf47e535a4d 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/launchers/launchers.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/launchers/launchers.ftl
@@ -26,3 +26,5 @@ ent-WeaponLauncherAdmemeMeteorLarge = Пускатель метеоритов
 ent-WeaponLauncherAdmemeImmovableRodSlow = Пускатель неподвижного жезла
     .desc = Стреляет неподвижными жезлами.
     .suffix = Адмемы
+ent-WeaponMailLake = Почтовый СБДП
+    .desc = Система быстрой доставки посылок
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/asteroid.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/asteroid.ftl
index 97c02b4e7aa..66f6b561530 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/asteroid.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/asteroid.ftl
@@ -40,6 +40,12 @@ ent-AsteroidRockBananium = { ent-AsteroidRock }
 ent-AsteroidRockSalt = { ent-AsteroidRock }
     .desc = Рудная жила, богатая солью.
     .suffix = Соль
+ent-AsteroidRockBluespace = { ent-AsteroidRock }
+    .desc = Каменная стена. Что это торчит из неё?
+    .suffix = Блюспейс руда
+ent-AsteroidRockNormality = { ent-AsteroidRock }
+    .desc = Каменная стена. Что это торчит из неё?
+    .suffix = Кристал обыкновенности
 ent-AsteroidRockArtifactFragment = { ent-AsteroidRock }
     .desc = Каменная стена. Что это торчит из неё?
     .suffix = Фрагмент артефакта
@@ -85,6 +91,12 @@ ent-WallRockArtifactFragment = { ent-WallRock }
 ent-WallRockSalt = { ent-WallRock }
     .desc = Рудная жила, богатая солью.
     .suffix = Соль
+ent-WallRockBluespace = { ent-WallRock }
+    .desc = Каменная стена. Что это торчит из неё?
+    .suffix = Блюспейс руда
+ent-WallRockNormality = { ent-WallRock }
+    .desc = Каменная стена. Что это торчит из неё?
+    .suffix = Кристал обыкновенности
 ent-WallRockBasalt = Базальт
     .desc = { ent-WallRock.desc }
 ent-WallRockBasaltCoal = { ent-WallRockBasalt }
@@ -117,6 +129,12 @@ ent-WallRockBasaltArtifactFragment = { ent-WallRockBasalt }
 ent-WallRockBasaltSalt = { ent-WallRockBasalt }
     .desc = Рудная жила, богатая солью.
     .suffix = Соль
+ent-WallRockBasaltBluespace = { ent-WallRockBluespace }
+    .desc = Каменная стена. Что это торчит из неё?
+    .suffix = Блюспейс руда
+ent-WallRockBasaltNormality = { ent-WallRockNormality }
+    .desc = Каменная стена. Что это торчит из неё?
+    .suffix = Кристал обыкновенности
 ent-WallRockSnow = Сугроб
     .desc = { ent-WallRock.desc }
 ent-WallRockSnowCoal = { ent-WallRockSnow }
@@ -149,6 +167,12 @@ ent-WallRockSnowArtifactFragment = { ent-WallRockSnow }
 ent-WallRockSnowSalt = { ent-WallRockSnow }
     .desc = Рудная жила, богатая солью.
     .suffix = Соль
+ent-WallRockSnowBluespace = { ent-WallRockSnow }
+    .desc = Каменная стена. Что это торчит из неё?
+    .suffix = Блюспейс руда
+ent-WallRockSnowNormality = { ent-WallRockSnow }
+    .desc = Каменная стена. Что это торчит из неё?
+    .suffix = Кристал обыкновенности
 ent-WallRockSand = Песчаник
     .desc = { ent-WallRock.desc }
 ent-WallRockSandCoal = { ent-WallRockSand }
@@ -181,6 +205,12 @@ ent-WallRockSandArtifactFragment = { ent-WallRockSand }
 ent-WallRockSandSalt = { ent-WallRockSand }
     .desc = Рудная жила, богатая солью.
     .suffix = Соль
+ent-WallRockSandBluespace = { ent-WallRockSand }
+    .desc = Каменная стена. Что это торчит из неё?
+    .suffix = Блюспейс руда
+ent-WallRockSandNormality = { ent-WallRockSand }
+    .desc = Каменная стена. Что это торчит из неё?
+    .suffix = Кристал обыкновенности
 ent-WallRockChromite = Хромит
     .desc = { ent-WallRock.desc }
 ent-WallRockChromiteCoal = { ent-WallRockChromite }
@@ -213,6 +243,12 @@ ent-WallRockChromiteArtifactFragment = { ent-WallRockChromite }
 ent-WallRockChromiteSalt = { ent-WallRockChromite }
     .desc = Рудная жила, богатая солью.
     .suffix = Соль
+ent-WallRockChromiteBluespace = { ent-WallRockChromite }
+    .desc = Каменная стена. Что это торчит из неё?
+    .suffix = Блюспейс руда
+ent-WallRockChromiteNormality = { ent-WallRockChromite }
+    .desc = Каменная стена. Что это торчит из неё?
+    .suffix = Кристал обыкновенности
 ent-WallRockAndesite = Андезит
     .desc = { ent-WallRock.desc }
 ent-WallRockAndesiteCoal = { ent-WallRockAndesite }
@@ -245,3 +281,9 @@ ent-WallRockAndesiteArtifactFragment = { ent-WallRockAndesite }
 ent-WallRockAndesiteSalt = { ent-WallRockAndesite }
     .desc = Рудная жила, богатая солью.
     .suffix = Соль
+ent-WallRockAndesiteBluespace = { ent-WallRockAndesite }
+    .desc = Каменная стена. Что это торчит из неё?
+    .suffix = Блюспейс руда
+ent-WallRockAndesiteNormality = { ent-WallRockAndesite }
+    .desc = Каменная стена. Что это торчит из неё?
+    .suffix = Кристал обыкновенности
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail.ftl
index 84f0663c856..833b3d9d195 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail.ftl
@@ -1,9 +1,6 @@
 ent-MailAlcohol = { ent-BaseMail }
     .suffix = Алкоголь
     .desc = { ent-BaseMail.desc }
-ent-MailSake = { ent-BaseMail }
-    .suffix = Саке
-    .desc = { ent-BaseMail.desc }
 ent-MailAMEGuide = { ent-BaseMail }
     .suffix = Руководство по ДАМ
     .desc = { ent-BaseMail.desc }
@@ -13,9 +10,6 @@ ent-MailBible = { ent-BaseMail }
 ent-MailBikeHorn = { ent-BaseMail }
     .suffix = Велосипедный клаксон
     .desc = { ent-BaseMail.desc }
-ent-MailBlockGameDIY = { ent-BaseMail }
-    .suffix = Руководство по азартным играм
-    .desc = { ent-BaseMail.desc }
 ent-MailCake = { ent-BaseMail }
     .suffix = Торт
     .desc = { ent-BaseMail.desc }
@@ -31,42 +25,21 @@ ent-MailChocolate = { ent-BaseMail }
 ent-MailCigarettes = { ent-BaseMail }
     .suffix = Чипсы
     .desc = { ent-BaseMail.desc }
-ent-MailCigars = { ent-BaseMail }
-    .suffix = Сигары
-    .desc = { ent-BaseMail.desc }
 ent-MailCookies = { ent-BaseMail }
     .suffix = Печеньки
     .desc = { ent-BaseMail.desc }
-ent-MailCosplayArc = { ent-BaseMail }
-    .suffix = Часть костюма
-    .desc = { ent-BaseMail.desc }
-ent-MailCosplayGeisha = { ent-BaseMail }
-    .suffix = Костюм гейши
-    .desc = { ent-BaseMail.desc }
 ent-MailCosplayMaid = { ent-BaseMail }
     .suffix = Костюм служанки
     .desc = { ent-BaseMail.desc }
 ent-MailCosplayNurse = { ent-BaseMail }
     .suffix = Форма мед-сестры
     .desc = { ent-BaseMail.desc }
-ent-MailCosplaySchoolgirl = { ent-BaseMail }
-    .suffix = Форма школьницы
-    .desc = { ent-BaseMail.desc }
 ent-MailCosplayWizard = { ent-BaseMail }
     .suffix = Костюм колдуна
     .desc = { ent-BaseMail.desc }
-ent-MailCrayon = { ent-BaseMail }
-    .suffix = Мелок
-    .desc = { ent-BaseMail.desc }
 ent-MailFigurine = { ent-BaseMail }
     .suffix = Фигурка
     .desc = { ent-BaseMail.desc }
-ent-MailFishingCap = { ent-BaseMail }
-    .suffix = Панама рыбака
-    .desc = { ent-BaseMail.desc }
-ent-MailFlashlight = { ent-BaseMail }
-    .suffix = Фонарик
-    .desc = { ent-BaseMail.desc }
 ent-MailHighlander = { ent-BaseMail }
     .suffix = Горец
     .desc = { ent-BaseMail.desc }
@@ -94,36 +67,18 @@ ent-MailMuffins = { ent-BaseMail }
 ent-MailMoffins = { ent-BaseMail }
     .suffix = Моффины
     .desc = { ent-BaseMail.desc }
-ent-MailNoir = { ent-BaseMail }
-    .suffix = Нуар
-    .desc = { ent-BaseMail.desc }
 ent-MailPAI = { ent-BaseMail }
     .suffix = ПИИ
     .desc = { ent-BaseMail.desc }
 ent-MailPlushie = { ent-BaseMail }
     .suffix = Плюшевая игрушка
     .desc = { ent-BaseMail.desc }
-ent-MailRestraints = { ent-BaseMail }
-    .suffix = Стяжки
-    .desc = { ent-BaseMail.desc }
-ent-MailSignallerKit = { ent-BaseMail }
-    .suffix = Аварийный набор
-    .desc = { ent-BaseMail.desc }
 ent-MailSkub = { ent-BaseMail }
     .suffix = Скаб
     .desc = { ent-BaseMail.desc }
 ent-MailSoda = { ent-BaseMail }
     .suffix = Газировка
     .desc = { ent-BaseMail.desc }
-ent-MailSpaceVillainDIY = { ent-BaseMail }
-    .suffix = Руководство космического злодея
-    .desc = { ent-BaseMail.desc }
-ent-MailSunglasses = { ent-BaseMail }
-    .suffix = Солнечные очки
-    .desc = { ent-BaseMail.desc }
 ent-MailVagueThreat = { ent-BaseMail }
     .suffix = Угроза переворота
     .desc = { ent-BaseMail.desc }
-ent-MailWinterCoat = { ent-BaseMail }
-    .suffix = Куртка
-    .desc = { ent-BaseMail.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_civilian.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_civilian.ftl
index dabeaefb3d8..de2ce20a91f 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_civilian.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_civilian.ftl
@@ -1,36 +1,3 @@
-ent-MailBotanistChemicalBottles = { ent-BaseMail }
-    .suffix = Ботаник
-    .desc = { ent-BaseMail.desc }
-ent-MailBotanistMutagen = { ent-BaseMail }
-    .suffix = Мутаген
-    .desc = { ent-BaseMail.desc }
-ent-MailBotanistSeeds = { ent-BaseMail }
-    .suffix = Семена
-    .desc = { ent-BaseMail.desc }
-ent-MailClownGildedBikeHorn = { ent-BaseMail }
-    .suffix = Хонк
-    .desc = { ent-BaseMail.desc }
-ent-MailClownHonkSupplement = { ent-BaseMail }
-    .suffix = Хонк
-    .desc = { ent-BaseMail.desc }
-ent-MailHoPBureaucracy = { ent-BaseMail }
-    .suffix = ГП
-    .desc = { ent-BaseMail.desc }
-ent-MailHoPSupplement = { ent-BaseMail }
-    .suffix = ГП
-    .desc = { ent-BaseMail.desc }
-ent-MailMimeArtsCrafts = { ent-BaseMail }
-    .suffix = Художества
-    .desc = { ent-BaseMail.desc }
-ent-MailMimeBlankBook = { ent-BaseMail }
-    .suffix = Пустая книга
-    .desc = { ent-BaseMail.desc }
-ent-MailMimeBottleOfNothing = { ent-BaseMail }
-    .suffix = Ничего
-    .desc = { ent-BaseMail.desc }
 ent-MailMusicianInstrumentSmall = { ent-BaseMail }
     .suffix = Инструмент
     .desc = { ent-BaseMail.desc }
-ent-MailPassengerMoney = { ent-BaseMail }
-    .suffix = Кредиты
-    .desc = { ent-BaseMail.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_command.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_command.ftl
deleted file mode 100644
index 6fddeb09b62..00000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_command.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-MailCommandPinpointerNuclear = { ent-BaseMail }
-    .suffix = Пинпоинтер
-    .desc = { ent-BaseMail.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_engineering.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_engineering.ftl
deleted file mode 100644
index ffe152ac057..00000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_engineering.ftl
+++ /dev/null
@@ -1,12 +0,0 @@
-ent-MailEngineeringCables = { ent-BaseMail }
-    .suffix = Кабель
-    .desc = { ent-BaseMail.desc }
-ent-MailEngineeringKudzuDeterrent = { ent-BaseMail }
-    .suffix = Антикузда
-    .desc = { ent-BaseMail.desc }
-ent-MailEngineeringSheetGlass = { ent-BaseMail }
-    .suffix = Стекло
-    .desc = { ent-BaseMail.desc }
-ent-MailEngineeringWelderReplacement = { ent-BaseMail }
-    .suffix = Сварка
-    .desc = { ent-BaseMail.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_security.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_security.ftl
deleted file mode 100644
index 32fec70447a..00000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_security.ftl
+++ /dev/null
@@ -1,12 +0,0 @@
-ent-MailSecurityDonuts = { ent-BaseMail }
-    .suffix = Пончики
-    .desc = { ent-BaseMail.desc }
-ent-MailSecurityFlashlight = { ent-BaseMail }
-    .suffix = Фонарик
-    .desc = { ent-BaseMail.desc }
-ent-MailSecurityNonlethalsKit = { ent-BaseMail }
-    .suffix = Нелетал
-    .desc = { ent-BaseMail.desc }
-ent-MailWardenCrowdControl = { ent-BaseMail }
-    .suffix = Беспорядки
-    .desc = { ent-BaseMail.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/research/crystals.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/research/crystals.ftl
index 8696af061e0..8d9783031b3 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/research/crystals.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/research/crystals.ftl
@@ -1,2 +1,14 @@
 ent-CrystalNormality = Кристалл обыкновенности
     .desc = Выглядит.. обыкновенно.
+ent-MaterialNormality = Кристалл обыкновенности
+    .suffix = Полный
+    .desc = { ent-MaterialBase.desc }
+ent-MaterialNormality1 = { ent-MaterialNormality }
+    .suffix = 1
+    .desc = { ent-MaterialNormality.desc }
+ent-MaterialNormality3 = { ent-MaterialNormality1 }
+    .suffix = 3
+    .desc = { ent-MaterialNormality1.desc }
+ent-MaterialNormality5 = { ent-MaterialNormality1 }
+    .suffix = 5
+    .desc = { ent-MaterialNormality1.desc }
diff --git a/Resources/Locale/ru-RU/traits/misc.ftl b/Resources/Locale/ru-RU/traits/misc.ftl
new file mode 100644
index 00000000000..9639bb2b4e3
--- /dev/null
+++ b/Resources/Locale/ru-RU/traits/misc.ftl
@@ -0,0 +1 @@
+examine-cybereyes-message = Глаза { $entity } светятся слабым внутренним светом.
diff --git a/Resources/Locale/ru-RU/traits/traits.ftl b/Resources/Locale/ru-RU/traits/traits.ftl
index b2042f6a15e..4efc692b311 100644
--- a/Resources/Locale/ru-RU/traits/traits.ftl
+++ b/Resources/Locale/ru-RU/traits/traits.ftl
@@ -267,3 +267,34 @@ trait-name-Azaziba = Синта'Азазиба
 trait-description-Azaziba =
     Язык Могесов, состоящий из сочетания устной речи и жестикуляции.
     С тех пор как Могес вышел на галактическую арену, он стал менее популярным среди унатхов, которые так и не смогли подчиниться культурному господству Гегемонии.
+trait-name-BionicArm = Бионическая рука
+trait-description-BionicArm =
+    Одна или несколько ваших конечностей заменены на дорогостоящие, ультрасовременные бионические. Это может быть как очень реалистичная синтетическая плоть, так
+    и более очевидная металлическая конечность. Эта конечность обеспечивает повышенную прочность своему пользователю, позволяя вскрывать преграды голыми руками.
+trait-name-PlateletFactories = Восстановительный метаболизм
+trait-description-PlateletFactories =
+    Ваше тело было дополнено рядом биологически адаптированных органов, которые повышают выживаемость владельца в долгосрочной перспективе. Эти органы будут пытаться
+    поддерживать жизнь пользователя, даже несмотря на серьезные травмы, вплоть до смерти, но не включая ее.
+    Ваше естественное исцеление больше не ограничено, и теперь оно будет постепенно залечивать любые повреждения. Это касается и более экзотических травм, таких как радиационное облучение или рак.
+trait-name-DermalArmor = Полимерная кожа
+trait-description-DermalArmor =
+    Ваша кожа была заменена гибкой, но в то же время прочной оболочкой из твердого полимера, обернутой слоем синтетической ткани.
+    Это дополнение обеспечивает 10%-ную устойчивость к физическим повреждениям.
+trait-name-CyberEyes = Кибер-глаза
+trait-description-CyberEyes =
+    Один или несколько ваших глаз были заменены на высокомодульный механический глазной имплантат.
+    Их основная функция заключается в устранении естественных недостатков глаз пользователя,
+    но, кроме того, эти имплантаты обеспечивают защиту от ярких вспышек света.
+trait-name-CyberEyesSecurity = Кибер-глаза Безопасности
+trait-description-CyberEyesSecurity =
+    Ваши кибер-глаза были обновлены, теперь в них встроен центр безопасности. Обратите внимание, что это дополнение считается контрабандой
+    для тех, кто не работает в службе безопасности станции, и может быть отключено вашим работодателем перед отправкой на станцию.
+trait-name-CyberEyesMedical = Медицинские кибер-глаза
+trait-description-CyberEyesMedical = Ваши кибер-глаза были обновлены, теперь в них встроен медицинский дисплей, позволяющий отслеживать относительное состояние здоровья биологических организмов.
+trait-name-CyberEyesDiagnostic = Диагностические кибер-глаза
+trait-description-CyberEyesDiagnostic = Ваши кибер-глаза были обновлены и теперь включают встроенный диагностический центр, позволяющий отслеживать состояние искусственных объектов.
+trait-name-CyberEyesOmni = Омни-глаза
+trait-description-CyberEyesOmni =
+    Этот дорогостоящий имплантат сочетает в себе преимущества метода охранного визора, медицинского визора и диагностического визора.
+    Обратите внимание, что это дополнение считается контрабандой для тех, кто не работает в службе безопасности станции,
+    и может быть отключено вашим работодателем перед отправкой на станцию.
diff --git a/Resources/Migrations/frontierMigrations.yml b/Resources/Migrations/frontierMigrations.yml
new file mode 100644
index 00000000000..e8d607494ed
--- /dev/null
+++ b/Resources/Migrations/frontierMigrations.yml
@@ -0,0 +1,2 @@
+# 2024-08-22 - Frontier Mail - Add more to these when they come up as mapped. Part of the Frontier Mail port, blame Tortuga.
+MailPAI: MailNFPAI
diff --git a/Resources/Prototypes/Body/Organs/diona.yml b/Resources/Prototypes/Body/Organs/diona.yml
index 69fc630b9e4..a2133f7f90a 100644
--- a/Resources/Prototypes/Body/Organs/diona.yml
+++ b/Resources/Prototypes/Body/Organs/diona.yml
@@ -27,11 +27,12 @@
 
 - type: entity
   id: OrganDionaBrain
-  parent: [BaseDionaOrgan, OrganHumanBrain]
+  parent: OrganHumanBrain
   name: brain
   description: "The source of incredible, unending intelligence. Honk."
   components:
   - type: Sprite
+    sprite: Mobs/Species/Diona/organs.rsi
     state: brain
   - type: SolutionContainerManager
     solutions:
@@ -102,7 +103,7 @@
     layers:
       - state: lung-l
       - state: lung-r
-  - type: Lung 
+  - type: Lung
   - type: Metabolizer
     removeEmpty: true
     solutionOnBody: false
@@ -131,7 +132,7 @@
   description: "The source of incredible, unending intelligence. Honk."
   components:
   - type: Brain
-  - type: Nymph # This will make the organs turn into a nymph when they're removed. 
+  - type: Nymph # This will make the organs turn into a nymph when they're removed.
     entityPrototype: OrganDionaNymphBrain
     transferMind: true
 
@@ -170,11 +171,11 @@
 
 - type: entity
   id: OrganDionaNymphStomach
-  parent: MobDionaNymphAccent 
+  parent: MobDionaNymphAccent
   noSpawn: true
   name: diona nymph
   suffix: Stomach
-  description: Contains the stomach of a formerly fully-formed Diona. It doesn't taste any better for it. 
+  description: Contains the stomach of a formerly fully-formed Diona. It doesn't taste any better for it.
   components:
   - type: IsDeadIC
   - type: Body
@@ -186,7 +187,7 @@
   noSpawn: true
   name: diona nymph
   suffix: Lungs
-  description: Contains the lungs of a formerly fully-formed Diona. Breathtaking. 
+  description: Contains the lungs of a formerly fully-formed Diona. Breathtaking.
   components:
   - type: IsDeadIC
   - type: Body
diff --git a/Resources/Prototypes/Body/Organs/human.yml b/Resources/Prototypes/Body/Organs/human.yml
index 69081020ce0..e6a04d4a60c 100644
--- a/Resources/Prototypes/Body/Organs/human.yml
+++ b/Resources/Prototypes/Body/Organs/human.yml
@@ -6,6 +6,13 @@
   - type: Sprite
     sprite: Mobs/Species/Human/organs.rsi
   - type: Organ
+
+- type: entity
+  id: BaseHumanOrgan
+  parent: BaseHumanOrganUnGibbable
+  abstract: true
+  components:
+  - type: Gibbable
   - type: Food
   - type: Extractable
     grindableSolutionName: organ
@@ -27,13 +34,6 @@
     tags:
       - Meat
 
-- type: entity
-  id: BaseHumanOrgan
-  parent: BaseHumanOrganUnGibbable
-  abstract: true
-  components:
-  - type: Gibbable
-
 - type: entity
   id: OrganHumanBrain
   parent: BaseHumanOrganUnGibbable
@@ -67,7 +67,7 @@
   - type: FlavorProfile
     flavors:
       - people
-  
+
 - type: entity
   id: OrganHumanEyes
   parent: BaseHumanOrgan
diff --git a/Resources/Prototypes/Body/Organs/slime.yml b/Resources/Prototypes/Body/Organs/slime.yml
index 3da76c5d4aa..5b908e75f48 100644
--- a/Resources/Prototypes/Body/Organs/slime.yml
+++ b/Resources/Prototypes/Body/Organs/slime.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: SentientSlimeCore
-  parent: [BaseItem, OrganHumanBrain]
+  parent: OrganHumanBrain
   name: sentient slime core
   description: "The source of incredible, unending gooeyness."
   components:
@@ -34,7 +34,7 @@
           - ReagentId: Slime
             Quantity: 10
 
-      
+
 - type: entity
   id: OrganSlimeLungs
   parent: BaseHumanOrgan
diff --git a/Resources/Prototypes/CharacterItemGroups/scienceGroups.yml b/Resources/Prototypes/CharacterItemGroups/scienceGroups.yml
index e5e43760da0..ac41a9286a4 100644
--- a/Resources/Prototypes/CharacterItemGroups/scienceGroups.yml
+++ b/Resources/Prototypes/CharacterItemGroups/scienceGroups.yml
@@ -101,3 +101,22 @@
   items:
     - type: loadout
       id: LoadoutScienceShoesBootsWinterSci
+
+# Cataloguer
+- type: characterItemGroup
+  id: LoadoutCataloguerUniforms
+  items:
+    - type: loadout
+      id: LoadoutScienceJumpsuitLibrarianNt
+    - type: loadout
+      id: LoadoutScienceJumpsuitLibrarianIdris
+    - type: loadout
+      id: LoadoutScienceJumpsuitLibrarianOrion
+    - type: loadout
+      id: LoadoutScienceJumpsuitLibrarianHeph
+    - type: loadout
+      id: LoadoutScienceJumpsuitLibrarianPMCG
+    - type: loadout
+      id: LoadoutScienceJumpsuitLibrarianZav
+    - type: loadout
+      id: LoadoutScienceJumpsuitLibrarianZeng
\ No newline at end of file
diff --git a/Resources/Prototypes/CharacterItemGroups/serviceGroups.yml b/Resources/Prototypes/CharacterItemGroups/serviceGroups.yml
index 01ec0aaeea9..61c2b286b7e 100644
--- a/Resources/Prototypes/CharacterItemGroups/serviceGroups.yml
+++ b/Resources/Prototypes/CharacterItemGroups/serviceGroups.yml
@@ -76,12 +76,24 @@
     - type: loadout
       id: LoadoutServiceClownCowToolboxFilled
 
+- type: characterItemGroup
+  id: LoadoutHeadService
+  items:
+    - type: loadout
+      id: LoadoutServiceClownCowToolboxFilled
+
 # Bartender
 - type: characterItemGroup
   id: LoadoutBartenderOuterwear
   items:
     - type: loadout
       id: LoadoutServiceBartenderArmorDuraVest
+    - type: loadout
+      id: LoadoutServiceOuterBartenderNt
+    - type: loadout
+      id: LoadoutServiceOuterBartenderIdris
+    - type: loadout
+      id: LoadoutServiceOuterBartenderOrion
 
 - type: characterItemGroup
   id: LoadoutBartenderAmmo
@@ -98,3 +110,76 @@
       id: LoadoutServiceBartenderShotgunDoubleBarreledRubber
     - type: loadout
       id: LoadoutServiceBartenderMosinRubber
+
+- type: characterItemGroup
+  id: LoadoutBartenderUniforms
+  items:
+    - type: loadout
+      id: LoadoutServiceJumpsuitBartenderNt
+    - type: loadout
+      id: LoadoutServiceJumpsuitBartenderIdris
+    - type: loadout
+      id: LoadoutServiceJumpsuitBartenderOrion
+
+- type: characterItemGroup
+  id: LoadoutBartenderHead
+  items:
+    - type: loadout
+      id: LoadoutServiceHeadBartenderNt
+    - type: loadout
+      id: LoadoutServiceHeadBartenderIdris
+    - type: loadout
+      id: LoadoutServiceHeadBartenderOrion
+
+# Botanist
+- type: characterItemGroup
+  id: LoadoutBotanistUniforms
+  items:
+    - type: loadout
+      id: LoadoutServiceJumpsuitHydroponicsNt
+    - type: loadout
+      id: LoadoutServiceJumpsuitHydroponicsIdris
+    - type: loadout
+      id: LoadoutServiceJumpsuitHydroponicsOrion
+
+# Chef
+- type: characterItemGroup
+  id: LoadoutChefUniforms
+  items:
+    - type: loadout
+      id: LoadoutServiceJumpsuitChefNt
+    - type: loadout
+      id: LoadoutServiceJumpsuitChefIdris
+    - type: loadout
+      id: LoadoutServiceJumpsuitChefOrion
+
+- type: characterItemGroup
+  id: LoadoutChefHead
+  items:
+    - type: loadout
+      id: LoadoutServiceHeadChefNt
+    - type: loadout
+      id: LoadoutServiceHeadChefIdris
+    - type: loadout
+      id: LoadoutServiceHeadChefOrion
+
+- type: characterItemGroup
+  id: LoadoutChefOuter
+  items:
+    - type: loadout
+      id: LoadoutServiceOuterChefNt
+    - type: loadout
+      id: LoadoutServiceOuterChefIdris
+    - type: loadout
+      id: LoadoutServiceOuterChefOrion
+
+# Janitor
+- type: characterItemGroup
+  id: LoadoutJanitorUniforms
+  items:
+    - type: loadout
+      id: LoadoutServiceJumpsuitJanitorNt
+    - type: loadout
+      id: LoadoutServiceJumpsuitJanitorIdris
+    - type: loadout
+      id: LoadoutServiceJumpsuitJanitorOrion
\ No newline at end of file
diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml
index 811d5a580c2..30721d5e428 100644
--- a/Resources/Prototypes/Damage/modifier_sets.yml
+++ b/Resources/Prototypes/Damage/modifier_sets.yml
@@ -359,3 +359,10 @@
     Slash: 0.6
     Piercing: 0.6
     Holy: 1.5
+
+- type: damageModifierSet
+  id: DermalArmor
+  coefficients:
+    Blunt: 0.9
+    Slash: 0.9
+    Piercing: 0.9
diff --git a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/courierdrobe.yml b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/courierdrobe.yml
index 88f691ba9b7..778b3725858 100644
--- a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/courierdrobe.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/courierdrobe.yml
@@ -7,8 +7,10 @@
     CourierBag: 2
     ClothingHeadsetCargo: 2
     ClothingOuterWinterCargo: 2
-    ClothingUniformMailCarrier: 2 # Nyanotrasen - Mail Carrier old gear
-    ClothingUniformSkirtMailCarrier: 2 # Nyanotrasen - Mail Carrier old gear
-    ClothingHeadMailCarrier: 2 # Nyanotrasen - Mail Carrier old gear
-    MailBag: 2 # Nyanotrasen - Mail Carrier old gear
-    ClothingOuterWinterCoatMail: 2 # Nyanotrasen - Mail Carrier old gear
+    ClothingUniformMailCarrier: 2
+    ClothingUniformSkirtMailCarrier: 2
+    ClothingHeadMailCarrier: 2
+    MailBag: 2
+    ClothingOuterWinterCoatMail: 2
+    WeaponMailLake: 2
+    BoxMailCapsulePrimed: 4
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/cartridges.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/cartridges.yml
index def215cee43..81e11d9d084 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/cartridges.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/cartridges.yml
@@ -38,3 +38,24 @@
       sprite: Objects/Weapons/Melee/stunbaton.rsi
       state: stunbaton_on
   - type: SecWatchCartridge
+
+- type: entity
+  parent: BaseItem
+  id: MailMetricsCartridge
+  name: mail metrics cartridge
+  description: A cartridge that tracks statistics related to mail deliveries.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Devices/cartridge.rsi
+    state: cart-mail
+  - type: Icon
+    sprite: DeltaV/Objects/Devices/cartridge.rsi
+    state: cart-mail
+  - type: UIFragment
+    ui: !type:MailMetricUi
+  - type: MailMetricsCartridge
+  - type: Cartridge
+    programName: mail-metrics-program-name
+    icon:
+      sprite: Objects/Specific/Mail/mail.rsi
+      state: icon
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml
index 7de554f5ff5..6f96930078b 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml
@@ -1,3 +1,4 @@
+# DeltaV Mail
 - type: entity
   noSpawn: true
   parent: BaseMail
@@ -175,3 +176,1643 @@
   - type: Mail
     contents:
     - id: FoodPiePumpkin
+
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailDVCosplayFakeWizard
+  suffix: cosplay-wizard, fake as fuck
+  components:
+  - type: Mail
+    contents:
+    - id: ClothingOuterWizardFake
+    - id: ClothingHeadHatWizardFake
+    - id: ClothingShoesWizardFake
+    - id: FoodBurgerSpell
+      orGroup: FakeWizard
+      prob: 0.3
+    - id: FoodKebabSkewer
+      orGroup: FakeWizard
+      prob: 0.1
+
+- type: entity
+  parent: BaseMail
+  id: MailDVScarves
+  suffix: scarves
+  components:
+  - type: Mail
+    contents:
+    - id: ClothingNeckScarfStripedRed
+      orGroup: Scarf
+    - id: ClothingNeckScarfStripedBlue
+      orGroup: Scarf
+    - id: ClothingNeckScarfStripedGreen
+      orGroup: Scarf
+    - id: ClothingNeckScarfStripedBlack
+      orGroup: Scarf
+    - id: ClothingNeckScarfStripedBrown
+      orGroup: Scarf
+    - id: ClothingNeckScarfStripedLightBlue
+      orGroup: Scarf
+    - id: ClothingNeckScarfStripedOrange
+      orGroup: Scarf
+    - id: ClothingNeckScarfStripedPurple
+      orGroup: Scarf
+    - id: ClothingNeckScarfStripedZebra
+      orGroup: Scarf
+    - id: ClothingNeckScarfStripedSyndieGreen
+      orGroup: Scarf
+      prob: 0.25
+    - id: ClothingNeckScarfStripedSyndieRed
+      orGroup: Scarf
+      prob: 0.25
+    - id: ClothingNeckScarfStripedCentcom
+      orGroup: Scarf
+      prob: 0.001
+
+- type: entity
+  parent: BaseMailLarge
+  id: MailDVBoxes
+  suffix: boxes
+  components:
+  - type: Mail
+    contents:
+#    - id: BoxEnvelope # TODO: we do not have this on EE?
+#      orGroup: Box
+    - id: BoxCardboard
+      orGroup: Box
+    - id: BoxMRE
+      orGroup: Box
+    - id: BoxPerformer
+      orGroup: Box
+    - id: BoxFlare
+      orGroup: Box
+    - id: BoxDarts
+      orGroup: Box
+    - id: BoxMousetrap
+      orGroup: Box
+
+
+
+# Frontier Mail, including Extended Nyano Mail. (Pony Express?)
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailNFAlcohol
+  suffix: alcohol, extended
+  components:
+  - type: Mail
+    isFragile: true
+    contents:
+      # 12.5 overall weight, 8% base chance
+    - id: DrinkAbsintheBottleFull
+      orGroup: Drink
+    - id: DrinkBlueCuracaoBottleFull
+      orGroup: Drink
+    - id: DrinkCoffeeLiqueurBottleFull
+      orGroup: Drink
+    - id: DrinkGinBottleFull
+      orGroup: Drink
+    - id: DrinkMelonLiquorBottleFull
+      orGroup: Drink
+    - id: DrinkRumBottleFull
+      orGroup: Drink
+    - id: DrinkTequilaBottleFull
+      orGroup: Drink
+    - id: DrinkVermouthBottleFull
+      orGroup: Drink
+    - id: DrinkVodkaBottleFull
+      orGroup: Drink
+    - id: DrinkWhiskeyBottleFull
+      orGroup: Drink
+    - id: DrinkWineBottleFull
+      orGroup: Drink
+    - id: DrinkChampagneBottleFull
+      orGroup: Drink
+      prob: 0.5
+    - id: DrinkGildlagerBottleFull
+      orGroup: Drink
+      prob: 0.5
+    - id: DrinkPatronBottleFull
+      orGroup: Drink
+      prob: 0.5
+    - id: DrinkGlass
+      amount: 2
+
+- type: entity
+  noSpawn: true
+  parent: BaseMailLarge
+  id: MailNFBible
+  suffix: bible, extended
+  components:
+  - type: Mail
+    contents:
+    - id: Bible
+    - id: ClothingHeadHatWitch1 #DeltaV - Compensates for items that don't exist here
+    - id: ClothingOuterCoatMNKBlackTopCoat #DeltaV - Compensates for items that don't exist here
+
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailNFBikeHorn
+  suffix: bike horn, random
+  components:
+  - type: Mail
+    contents:
+    - id: BikeHorn
+      orGroup: Horn
+      prob: 0.95
+    - id: CluwneHorn
+      orGroup: Horn
+      prob: 0.05
+
+- type: entity
+  noSpawn: true
+  parent: BaseMailLarge
+  id: MailNFBuildABuddy
+  suffix: Build-a-Buddy
+  components:
+  - type: Mail
+    isFragile: true
+    contents:
+#      - id: BoxBuildABuddyGoblin # DeltaV - Goblins Aren't Real
+#        orGroup: Box
+      - id: BoxBuildABuddyHuman
+        orGroup: Box
+      - id: BoxBuildABuddyReptilian
+        orGroup: Box
+      - id: BoxBuildABuddySlime
+        orGroup: Box
+      - id: BoxBuildABuddyVulpkanin
+        orGroup: Box
+      - id: DrinkSpaceGlue
+      - id: PaperMailNFBuildABuddy
+
+- type: entity
+  noSpawn: true
+  parent: BaseMailLarge
+  id: MailNFCake
+  suffix: cake, extended
+  components:
+  - type: Mail
+    isFragile: true
+    isPriority: true
+    contents:
+      # 14.8 total weight, ~6.8% base chance
+    - id: FoodCakeApple
+      orGroup: Cake
+    - id: FoodCakeBirthday
+      orGroup: Cake
+    - id: FoodCakeBlueberry
+      orGroup: Cake
+    - id: FoodCakeCarrot
+      orGroup: Cake
+    - id: FoodCakeCheese
+      orGroup: Cake
+    - id: FoodCakeChocolate
+      orGroup: Cake
+    - id: FoodCakeChristmas
+      orGroup: Cake
+    - id: FoodCakeClown
+      orGroup: Cake
+    - id: FoodCakeLemon
+      orGroup: Cake
+    - id: FoodCakeLime
+      orGroup: Cake
+    - id: FoodCakeOrange
+      orGroup: Cake
+    - id: FoodCakePumpkin
+      orGroup: Cake
+    - id: FoodCakeVanilla
+      orGroup: Cake
+    # Uncommon
+    - id: FoodMothMothmallow
+      orGroup: Cake
+      prob: 0.5
+    - id: FoodCakeSlime
+      orGroup: Cake
+      prob: 0.5
+    # Rare
+    - id: FoodCakeBrain
+      orGroup: Cake
+      prob: 0.25
+    - id: FoodCakeLemoon
+      orGroup: Cake
+      prob: 0.25
+    - id: FoodCakeSuppermatter
+      orGroup: Cake
+      prob: 0.25
+    # Ultra rare
+    - id: FoodCakeSpaceman
+      orGroup: Cake
+      prob: 0.05
+    - id: KnifePlastic
+    - id: ForkPlastic
+      amount: 2
+
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailNFCosplayWizard
+  suffix: cosplay-wizard, extended
+  components:
+  - type: Mail
+    contents:
+    - id: ClothingOuterWizard
+    - id: ClothingHeadHatWizard
+    - id: ClothingShoesWizard
+    - id: PonderingOrb
+      orGroup: Staff
+      prob: 0.3
+    - id: RGBStaff
+      orGroup: Staff
+      prob: 0.1
+
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailNFCosplayMaid
+  suffix: cosplay-maid, extended
+  components:
+  - type: Mail
+    contents:
+      - id: UniformMaid
+        orGroup: Uniform
+      - id: ClothingUniformJumpskirtJanimaid
+        orGroup: Uniform
+      - id: ClothingUniformJumpskirtJanimaidmini
+        orGroup: Uniform
+      - id: MegaSprayBottle
+      - id: ClothingHandsGlovesColorWhite
+
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailNFCosplayNurse
+  suffix: cosplay-nurse, extended
+  components:
+  - type: Mail
+    contents:
+      - id: ClothingUniformJumpskirtNurse
+      - id: ClothingHeadNurseHat
+      - id: Syringe
+
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailNFCheese
+  suffix: cheese, extended
+  components:
+  - type: Mail
+    isFragile: true
+    isPriority: true
+    contents:
+    - id: FoodCheese
+      orGroup: Cheese
+      prob: 0.5
+    - id: FoodChevre
+      orGroup: Cheese
+      prob: 0.5
+    - id: KnifePlastic
+
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailNFCigarettes
+  suffix: cigs, random
+  components:
+  - type: Mail
+    contents:
+    - id: CigPackBlack
+      orGroup: Cigs
+      prob: 0.19
+    - id: CigPackBlue
+      orGroup: Cigs
+      prob: 0.19
+    - id: CigPackGreen
+      orGroup: Cigs
+      prob: 0.19
+    - id: CigPackRed
+      orGroup: Cigs
+      prob: 0.19
+    - id: CigPackMixed
+      orGroup: Cigs
+      prob: 0.09 # Pool shared with CigPackMixedMedical, CigPackMixedNasty
+    - id: CigPackMixedMedical
+      orGroup: Cigs
+      prob: 0.05
+    - id: CigPackMixedNasty
+      orGroup: Cigs
+      prob: 0.05
+      # Rare
+    - id: CigPackSyndicate
+      orGroup: Cigs
+      prob: 0.05
+    - id: CheapLighter
+
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailNFEMP
+  suffix: emp
+  components:
+  - type: Mail
+    contents:
+    - id: DelayedEMP
+    - id: PaperMailNFEMPPreparedness
+
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailNFSmoke
+  suffix: smoke
+  components:
+  - type: Mail
+    contents:
+    - id: DelayedSmoke
+
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailNFGoldCigars
+  suffix: cigars, premium
+  components:
+  - type: Mail
+    contents:
+    - id: CigarGoldCase
+      orGroup: Cigars
+    - id: FlippoLighter
+      orGroup: Lighter
+      prob: 0.95
+
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailNFCookies
+  suffix: cookies, random
+  components:
+  - type: Mail
+    isPriority: true
+    contents:
+      # Cookie 1
+    - id: FoodBakedCookie
+      orGroup: Cookie1
+    - id: FoodBakedCookieOatmeal
+      orGroup: Cookie1
+    - id: FoodBakedCookieRaisin
+      orGroup: Cookie1
+    - id: FoodBakedCookieSugar
+      orGroup: Cookie1
+      # Cookie 2
+    - id: FoodBakedCookie
+      orGroup: Cookie2
+    - id: FoodBakedCookieOatmeal
+      orGroup: Cookie2
+    - id: FoodBakedCookieRaisin
+      orGroup: Cookie2
+    - id: FoodBakedCookieSugar
+      orGroup: Cookie2
+      # Cookie 3
+    - id: FoodBakedCookie
+      orGroup: Cookie3
+    - id: FoodBakedCookieOatmeal
+      orGroup: Cookie3
+    - id: FoodBakedCookieRaisin
+      orGroup: Cookie3
+    - id: FoodBakedCookieSugar
+      orGroup: Cookie3
+      # Cookie 4
+    - id: FoodBakedCookie
+      orGroup: Cookie4
+    - id: FoodBakedCookieOatmeal
+      orGroup: Cookie4
+    - id: FoodBakedCookieRaisin
+      orGroup: Cookie4
+    - id: FoodBakedCookieSugar
+      orGroup: Cookie4
+
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailNFKnife
+  suffix: knife, extended
+  components:
+  - type: Mail
+    contents:
+    - id: KukriKnife
+      orGroup: Knife
+    - id: Machete # A little large for an envelope but "we'll live"
+      orGroup: Knife
+    - id: CombatKnife
+      orGroup: Knife
+    - id: SurvivalKnife
+      orGroup: Knife
+
+- type: entity
+  noSpawn: true
+  parent: BaseMailLarge
+  id: MailNFSword
+  suffix: sword
+  components:
+  - type: Mail
+    contents:
+    - id: KatanaDulled
+      orGroup: Sword
+      prob: 0.95
+    - id: ClaymoreDulled
+      orGroup: Sword
+      prob: 0.95
+    - id: FoamCutlass
+      orGroup: Sword
+      prob: 0.95
+    - id: Katana
+      orGroup: Sword
+      prob: 0.5
+    - id: Claymore
+      orGroup: Sword
+      prob: 0.5
+#    - id: CaneSheathFilled # TODO: don't have this yet
+#      orGroup: Sword
+#      prob: 0.3
+    - id: Cutlass
+      orGroup: Sword
+      prob: 0.1
+    - id: Kanabou # ah yes, swords
+      orGroup: Sword
+      prob: 0.1
+    - id: ClothingBeltSheathFilled # Little dangerous between the reflect and the damage
+      orGroup: Sword
+      prob: 0.001
+
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailNFMuffins
+  suffix: muffins, random
+  components:
+  - type: Mail
+    isPriority: true
+    contents:
+      # Muffin 1
+    - id: FoodBakedMuffinBerry
+      orGroup: Muffin1
+    - id: FoodBakedMuffinCherry
+      orGroup: Muffin1
+    - id: FoodBakedMuffinBluecherry
+      orGroup: Muffin1
+    - id: FoodBakedMuffin
+      orGroup: Muffin1
+    - id: FoodMothMoffin
+      orGroup: Muffin1
+      prob: 0.5
+      # Muffin 2
+    - id: FoodBakedMuffinBerry
+      orGroup: Muffin2
+    - id: FoodBakedMuffinCherry
+      orGroup: Muffin2
+    - id: FoodBakedMuffinBluecherry
+      orGroup: Muffin2
+    - id: FoodBakedMuffin
+      orGroup: Muffin2
+    - id: FoodMothMoffin
+      orGroup: Muffin2
+      prob: 0.5
+      # Muffin 3
+    - id: FoodBakedMuffinBerry
+      orGroup: Muffin3
+    - id: FoodBakedMuffinCherry
+      orGroup: Muffin3
+    - id: FoodBakedMuffinBluecherry
+      orGroup: Muffin3
+    - id: FoodBakedMuffin
+      orGroup: Muffin3
+    - id: FoodMothMoffin
+      orGroup: Muffin3
+      prob: 0.5
+      # Muffin 4
+    - id: FoodBakedMuffinBerry
+      orGroup: Muffin4
+    - id: FoodBakedMuffinCherry
+      orGroup: Muffin4
+    - id: FoodBakedMuffinBluecherry
+      orGroup: Muffin4
+    - id: FoodBakedMuffin
+      orGroup: Muffin4
+    - id: FoodMothMoffin
+      orGroup: Muffin4
+      prob: 0.5
+
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailNFPAI
+  suffix: PAI, extended
+  components:
+  - type: Mail
+    contents:
+    - id: PersonalAI
+      orGroup: PAI
+      prob: 0.99
+      # Ultra rare
+    - id: SyndicatePersonalAI
+      orGroup: PAI
+      prob: 0.01
+
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailNFPlushie
+  suffix: plushie, extended
+  components:
+  - type: Mail
+    contents:
+      # These are all grouped up now to guarantee at least one item received.
+      # The downside is you're not going to get half a dozen plushies anymore.
+    - id: PlushieBee
+      orGroup: Plushie
+    - id: PlushieRGBee
+      prob: 0.5
+      orGroup: Plushie
+    - id: PlushieNuke
+      orGroup: Plushie
+    - id: PlushieArachind #DeltaV - Adds MORE PLUSHIE
+      orGroup: Plushie
+    - id: PlushieAtmosian #DeltaV - Adds MORE PLUSHIE
+      orGroup: Plushie
+    - id: PlushieXeno #DeltaV - Adds MORE PLUSHIE
+      orGroup: Plushie
+    - id: PlushiePenguin #DeltaV - Adds MORE PLUSHIE
+      orGroup: Plushie
+    - id: PlushieGhost #DeltaV - Adds MORE PLUSHIE
+      orGroup: Plushie
+    - id: PlushieDiona #DeltaV - Adds MORE PLUSHIE
+      orGroup: Plushie
+    - id: ToyMouse #DeltaV - Adds MORE PLUSHIE
+      orGroup: Plushie
+    - id: PlushieRouny
+      orGroup: Plushie
+    - id: PlushieLizard
+      orGroup: Plushie
+    - id: PlushieSpaceLizard
+      orGroup: Plushie
+    - id: PlushieRatvar
+      orGroup: Plushie
+    - id: PlushieNar
+      orGroup: Plushie
+    - id: PlushieCarp
+      orGroup: Plushie
+    - id: PlushieHolocarp #DeltaV - Adds MORE PLUSHIE
+      orGroup: Plushie
+    - id: PlushieRainbowCarp #DeltaV - Adds MORE PLUSHIE
+      orGroup: Plushie
+    - id: PlushieSlime
+      orGroup: Plushie
+    - id: PlushieSnake
+      orGroup: Plushie
+    - id: PlushieMothRandom
+      orGroup: Plushie
+    - id: PlushieMoth
+      prob: 0.5
+      orGroup: Plushie
+    - id: PlushieMothMusician
+      prob: 0.5
+      orGroup: Plushie
+    - id: PlushieMothBartender
+      prob: 0.5
+      orGroup: Plushie
+
+# Random snacks, replaces MailChocolate (lousy animal organs)
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailNFSnacks
+  suffix: snacks, random
+  components:
+  - type: Mail
+    contents:
+    # Snack 1
+    - id: FoodSnackChocolate
+      orGroup: Snack1
+    - id: FoodSnackPopcorn
+      orGroup: Snack1
+    - id: FoodSnackChips
+      orGroup: Snack1
+    - id: FoodSnackBoritos
+      orGroup: Snack1
+    - id: FoodSnackSus
+      orGroup: Snack1
+    - id: FoodSnackPistachios
+      orGroup: Snack1
+    - id: FoodSnackRaisins
+      orGroup: Snack1
+    - id: FoodSnackCheesie
+      orGroup: Snack1
+    - id: FoodSnackEnergy
+      orGroup: Snack1
+    - id: FoodSnackCnDs
+      orGroup: Snack1
+    - id: FoodSnackSemki
+      orGroup: Snack1
+    - id: FoodSnackSyndi
+      orGroup: Snack1
+      prob: 0.5
+    # Snack 2
+    - id: FoodSnackChocolate
+      orGroup: Snack2
+    - id: FoodSnackPopcorn
+      orGroup: Snack2
+    - id: FoodSnackChips
+      orGroup: Snack2
+    - id: FoodSnackBoritos
+      orGroup: Snack2
+    - id: FoodSnackSus
+      orGroup: Snack2
+    - id: FoodSnackPistachios
+      orGroup: Snack2
+    - id: FoodSnackRaisins
+      orGroup: Snack2
+    - id: FoodSnackCheesie
+      orGroup: Snack2
+    - id: FoodSnackEnergy
+      orGroup: Snack2
+    - id: FoodSnackCnDs
+      orGroup: Snack2
+    - id: FoodSnackSemki
+      orGroup: Snack2
+    - id: FoodSnackSyndi
+      orGroup: Snack2
+      prob: 0.5
+    # Snack 3
+    - id: FoodSnackChocolate
+      orGroup: Snack3
+    - id: FoodSnackPopcorn
+      orGroup: Snack3
+    - id: FoodSnackChips
+      orGroup: Snack3
+    - id: FoodSnackBoritos
+      orGroup: Snack3
+    - id: FoodSnackSus
+      orGroup: Snack3
+    - id: FoodSnackPistachios
+      orGroup: Snack3
+    - id: FoodSnackRaisins
+      orGroup: Snack3
+    - id: FoodSnackCheesie
+      orGroup: Snack3
+    - id: FoodSnackEnergy
+      orGroup: Snack3
+    - id: FoodSnackCnDs
+      orGroup: Snack3
+    - id: FoodSnackSemki
+      orGroup: Snack3
+    - id: FoodSnackSyndi
+      orGroup: Snack3
+      prob: 0.5
+    # Snack 4
+    - id: FoodSnackChocolate
+      orGroup: Snack4
+    - id: FoodSnackPopcorn
+      orGroup: Snack4
+    - id: FoodSnackChips
+      orGroup: Snack4
+    - id: FoodSnackBoritos
+      orGroup: Snack4
+    - id: FoodSnackSus
+      orGroup: Snack4
+    - id: FoodSnackPistachios
+      orGroup: Snack4
+    - id: FoodSnackRaisins
+      orGroup: Snack4
+    - id: FoodSnackCheesie
+      orGroup: Snack4
+    - id: FoodSnackEnergy
+      orGroup: Snack4
+    - id: FoodSnackCnDs
+      orGroup: Snack4
+    - id: FoodSnackSemki
+      orGroup: Snack4
+    - id: FoodSnackSyndi
+      orGroup: Snack4
+      prob: 0.5
+
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailNFVagueThreat
+  suffix: vague-threat
+  components:
+  - type: Mail
+    contents:
+    - id: PaperMailNFVagueThreat1
+      orGroup: Paper
+    - id: PaperMailNFVagueThreat2
+      orGroup: Paper
+    - id: PaperMailNFVagueThreat3
+      orGroup: Paper
+    - id: PaperMailNFVagueThreat4
+      orGroup: Paper
+    - id: PaperMailNFVagueThreat5
+      orGroup: Paper
+    - id: PaperMailNFVagueThreat6
+      orGroup: Paper
+    - id: PaperMailNFVagueThreat7
+      orGroup: Paper
+    - id: PaperMailNFVagueThreat8
+      orGroup: Paper
+    - id: PaperMailNFVagueThreat9
+      orGroup: Paper
+    - id: PaperMailNFVagueThreat10
+      orGroup: Paper
+    - id: PaperMailNFVagueThreat11
+      orGroup: Paper
+    - id: PaperMailNFVagueThreat12
+      orGroup: Paper
+    - id: KitchenKnife
+      orGroup: ThreateningObject
+    - id: ButchCleaver
+      orGroup: ThreateningObject
+    - id: CombatKnife
+      orGroup: ThreateningObject
+    - id: SurvivalKnife
+      orGroup: ThreateningObject
+    - id: SoapHomemade
+      orGroup: ThreateningObject
+    - id: FoodMeat
+      orGroup: ThreateningObject
+    - id: OrganHumanHeart
+      orGroup: ThreateningObject
+
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailNFDonkPockets
+  suffix: donk pockets, random
+  components:
+  - type: Mail
+    contents:
+    - id: FoodBoxDonkpocket
+      orGroup: Donk
+      prob: 0.4 # Higher probability, useful for chefs.
+    - id: FoodBoxDonkpocketSpicy
+      orGroup: Donk
+      prob: 0.1
+    - id: FoodBoxDonkpocketTeriyaki
+      orGroup: Donk
+      prob: 0.1
+    - id: FoodBoxDonkpocketPizza
+      orGroup: Donk
+      prob: 0.1
+    - id: FoodBoxDonkpocketStonk
+      orGroup: Donk
+      prob: 0.05
+    - id: FoodBoxDonkpocketCarp
+      orGroup: Donk
+      prob: 0.05
+    - id: FoodBoxDonkpocketBerry
+      orGroup: Donk
+      prob: 0.1
+    - id: FoodBoxDonkpocketHonk
+      orGroup: Donk
+      prob: 0.05
+    - id: FoodBoxDonkpocketDink
+      orGroup: Donk
+      prob: 0.05 # Bad luck.
+
+# Needs a buff?
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailNFSodaPwrGame
+  suffix: Pwrgame
+  components:
+  - type: Mail
+    contents:
+    - id: DrinkPwrGameCan
+      amount: 3
+    - id: PaperMailNFPwrGameAd
+
+# Needs a buff?
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailNFSodaRedBool
+  suffix: Red Bool
+  components:
+  - type: Mail
+    contents:
+    - id: DrinkEnergyDrinkCan
+      amount: 3
+    - id: PaperMailNFRedBoolAd
+
+# Needs a buff?
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailNFSodaSpaceCola
+  suffix: Space Cola
+  components:
+  - type: Mail
+    contents:
+    - id: DrinkColaBottleFull
+    - id: PaperMailNFSpaceColaAd
+
+# Needs a buff?
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailNFSodaSpaceMountainWind
+  suffix: Space Mountain Wind
+  components:
+  - type: Mail
+    contents:
+    - id: DrinkSpaceMountainWindBottleFull
+    - id: PaperMailNFSpaceMountainWindAd
+
+# Needs a buff?
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailNFSodaSpaceUp
+  suffix: Space Up
+  components:
+  - type: Mail
+    contents:
+    - id: DrinkSpaceUpBottleFull
+    - id: PaperMailNFSpaceUpAd
+
+#TODO: we don't have rainbow joints or blunts (yet?). Uncomment when (if?) they are added.
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailNFJoints
+  suffix: joints
+  components:
+  - type: Mail
+    contents:
+    # Smokeable 1
+    - id: Joint
+      orGroup: Smokeable1
+      prob: 0.35
+#    - id: JointRainbow
+#      orGroup: Smokeable1
+#      prob: 0.15
+#    - id: Blunt
+#      orGroup: Smokeable1
+#      prob: 0.35
+#    - id: BluntRainbow
+#      orGroup: Smokeable1
+#      prob: 0.15
+    # Smokeable 2
+    - id: Joint
+      orGroup: Smokeable2
+      prob: 0.35
+#    - id: JointRainbow
+#      orGroup: Smokeable2
+#      prob: 0.15
+#    - id: Blunt
+#      orGroup: Smokeable2
+#      prob: 0.35
+#    - id: BluntRainbow
+#      orGroup: Smokeable2
+#      prob: 0.15
+    # Smokeable 3
+    - id: Joint
+      orGroup: Smokeable3
+      prob: 0.35
+#    - id: JointRainbow
+#      orGroup: Smokeable3
+#      prob: 0.15
+#    - id: Blunt
+#      orGroup: Smokeable3
+#      prob: 0.35
+#    - id: BluntRainbow
+#      orGroup: Smokeable3
+#      prob: 0.15
+
+# Catchalls for food that only exist in random spawners
+# Mmm, mail food
+# Needs a buff?
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailNFUnusualFood
+  suffix: unusual food
+  components:
+  - type: Mail
+    isPriority: true
+    isFragile: true
+    contents:
+    - id: FoodMealNachos
+      orGroup: Food
+    - id: FoodMealNachosCheesy
+      orGroup: Food
+    - id: FoodMealNachosCuban
+      orGroup: Food
+    - id: FoodMealEggplantParm
+      orGroup: Food
+    - id: FoodMealPotatoYaki
+      orGroup: Food
+    - id: FoodMealCornedbeef
+      orGroup: Food
+    - id: FoodMealBearsteak
+      orGroup: Food
+    - id: FoodMealPigblanket
+      orGroup: Food
+    - id: FoodMealEggsbenedict
+      orGroup: Food
+    - id: FoodMealOmelette
+      orGroup: Food
+    - id: FoodMealFriedegg
+      orGroup: Food
+    - id: FoodMealMilkape
+      orGroup: Food
+    - id: FoodMealMemoryleek
+      orGroup: Food
+    - id: DisgustingSweptSoup
+      orGroup: Food
+    - id: FoodBreadVolcanic
+      orGroup: Food
+    - id: FoodBakedWaffleSoylent
+      orGroup: Food
+    - id: FoodBakedWaffleRoffle
+      orGroup: Food
+    - id: FoodPieCherry
+      orGroup: Food
+    - id: FoodPieFrosty
+      orGroup: Food
+      prob: 0.05
+    - id: FoodMeatGoliathCooked
+      amount: 3
+      orGroup: Food
+    - id: FoodMeatRounyCooked
+      amount: 3
+      orGroup: Food
+    - id: FoodMeatLizardCooked
+      amount: 3
+      orGroup: Food
+    - id: FoodMeatSpiderlegCooked
+      amount: 3
+      orGroup: Food
+    - id: FoodMeatMeatballCooked
+      amount: 4
+      orGroup: Food
+
+# Needs a buff?
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailNFBakedGoods
+  suffix: baked goods
+  components:
+  - type: Mail
+    isPriority: true
+    isFragile: true
+    contents:
+    - id: FoodBakedBunHoney
+      amount: 2
+      orGroup: Food
+    - id: FoodBakedBunHotX
+      amount: 2
+      orGroup: Food
+    - id: FoodBakedBunMeat
+      amount: 2
+      orGroup: Food
+    - id: FoodBakedPretzel
+      amount: 2
+      orGroup: Food
+    - id: FoodBakedCannoli
+      amount: 2
+      orGroup: Food
+    - id: FoodDonutPlain
+      amount: 2
+      orGroup: Food
+    - id: FoodDonutJellyPlain
+      amount: 2
+      orGroup: Food
+    - id: FoodDonutHomer
+      amount: 2
+      orGroup: Food
+    - id: FoodDonutChaos
+      amount: 2
+      orGroup: Food
+    - id: FoodDonutMeat
+      amount: 2
+      orGroup: Food
+    - id: FoodDonutPink
+      amount: 2
+      orGroup: Food
+    - id: FoodDonutSpaceman
+      amount: 2
+      orGroup: Food
+    - id: FoodDonutApple
+      amount: 2
+      orGroup: Food
+    - id: FoodDonutCaramel
+      amount: 2
+      orGroup: Food
+    - id: FoodDonutChocolate
+      amount: 2
+      orGroup: Food
+#    - id: FoodDonutBluePumpkin # Don't have that yet
+#      amount: 2
+#      orGroup: Food
+    - id: FoodDonutBungo
+      amount: 2
+      orGroup: Food
+    - id: FoodDonut
+      amount: 2
+      orGroup: Food
+    - id: FoodDonutSweetpea
+      amount: 2
+      orGroup: Food
+    - id: FoodDonutJellyHomer
+      amount: 2
+      orGroup: Food
+    - id: FoodDonutJellyPink
+      amount: 2
+      orGroup: Food
+    - id: FoodDonutJellySpaceman
+      amount: 2
+      orGroup: Food
+    - id: FoodDonutJellyApple
+      amount: 2
+      orGroup: Food
+    - id: FoodDonutJellyCaramel
+      amount: 2
+      orGroup: Food
+    - id: FoodDonutJellyChocolate
+      amount: 2
+      orGroup: Food
+#    - id: FoodDonutJellyBluePumpkin # Don't have that yet
+#      amount: 2
+#      orGroup: Food
+    - id: FoodDonutJellyBungo
+      amount: 2
+      orGroup: Food
+    - id: FoodDonutJelly
+      amount: 2
+      orGroup: Food
+    - id: FoodDonutJellySweetpea
+      amount: 2
+      orGroup: Food
+    - id: FoodDonutJellySlugcat
+      amount: 2
+      orGroup: Food
+    - id: FoodFrozenSandwich # ah yes, baked goods
+      amount: 2
+      orGroup: Food
+    - id: FoodFrozenFreezy
+      amount: 2
+      orGroup: Food
+    - id: FoodFrozenSundae
+      amount: 2
+      orGroup: Food
+    - id: FoodFrozenCornuto
+      amount: 2
+      orGroup: Food
+    - id: FoodFrozenPopsicleOrange
+      amount: 2
+      orGroup: Food
+    - id: FoodFrozenPopsicleBerry
+      amount: 2
+      orGroup: Food
+    - id: FoodFrozenPopsicleJumbo
+      amount: 2
+      orGroup: Food
+    - id: FoodFrozenSnowcone
+      amount: 2
+      orGroup: Food
+    - id: FoodFrozenSnowconeBerry
+      amount: 2
+      orGroup: Food
+    - id: FoodFrozenSnowconeFruit
+      amount: 2
+      orGroup: Food
+    - id: FoodFrozenSnowconeClown
+      amount: 2
+      orGroup: Food
+    - id: FoodFrozenSnowconeMime
+      amount: 2
+      orGroup: Food
+    - id: FoodFrozenSnowconeRainbow
+      amount: 2
+      orGroup: Food
+    - id: FoodFrozenSnowconeMime
+      amount: 2
+      orGroup: Food
+    - id: FoodMealMint # unlucky
+      amount: 2
+      orGroup: Food
+
+# Needs a buff?
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailNFUnusualProduce
+  suffix: unusual produce
+  components:
+  - type: Mail
+    isPriority: true
+    isFragile: true
+    contents:
+    - id: FoodLaughinPeaPod
+      orGroup: Produce
+      amount: 5
+    - id: FoodMimana
+      orGroup: Produce
+      amount: 5
+    - id: FoodLemoon
+      orGroup: Produce
+      amount: 5
+    - id: FoodBlueTomato
+      orGroup: Produce
+      amount: 5
+    - id: FoodBloodTomato
+      orGroup: Produce
+      amount: 5
+    - id: FoodKoibean
+      orGroup: Produce
+      amount: 5
+#     EE does not have those yet. Uncomment if any of those get ported.
+#    - id: FoodGhostPepper #DeltaV
+#      orGroup: Produce
+#      amount: 5
+#    - id: FoodCosmicRevenant #DeltaV
+#      orGroup: Produce
+#      amount: 5
+#    - id: FoodCrystalThistle #DeltaV
+#      orGroup: Produce
+#      amount: 5
+    - id: FoodLily
+      orGroup: Produce
+      amount: 5
+      prob: 0.5
+    - id: FoodAmbrosiaDeus
+      orGroup: Produce
+      amount: 5
+      prob: 0.5
+    - id: FoodSpacemansTrumpet
+      orGroup: Produce
+      amount: 5
+      prob: 0.25
+
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailNFSoaps
+  suffix: soap sampler
+  components:
+  - type: Mail
+    contents:
+    - id: BoxSoapsAssorted
+    - id: PaperMailNTSoapAd1
+      orGroup: Ad
+    - id: PaperMailNTSoapAd2
+      orGroup: Ad
+
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailNFSoapsOmega
+  suffix: soap sampler, omega
+  components:
+  - type: Mail
+    contents:
+    - id: BoxSoapsAssortedOmega
+    - id: PaperMailNTSoapAd1
+      orGroup: Ad
+    - id: PaperMailNTSoapAd2
+      orGroup: Ad
+
+# Could add spessman battle rules here
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailNFFigurineBulk # DeltaV - No longer Bulk
+  suffix: figurine, bulk #DeltaV - Spams 3 boxes instead of using the bulk figurine prototype that Frontier uses
+  components:
+  - type: Mail
+    contents:
+    - id: MysteryFigureBox
+    - id: MysteryFigureBox
+    - id: MysteryFigureBox
+
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailNFPen
+  suffix: fancy pen
+  components:
+  - type: Mail
+    contents:
+    - id: LuxuryPen
+      orGroup: Pen
+      prob: 0.50
+    # DeltaV: Commenting these two out because I dunno if crew should have nice things
+    # - id: PenHop
+    #   orGroup: Pen
+    #   prob: 0.25
+    # - id: PenCap
+    #   orGroup: Pen
+    #   prob: 0.25
+    # TODO: come up with a slightly less powerful version of these
+    # Ultra-rare
+    # - id: CyberPen
+    #   orGroup: Pen
+    #   prob: 0.005
+    # - id: PenCentcom
+    #   orGroup: Pen
+    #   prob: 0.005
+    - id: PaperMailNFPaperPusherAd
+
+- type: entity
+  noSpawn: true
+  parent: BaseMailLarge
+  id: MailNFThrongler
+  suffix: throngler
+  components:
+  - type: Mail
+    contents:
+    - id: ThronglerToy
+
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailNFInstrumentSmall
+  suffix: instrument, expanded
+  components:
+  - type: Mail
+    contents:
+    - id: TrumpetInstrument
+      orGroup: Instrument
+    - id: RecorderInstrument
+      orGroup: Instrument
+    - id: ClarinetInstrument
+      orGroup: Instrument
+    - id: FluteInstrument
+      orGroup: Instrument
+    - id: HarmonicaInstrument
+      orGroup: Instrument
+    - id: OcarinaInstrument
+      orGroup: Instrument
+    - id: PanFluteInstrument
+      orGroup: Instrument
+    - id: KalimbaInstrument
+      orGroup: Instrument
+    - id: WoodblockInstrument
+      orGroup: Instrument
+    - id: BikeHornInstrument
+      orGroup: Instrument
+    - id: MusicBoxInstrument
+      orGroup: Instrument
+    - id: MicrophoneInstrument
+      orGroup: Instrument
+    - id: MusicalLungInstrument
+      orGroup: Instrument
+    # Uncommon
+    - id: PhoneInstrument
+      orGroup: Instrument
+      prob: 0.1
+    # Rare
+    - id: BananaPhoneInstrument
+      orGroup: Instrument
+      prob: 0.05
+    # Ultra-rare
+    - id: PhoneInstrumentSyndicate
+      orGroup: Instrument
+      prob: 0.01
+
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailNFUnusualClothing
+  suffix: unusual clothing
+  components:
+  - type: Mail
+    contents:
+      - id: ClothingKimonoPink
+        orGroup: Clothes
+      - id: ClothingKimonoBlue
+        orGroup: Clothes
+      - id: ClothingKimonoPurple
+        orGroup: Clothes
+      - id: ClothingKimonoSky
+        orGroup: Clothes
+      - id: ClothingKimonoGreen
+        orGroup: Clothes
+      - id: ClothingUniformMartialGi
+        orGroup: Clothes
+      - id: ClothingNeckBling
+        orGroup: Clothes
+      - id: ClothingShoesBling
+        orGroup: Clothes
+      - id: ClothingNeckCloakAdmin
+        orGroup: Clothes
+      - id: ClothingHeadHatFancyCrown
+        orGroup: Clothes
+      - id: ClothingHeadHatCake
+        orGroup: Clothes
+      - id: ClothingHeadHatCone
+        orGroup: Clothes
+      - id: ClothingMaskOniRed
+        orGroup: Clothes
+      - id: ClothingMaskOniBlue
+        orGroup: Clothes
+      - id: ClothingHeadHatRichard
+        orGroup: Clothes
+      - id: ClothingHeadHatAnimalHeadslime
+        orGroup: Clothes
+      - id: ClothingHeadHatDogEars
+        orGroup: Clothes
+      - id: ClothingHeadHatCatEars
+        orGroup: Clothes
+      - id: ClothingEyesGlassesOutlawGlasses
+        orGroup: Clothes
+      - id: ClothingUniformJumpsuitGalaxyBlue
+        orGroup: Clothes
+        prob: 0.25
+      - id: ClothingUniformJumpsuitGalaxyRed
+        orGroup: Clothes
+        prob: 0.25
+
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailNFCritter
+  suffix: critter
+  components:
+  - type: Mail
+    isFragile: true
+    contents:
+      # Bugs (weight: 2)
+      - id: MobCockroach
+        orGroup: Critter
+        prob: 0.36
+      - id: MobSlug
+        orGroup: Critter
+        prob: 0.36
+      - id: MobArgocyteSlurva # honorary bug?
+        orGroup: Critter
+        prob: 0.36
+      - id: MobBee
+        orGroup: Critter
+        prob: 0.36
+      - id: MobButterfly
+        orGroup: Critter
+        prob: 0.36
+        # Uncommon
+      - id: MobMothroach
+        orGroup: Critter
+        prob: 0.2
+      # Small reptiles (weight: 1)
+      - id: MobLizard
+        orGroup: Critter
+        prob: 0.34
+      - id: MobSnake
+        orGroup: Critter
+        prob: 0.33
+      - id: MobFrog
+        orGroup: Critter
+        prob: 0.33
+      # Small mammals (weight: 1)
+      - id: MobMouse
+        orGroup: Critter
+        prob: 0.33
+      - id: MobMouse1
+        orGroup: Critter
+        prob: 0.33
+      - id: MobMouse2
+        orGroup: Critter
+        prob: 0.33
+      - id: MobMouseCancer
+        orGroup: Critter
+        prob: 0.01 # Rare
+
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailNFTacticalMaid
+  suffix: tactical maid
+  components:
+  - type: Mail
+    contents:
+      - id: ClothingUniformJumpskirtTacticalMaid
+      - id: ClothingHeadHatTacticalMaidHeadband
+      - id: MegaSprayBottle
+      - id: ClothingHandsTacticalMaidGloves
+
+- type: entity
+  noSpawn: true
+  parent: BaseMailLarge
+  id: MailNFKendoKit
+  suffix: kendo kit
+  components:
+  - type: Mail
+    contents: # A lot of stuff here, seems spammy.
+    - id: ClothingUniformKendoHakama
+      amount: 2
+    - id: ClothingOuterArmorKendoBogu
+      amount: 2
+    - id: ClothingHeadHelmetKendoMen
+      amount: 2
+    - id: Shinai
+      amount: 2
+
+# Base Nyano Mail
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailSake
+  suffix: osake
+  components:
+  - type: Mail
+    contents:
+    - id: DrinkSakeCup
+      amount: 2
+    - id: DrinkTokkuri
+
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailBlockGameDIY
+  suffix: blockgamediy
+  components:
+  - type: Mail
+    contents:
+    - id: BlockGameArcadeComputerCircuitboard
+
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailCigars
+  suffix: Cigars
+  components:
+  - type: Mail
+    contents:
+    - id: CigarCase
+    - id: Lighter
+
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailCrayon
+  suffix: Crayon
+  components:
+  - type: Mail
+    contents:
+    - id: CrayonBox
+
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailCosplayArc
+  suffix: cosplay-arc
+  components:
+  - type: Mail
+    openSound: /Audio/Nyanotrasen/Voice/Felinid/cat_wilhelm.ogg
+    contents:
+    - id: ClothingCostumeArcDress
+
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailCosplayGeisha
+  suffix: cosplay-geisha
+  components:
+  - type: Mail
+    contents:
+      - id: UniformGeisha
+      - id: DrinkTeapot
+      - id: DrinkTeacup
+        amount: 3
+
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailCosplaySchoolgirl
+  suffix: cosplay-schoolgirl
+  components:
+  - type: Mail
+    contents:
+    - id: UniformSchoolgirlBlack
+      orGroup: Color
+    - id: UniformSchoolgirlBlue
+      orGroup: Color
+    - id: UniformSchoolgirlCyan
+      orGroup: Color
+    - id: UniformSchoolgirlGreen
+      orGroup: Color
+    - id: UniformSchoolgirlOrange
+      orGroup: Color
+    - id: UniformSchoolgirlPink
+      orGroup: Color
+    - id: UniformSchoolgirlPurple
+      orGroup: Color
+    - id: UniformSchoolgirlRed
+      orGroup: Color
+
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailFlowers
+  suffix: flowers
+  components:
+  - type: Mail
+    contents:
+    # TODO actual flowers
+    - id: ClothingHeadHatFlowerWreath
+      orGroup: Flowers
+    - id: FoodPoppy
+      orGroup: Flowers
+    - id: FoodLily
+
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailSignallerKit
+  suffix: signallerkit
+  components:
+  - type: Mail
+    contents:
+    - id: Multitool
+    - id: RemoteSignaller
+
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailNoir
+  suffix: noir
+  components:
+  - type: Mail
+    contents:
+    - id: ClothingUniformJumpsuitDetectiveGrey
+    - id: ClothingUniformJumpskirtDetectiveGrey
+    - id: ClothingHeadHatBowlerHat
+    - id: ClothingOuterCoatGentle
+
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailRestraints
+  suffix: restraints
+  components:
+  - type: Mail
+    contents:
+    - id: Handcuffs
+    - id: ClothingMaskMuzzle
+    - id: ClothingEyesBlindfold
+
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailFishingCap
+  suffix: fishingcap
+  components:
+  - type: Mail
+    contents:
+    - id: ClothingHeadFishCap
+
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailFlashlight
+  suffix: Flashlight
+  components:
+  - type: Mail
+    contents:
+    - id: FlashlightLantern
+
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailSpaceVillainDIY
+  suffix: spacevilliandiy
+  components:
+  - type: Mail
+    contents:
+    - id: SpaceVillainArcadeComputerCircuitboard
+
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailSunglasses
+  suffix: Sunglasses
+  components:
+  - type: Mail
+    contents:
+    - id: ClothingEyesGlassesSunglasses
+
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailWinterCoat
+  suffix: wintercoat
+  components:
+  - type: Mail
+    contents:
+    - id: ClothingOuterWinterCoat
+      orGroup: Coat
+    - id: ClothingOuterWinterCoatLong
+      orGroup: Coat
+    - id: ClothingOuterWinterCoatPlaid
+      orGroup: Coat
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_civilian.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail_civilian.yml
similarity index 71%
rename from Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_civilian.yml
rename to Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail_civilian.yml
index a41fac14ffa..19a1ee3c536 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_civilian.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail_civilian.yml
@@ -1,8 +1,62 @@
+# Frontier Mail
+- type: entity
+  noSpawn: true
+  parent: BaseMailLarge
+  id: MailNFInstrumentLarge
+  suffix: instrument, large
+  components:
+  - type: Mail
+    contents:
+    - id: TromboneInstrument
+      orGroup: Instrument
+    - id: FrenchHornInstrument
+      orGroup: Instrument
+    - id: SaxophoneInstrument
+      orGroup: Instrument
+    - id: EuphoniumInstrument
+      orGroup: Instrument
+    - id: AcousticGuitarInstrument
+      orGroup: Instrument
+    - id: ElectricGuitarInstrument
+      orGroup: Instrument
+    - id: BassGuitarInstrument
+      orGroup: Instrument
+    - id: RockGuitarInstrument
+      orGroup: Instrument
+    - id: BanjoInstrument
+      orGroup: Instrument
+    - id: ViolinInstrument
+      orGroup: Instrument
+    - id: CelloInstrument
+      orGroup: Instrument
+    - id: ViolaInstrument
+      orGroup: Instrument
+    - id: BagpipeInstrument # Fury.
+      orGroup: Instrument
+    - id: SynthesizerInstrument
+      orGroup: Instrument
+    - id: AccordionInstrument
+      orGroup: Instrument
+    - id: GlockenspielInstrument
+      orGroup: Instrument
+    - id: XylophoneInstrument
+      orGroup: Instrument
+    # Uncommon
+    - id: Rickenbacker4003Instrument
+      orGroup: Instrument
+      prob: 0.25
+    # Rare
+    - id: Rickenbacker4001Instrument
+      orGroup: Instrument
+      prob: 0.1
+
+# Base Nyano Mail
+
 - type: entity
   noSpawn: true
   parent: BaseMail
   id: MailBotanistChemicalBottles
-  suffix: botanistchemicals
+  suffix: botanist chemicals
   components:
   - type: Mail
     contents:
@@ -102,7 +156,7 @@
   noSpawn: true
   parent: BaseMail
   id: MailHoPBureaucracy
-  suffix: hoppaper
+  suffix: hop paper
   components:
   - type: Mail
     contents:
@@ -113,7 +167,7 @@
   noSpawn: true
   parent: BaseMail
   id: MailHoPSupplement
-  suffix: hopsupplement
+  suffix: hop supplement
   components:
   - type: Mail
     contents:
@@ -125,7 +179,7 @@
   noSpawn: true
   parent: BaseMail
   id: MailMimeArtsCrafts
-  suffix: artscrafts
+  suffix: arts and crafts
   components:
   - type: Mail
     contents:
@@ -137,7 +191,7 @@
   noSpawn: true
   parent: BaseMail
   id: MailMimeBlankBook
-  suffix: blankbook
+  suffix: blank book
   components:
   - type: Mail
     contents:
@@ -147,37 +201,17 @@
   noSpawn: true
   parent: BaseMail
   id: MailMimeBottleOfNothing
-  suffix: bottleofnothing
+  suffix: bottle of nothing
   components:
   - type: Mail
     contents:
       - id: DrinkBottleOfNothingFull
 
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailMusicianInstrumentSmall
-  suffix: instrument-small
-  components:
-  - type: Mail
-    isFragile: true
-    contents:
-    - id: FluteInstrument
-      orGroup: Instrument
-    - id: HarmonicaInstrument
-      orGroup: Instrument
-    - id: OcarinaInstrument
-      orGroup: Instrument
-    - id: PanFluteInstrument
-      orGroup: Instrument
-    - id: RecorderInstrument
-      orGroup: Instrument
-
 - type: entity
   noSpawn: true
   parent: BaseMail
   id: MailPassengerMoney
-  suffix: passengermoney
+  suffix: passenger money
   components:
   - type: Mail
     contents:
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail_command.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail_command.yml
new file mode 100644
index 00000000000..86dec46a654
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail_command.yml
@@ -0,0 +1,35 @@
+# Base Nyano Mail
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailCommandPinpointerNuclear
+  suffix: pinpointer mail ops
+  components:
+  - type: Mail
+    contents:
+    - id: PinpointerNuclear
+
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailStationRepNFNukeDisk
+  suffix: nuke disk
+  components:
+  - type: Mail
+    isFragile: true
+    contents:
+      - id: NukeDiskFake
+      - id: PaperMailNFAntivirus
+
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailCommandNFPipebombIntern
+  suffix: pipe and bomb
+  components:
+  - type: Mail
+    isFragile: true
+    contents:
+      - id: SmokingPipeFilledTobacco
+      - id: DrinkAtomicBombGlass
+      - id: PaperMailNFPipebombIntern
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail_engineering.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail_engineering.yml
new file mode 100644
index 00000000000..af70fc621cb
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail_engineering.yml
@@ -0,0 +1,182 @@
+# Base Nyano Mail
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailEngineeringCables
+  suffix: cables
+  components:
+  - type: Mail
+    contents:
+    - id: CableHVStack
+      orGroup: Cables
+    - id: CableMVStack
+      orGroup: Cables
+    - id: CableApcStack
+      orGroup: Cables
+
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailEngineeringKudzuDeterrent
+  suffix: antikudzu
+  components:
+  - type: Mail
+    contents:
+    - id: PlantBGoneSpray
+
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailEngineeringSheetGlass
+  suffix: sheetglass
+  components:
+  - type: Mail
+    contents:
+    - id: SheetGlass
+
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailEngineeringWelderReplacement
+  suffix: welder
+  components:
+  - type: Mail
+    contents:
+    - id: Welder
+
+# Frontier Mail
+
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailNFCircuitboardIndustrial
+  suffix: industrial circuitboard
+  components:
+  - type: Mail
+    contents:
+    - id: ThermomachineFreezerMachineCircuitBoard
+      orGroup: Board
+      prob: 0.5
+    - id: ThermomachineHeaterMachineCircuitBoard
+      orGroup: Board
+      prob: 0.5
+    - id: HellfireFreezerMachineCircuitBoard
+      orGroup: Board
+      prob: 0.25
+    - id: HellfireHeaterMachineCircuitBoard
+      orGroup: Board
+      prob: 0.25
+    - id: CryoPodMachineCircuitboard # Medical as well
+      orGroup: Board
+      prob: 0.5
+    - id: ChemMasterMachineCircuitboard
+      orGroup: Board
+      prob: 0.5
+    - id: ChemDispenserMachineCircuitboard
+      orGroup: Board
+      prob: 0.25
+    - id: StasisBedMachineCircuitboard
+      orGroup: Board
+      prob: 0.25
+    - id: BiomassReclaimerMachineCircuitboard
+      orGroup: Board
+      prob: 0.25
+    - id: BiofabricatorMachineCircuitboard
+      orGroup: Board
+      prob: 0.25
+    - id: TurboItemRechargerCircuitboard
+      orGroup: Board
+      prob: 0.5
+    - id: AutolatheHyperConvectionMachineCircuitboard
+      orGroup: Board
+      prob: 0.25
+    - id: ProtolatheHyperConvectionMachineCircuitboard
+      orGroup: Board
+      prob: 0.25
+    - id: HotplateMachineCircuitboard
+      orGroup: Board
+      prob: 0.5
+#    - id: CircuitImprinterHyperConvectionMachineCircuitboard
+#      orGroup: Board
+#      prob: 0.25
+    - id: SheetifierMachineCircuitboard
+      orGroup: Board
+      prob: 0.25
+    - id: RadarConsoleCircuitboard
+      orGroup: Board
+      prob: 0.25
+    - id: OreProcessorIndustrialMachineCircuitboard
+      orGroup: Board
+      prob: 0.5
+    - id: GasRecyclerMachineCircuitboard
+      orGroup: Board
+      prob: 0.1
+
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailNFCircuitboardService
+  suffix: service circuitboard
+  components:
+  - type: Mail
+    contents:
+    - id: ComputerTelevisionCircuitboard
+      orGroup: Board
+    - id: ReagentGrinderMachineCircuitboard
+      orGroup: Board
+    - id: ReagentGrinderIndustrialMachineCircuitboard
+      orGroup: Board
+      prob: 0.5
+    - id: SurveillanceWirelessCameraMovableCircuitboard
+      orGroup: Board
+      prob: 0.5
+    - id: MicrowaveMachineCircuitboard
+      orGroup: Board
+    - id: ElectricGrillMachineCircuitboard
+      orGroup: Board
+      prob: 0.5
+    - id: FatExtractorMachineCircuitboard
+      orGroup: Board
+      prob: 0.25
+    - id: SeedExtractorMachineCircuitboard
+      orGroup: Board
+      prob: 0.5
+    - id: BoozeDispenserMachineCircuitboard
+      orGroup: Board
+    - id: SodaDispenserMachineCircuitboard
+      orGroup: Board
+    - id: JukeboxCircuitBoard
+      orGroup: Board
+    - id: TelecomServerCircuitboard
+      orGroup: Board
+      prob: 0.25
+    - id: ComputerMassMediaCircuitboard
+      orGroup: Board
+      prob: 0.1
+
+- type: entity
+  noSpawn: true
+  parent: BaseMailLarge
+  id: MailNFPowerTool
+  suffix: power tool
+  components:
+  - type: Mail
+    contents:
+    - id: PaperMailNFPowerTool
+      orGroup: Paper
+    - id: JawsOfLife
+      orGroup: Gift
+      prob: 0.33
+    - id: PowerDrill
+      orGroup: Gift
+      prob: 0.33
+    - id: WelderIndustrial
+      orGroup: Gift
+      prob: 0.20
+      # Rare
+    - id: WelderIndustrialAdvanced
+      orGroup: Gift
+      prob: 0.10
+    - id: WelderExperimental
+      orGroup: Gift
+      prob: 0.04
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_epistemology.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail_epistemology.yml
similarity index 74%
rename from Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_epistemology.yml
rename to Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail_epistemology.yml
index 38526966b80..be6f9818e22 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_epistemology.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail_epistemology.yml
@@ -46,13 +46,3 @@
   - type: Mail
     contents:
     - id: ClothingHeadTinfoil
-
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailDetectiveForensicSupplement # Deltav - Detective is in charge of investigating crimes.
-  suffix: detectivesupplement # Deltav - Detective is in charge of investigating crimes.
-  components:
-  - type: Mail
-    contents:
-    - id: BoxForensicPad
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_medical.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail_medical.yml
similarity index 84%
rename from Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_medical.yml
rename to Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail_medical.yml
index 4e797272e5e..735f840a201 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_medical.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail_medical.yml
@@ -1,3 +1,4 @@
+# Base Nyano Mail
 - type: entity
   noSpawn: true
   parent: BaseMail
@@ -91,3 +92,19 @@
       maxAmount: 2
     - id: SyringeTranexamicAcid
       maxAmount: 2
+
+# Frontier Mail
+- type: entity
+  parent: BaseMailLarge
+  id: MailNFMedkit
+  suffix: medkit
+  components:
+  - type: Mail
+    contents:
+      - id: MedkitAdvancedFilled
+        orGroup: Medkit
+        prob: 0.75
+      - id: MedkitCombatFilled
+        orGroup: Medkit
+        prob: 0.25
+
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_security.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail_security.yml
similarity index 50%
rename from Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_security.yml
rename to Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail_security.yml
index b47d5af56e3..eed846a0909 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_security.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail_security.yml
@@ -1,3 +1,4 @@
+# Base Nyano Mail
 - type: entity
   noSpawn: true
   parent: BaseMail
@@ -34,7 +35,6 @@
       maxAmount: 2
 
 #- type: entity
-#  noSpawn: true
 #  parent: BaseMail
 #  id: MailSecuritySpaceLaw
 #  suffix: spacelaw
@@ -54,3 +54,42 @@
     contents:
     - id: BoxBeanbag
 
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailDetectiveForensicSupplement # Deltav - Detective is in charge of investigating crimes.
+  suffix: detectivesupplement # Deltav - Detective is in charge of investigating crimes.
+  components:
+  - type: Mail
+    contents:
+    - id: BoxForensicPad
+
+# Frontier Mail
+
+- type: entity
+  noSpawn: true
+  parent: BaseMailLarge
+  id: MailSecurityNFMusket
+  suffix: musket
+  components:
+  - type: Mail
+    contents:
+    - id: ClothingHeadHatPwig
+    - id: Musket
+    - id: CartridgeAntiMateriel
+      amount: 2
+    - id: PaperMailNTMusket
+
+# Delta Mail
+
+- type: entity
+  noSpawn: true
+  parent: BaseMail
+  id: MailSecurityDVSpaceLaw
+  suffix: spacelaw, extended
+  components:
+  - type: Mail
+    contents:
+    - id: BookSecurity
+#    - id: BookSOP #This is where I'd put my Delta SOP book... IF I HAD ONE!!!
+    - id: PaperMailNFSpaceLaw # Uses the NF space law paper, which is edited to mention the Delta Sector
diff --git a/Resources/Prototypes/DeltaV/Mail/mailDeliveries.yml b/Resources/Prototypes/DeltaV/Mail/mailDeliveries.yml
new file mode 100644
index 00000000000..c0d6df9ec21
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Mail/mailDeliveries.yml
@@ -0,0 +1,147 @@
+- type: mailDeliveryPool
+  id: RandomDeltaVMailDeliveryPool #This entire table is messy as fuck but the weights add up to 35. TODO: ORGANIZE THIS SHIT AAAA
+  everyone:
+    MailNFAlcohol: 1
+    MailNFBakedGoods: 1
+    MailNFBible: 1
+    MailNFBikeHorn: 0.5
+    MailBooksAll: 1
+    MailBlockGameDIY: 0.5
+    MailNFBuildABuddy: 0.3
+    MailDVBoxes: 0.3
+    MailCrayon: 1
+    MailNFCake: 1
+    MailNFCheese: 1
+    MailNFCookies: 1.1
+    MailNFCritter: 1
+    #Cigarettes - Adds up to 1 in weight
+    MailNFCigarettes: 0.5
+    MailCigars: 0.2
+    MailNFJoints: 0.2
+    MailNFGoldCigars: 0.1
+    #Cosplay - Adds up to 3.4 in weight
+    MailCosplayArc: 0.5
+    MailDVCosplayFakeWizard: 0.5
+    MailNFCosplayWizard: 0.5
+    MailNFCosplayMaid: 0.5
+    MailCosplayGeisha: 0.5
+    MailCosplaySchoolgirl: 0.5
+    MailNFCosplayNurse: 0.4
+    MailNFDonkPockets: 0.5
+    MailNFEMP: 0.3
+    MailNFFigurineBulk: 1
+    MailFishingCap: 0.5
+    MailFlashlight: 1
+    MailFlowers: 1
+    MailNFKendoKit: 0.3
+    MailNFKnife: 0.7
+    MailNFMuffins: 1
+    MailNoir: 0.5
+    MailNFPAI: 1.2
+    MailNFPlushie: 1
+    MailPumpkinPie: 0.3
+    MailNFPen: 0.7
+    MailRestraints: 0.8
+    MailSake: 0.4
+    MailDVScarves: 0.15
+    MailNFSnacks: 1
+    #Soda - Adds up to 1 in weight
+    MailNFSodaPwrGame: 0.2
+    MailNFSodaRedBool: 0.2
+    MailNFSodaSpaceCola: 0.2
+    MailNFSodaSpaceMountainWind: 0.2
+    MailNFSodaSpaceUp: 0.2
+    #End Soda
+    MailNFSmoke: 0.4
+    MailSpaceVillainDIY: 0.5
+    MailSignallerKit: 0.5
+    MailSunglasses: 1
+    MailNFSoaps: 0.5
+    MailNFSoapsOmega: 0.5
+    MailNFSword: 0.5
+    MailNFTacticalMaid: 0.5
+    MailNFThrongler: 0.05
+    MailNFUnusualClothing: 0.5
+    MailNFUnusualFood: 1
+    MailNFUnusualProduce: 1
+    MailNFVagueThreat: 0.5
+    # Mainly for Glacier
+    MailWinterCoat: 1.5
+
+  # Department and job-specific mail can have slightly higher weights,
+  # since they'll be merged with the everyone pool.
+  departments:
+    Medical:
+      MailMedicalBasicSupplies: 2
+      MailMedicalChemistrySupplement: 2
+      MailMedicalEmergencyPens: 3
+      MailMedicalMedicinePills: 2
+      MailMedicalSheetPlasma: 1
+      # MailMedicalSpaceacillin: 1
+      MailMedicalStabilizers: 2
+      MailNFMedkit: 2
+    Engineering:
+      MailAMEGuide: 1
+      MailEngineeringCables: 2
+      MailEngineeringKudzuDeterrent: 2
+      MailEngineeringSheetGlass: 2
+      MailEngineeringWelderReplacement: 2
+      MailNFCircuitboardIndustrial: 2
+      MailNFCircuitboardService: 1
+      MailNFPowerTool: 1
+    Security:
+      MailSecurityDonuts: 3
+      MailSecurityFlashlight: 2
+      MailSecurityNonlethalsKit: 2
+      MailSecurityDVSpaceLaw: 1
+      MailSecurityNFMusket: 1
+    Epistemics:
+#      MailBooks: 1
+      MailEpistemologyBluespace: 1
+      MailEpistemologyIngotGold: 2
+      MailEpistemologyResearchDisk: 1
+      MailEpistemologyTinfoilHat: 1
+      MailSignallerKit: 1
+    # All heads of staff are in Command and not their departments, technically.
+    # So any items from the departments above that should also be sent to the
+    # respective department heads should be duplicated below.
+    Command:
+      MailCommandPinpointerNuclear: 0.5
+      MailStationRepNFNukeDisk: 0.3
+      MailCommandNFPipebombIntern: 0.1
+
+  jobs:
+    Botanist:
+      MailBotanistChemicalBottles: 2
+      MailBotanistMutagen: 1.5
+      MailBotanistSeeds: 1
+    ChiefEngineer:
+      MailEngineeringKudzuDeterrent: 2
+    ChiefMedicalOfficer:
+      MailMedicalEmergencyPens: 2
+      MailMedicalMedicinePills: 3
+      MailMedicalSheetPlasma: 2
+    Clown:
+      MailClownGildedBikeHorn: 0.5
+      MailClownHonkSupplement: 3
+    Detective: # Deltav - Detective is in charge of investigating crimes.
+      MailDetectiveForensicSupplement: 2 # Deltav - Detective is in charge of investigating crimes.
+    HeadOfPersonnel:
+      MailHoPBureaucracy: 2
+      MailHoPSupplement: 3
+    HeadOfSecurity:
+      MailSecurityNonlethalsKit: 2
+    Lawyer:
+      MailSecurityDVSpaceLaw: 2
+    Mime:
+      MailMimeArtsCrafts: 3
+      MailMimeBlankBook: 2
+      MailMimeBottleOfNothing: 1
+    ResearchDirector: # DeltaV - Epistemics Department replacing Science but keeping their IDs
+      MailEpistemologyIngotGold: 2
+    Musician:
+      MailMusicianInstrumentSmall: 1
+    Passenger:
+      MailPassengerMoney: 3
+    Warden:
+      MailWardenCrowdControl: 2
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
index 0c9f06a58b9..2d2961c424f 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -854,72 +854,69 @@
   id: ClothingUniformJumpsuitLibrarianOrionFlipped
   name: orion express librarian jumpsuit
 
-################################
-#  Unused Librarian Jumpsuits  #
-################################
-# - type: entity
-#   parent: ClothingUniformBaseFlippable
-#   id: ClothingUniformJumpsuitLibrarianHeph
-#   name: hephaestus industries librarian jumpsuit
-#   description: A cosy green jumper fit for a curator of books.
-#   components:
-#   - type: Sprite
-#     sprite: Clothing/Uniforms/Jumpsuit/librarian_heph.rsi
-#   - type: Clothing
-#     sprite: Clothing/Uniforms/Jumpsuit/librarian_heph.rsi
-
-# - type: entity
-#   parent: [ ClothingUniformBaseFlipped, ClothingUniformJumpsuitLibrarianHeph ]
-#   id: ClothingUniformJumpsuitLibrarianHephFlipped
-#   name: hephaestus industries librarian jumpsuit
-
-# - type: entity
-#   parent: ClothingUniformBaseFlippable
-#   id: ClothingUniformJumpsuitLibrarianPMCG
-#   name: private military contracting group librarian jumpsuit
-#   description: A cosy white jumper fit for a curator of books.
-#   components:
-#   - type: Sprite
-#     sprite: Clothing/Uniforms/Jumpsuit/librarian_pmcg.rsi
-#   - type: Clothing
-#     sprite: Clothing/Uniforms/Jumpsuit/librarian_pmcg.rsi
-
-# - type: entity
-#   parent: [ ClothingUniformBaseFlipped, ClothingUniformJumpsuitLibrarianPMCG ]
-#   id: ClothingUniformJumpsuitLibrarianPMCGFlipped
-#   name: private military contracting group librarian jumpsuit
-
-# - type: entity
-#   parent: ClothingUniformBaseFlippable
-#   id: ClothingUniformJumpsuitLibrarianZav
-#   name: zavodskoi interstellar librarian jumpsuit
-#   description: A blood brown jumper fit for a curator of books.
-#   components:
-#   - type: Sprite
-#     sprite: Clothing/Uniforms/Jumpsuit/librarian_zav.rsi
-#   - type: Clothing
-#     sprite: Clothing/Uniforms/Jumpsuit/librarian_zav.rsi
-
-# - type: entity
-#   parent: [ ClothingUniformBaseFlipped, ClothingUniformJumpsuitLibrarianZav ]
-#   id: ClothingUniformJumpsuitLibrarianZavFlipped
-#   name: zavodskoi interstellar librarian jumpsuit
-
-# - type: entity
-#   parent: ClothingUniformBaseFlippable
-#   id: ClothingUniformJumpsuitLibrarianZeng
-#   name: zeng-hu pharmaceuticals librarian jumpsuit
-#   description: A blood brown jumper fit for a curator of books.
-#   components:
-#   - type: Sprite
-#     sprite: Clothing/Uniforms/Jumpsuit/librarian_zeng.rsi
-#   - type: Clothing
-#     sprite: Clothing/Uniforms/Jumpsuit/librarian_zeng.rsi
-
-# - type: entity
-#   parent: [ ClothingUniformBaseFlipped, ClothingUniformJumpsuitLibrarianZeng ]
-#   id: ClothingUniformJumpsuitLibrarianZengFlipped
-#   name: zeng-hu pharmaceuticals librarian jumpsuit
+- type: entity
+  parent: ClothingUniformBaseFlippable
+  id: ClothingUniformJumpsuitLibrarianHeph
+  name: hephaestus industries librarian jumpsuit
+  description: A cosy green jumper fit for a curator of books.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/librarian_heph.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/librarian_heph.rsi
+
+- type: entity
+  parent: [ ClothingUniformBaseFlipped, ClothingUniformJumpsuitLibrarianHeph ]
+  id: ClothingUniformJumpsuitLibrarianHephFlipped
+  name: hephaestus industries librarian jumpsuit
+
+- type: entity
+  parent: ClothingUniformBaseFlippable
+  id: ClothingUniformJumpsuitLibrarianPMCG
+  name: private military contracting group librarian jumpsuit
+  description: A cosy white jumper fit for a curator of books.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/librarian_pmcg.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/librarian_pmcg.rsi
+
+- type: entity
+  parent: [ ClothingUniformBaseFlipped, ClothingUniformJumpsuitLibrarianPMCG ]
+  id: ClothingUniformJumpsuitLibrarianPMCGFlipped
+  name: private military contracting group librarian jumpsuit
+
+- type: entity
+  parent: ClothingUniformBaseFlippable
+  id: ClothingUniformJumpsuitLibrarianZav
+  name: zavodskoi interstellar librarian jumpsuit
+  description: A blood brown jumper fit for a curator of books.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/librarian_zav.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/librarian_zav.rsi
+
+- type: entity
+  parent: [ ClothingUniformBaseFlipped, ClothingUniformJumpsuitLibrarianZav ]
+  id: ClothingUniformJumpsuitLibrarianZavFlipped
+  name: zavodskoi interstellar librarian jumpsuit
+
+- type: entity
+  parent: ClothingUniformBaseFlippable
+  id: ClothingUniformJumpsuitLibrarianZeng
+  name: zeng-hu pharmaceuticals librarian jumpsuit
+  description: A blood brown jumper fit for a curator of books.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/librarian_zeng.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/librarian_zeng.rsi
+
+- type: entity
+  parent: [ ClothingUniformBaseFlipped, ClothingUniformJumpsuitLibrarianZeng ]
+  id: ClothingUniformJumpsuitLibrarianZengFlipped
+  name: zeng-hu pharmaceuticals librarian jumpsuit
 
 - type: entity
   parent: ClothingUniformBase
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index 0b1cda63a6f..484052e4048 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -358,6 +358,12 @@
     accentVColor: "#a23e3e"
   - type: Icon
     state: pda-qm
+  - type: CartridgeLoader # Adds the MailMetrics courier tracker
+    preinstalled:
+      - CrewManifestCartridge
+      - NotekeeperCartridge
+      - NewsReaderCartridge
+      - MailMetricsCartridge
 
 - type: entity
   parent: BasePDA
diff --git a/Resources/Prototypes/Entities/Objects/Materials/ore.yml b/Resources/Prototypes/Entities/Objects/Materials/ore.yml
index bf7dbfad5a3..503f4707d5a 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/ore.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/ore.yml
@@ -343,5 +343,53 @@
   id: Salt1
   suffix: Single
   components:
+  - type: Stack
+    count: 1
+
+- type: entity
+  parent: OreBase
+  id: BluespaceOre
+  name: bluespace ore
+  suffix: Full
+  components:
+  - type: Stack
+    stackType: BluespaceOre
+  - type: Sprite
+    state: bluespace
+  - type: Item
+  - type: Material
+  - type: PhysicalComposition
+    materialComposition:
+      Bluespace: 100
+
+- type: entity
+  parent: BluespaceOre
+  id: BluespaceOre1
+  suffix: Single
+  components:
+  - type: Stack
+    count: 1
+
+- type: entity
+  parent: OreBase
+  id: NormalityOre
+  name: normality ore
+  suffix: Full
+  components:
+  - type: Stack
+    stackType: NormalityOre
+  - type: Sprite
+    state: bluespace
+  - type: Item
+  - type: Material
+  - type: PhysicalComposition
+    materialComposition:
+      Normality: 100
+
+- type: entity
+  parent: NormalityOre
+  id: NormalityOre1
+  suffix: Single
+  components:
   - type: Stack
     count: 1
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Misc/mail_capsule.yml b/Resources/Prototypes/Entities/Objects/Misc/mail_capsule.yml
new file mode 100644
index 00000000000..bd6c9057cd0
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Misc/mail_capsule.yml
@@ -0,0 +1,139 @@
+- type: entity
+  name: mail capsule
+  suffix: Primed
+  id: MailCapsulePrimed
+  parent: BaseItem
+  components:
+  - type: ThrowingAngle
+    angle: 180
+  - type: EmbeddableProjectile
+    minimumSpeed: 1
+    removalTime: 0.1
+  - type: Tag
+    tags:
+    - MailCapsule
+    - Trash
+  - type: Sprite
+    sprite: Objects/Misc/mail_capsule.rsi
+    layers:
+      - state: icon-empty
+  - type: ItemSlots
+    slots:
+      mail_slot:
+        insertVerbText: Put in Mail
+        ejectVerbText: Take out Mail
+        name: Mail
+        startingItem: null
+        whitelist:
+          tags:
+          - Book
+          - Document
+          - Mail
+          components:
+          - Mail
+          - Paper
+          - HyperlinkBook
+        insertOnInteract: true
+        priority: 3
+      food_slot:
+        insertVerbText: Put in Food
+        ejectVerbText: Take out Food
+        name: Food
+        startingItem: null
+        whitelist:
+          components:
+          - Food
+        insertOnInteract: true
+        priority: 2
+      cash_slot:
+        insertVerbText: Put in Cash
+        ejectVerbText: Take out Cash
+        name: Cash
+        startingItem: null
+        whitelist:
+          components:
+          - Currency
+        insertOnInteract: true
+        priority: 1
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+        showEnts: False
+        occludes: true
+        ents: []
+      mail_slot: !type:ContainerSlot
+        showEnts: False
+        occludes: true
+        ent: null
+      food_slot: !type:ContainerSlot
+        showEnts: False
+        occludes: true
+        ent: null
+      cash_slot: !type:ContainerSlot
+        showEnts: False
+        occludes: true
+        ent: null
+  - type: Appearance
+  - type: ItemMapper
+    mapLayers:
+      icon-food:
+        whitelist:
+          components:
+          - Food
+      icon-cash:
+        whitelist:
+          components:
+          - Currency
+      icon-mail:
+        whitelist:
+          tags:
+          - Book
+          - Document
+          - Mail
+          components:
+          - Mail
+          - Paper
+          - HyperlinkBook
+    sprite: Objects/Misc/mail_capsule.rsi
+  - type: Dumpable
+  - type: Damageable
+    damageContainer: Inorganic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 20 #excess damage avoids cost of spawning entities.
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 10
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: GlassBreak
+      - !type:EmptyAllContainersBehaviour
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: DamageOnLand
+    damage:
+      types:
+        Blunt: 9.5
+
+- type: entity
+  name: mail capsule box
+  parent: BoxCardboard
+  id: BoxMailCapsulePrimed
+  description: A box of primed mail capsules.
+  components:
+  - type: Storage
+    grid:
+    - 0,0,4,3
+  - type: StorageFill
+    contents:
+      - id: MailCapsulePrimed
+        amount: 10
+  - type: Sprite
+    layers:
+      - state: box
diff --git a/Resources/Prototypes/Entities/Objects/Misc/spider_web.yml b/Resources/Prototypes/Entities/Objects/Misc/spider_web.yml
index bb284000a76..68ba94b578d 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/spider_web.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/spider_web.yml
@@ -76,6 +76,9 @@
       ignoreWhitelist:
         components:
             - IgnoreSpiderWeb
+    - type: Tag
+      tags:
+        - ArachneWeb
 
 - type: entity
   id: SpiderWebClown
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mail/Items/boxes.yml b/Resources/Prototypes/Entities/Objects/Specific/Mail/Items/boxes.yml
new file mode 100644
index 00000000000..536736fc904
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Specific/Mail/Items/boxes.yml
@@ -0,0 +1,212 @@
+# Mail-only boxes. If/when something uses these outside of the mail, move the entry into Catalog/Fills.
+
+- type: entity
+  name: scented soap sampler pack
+  parent: BoxCardboard
+  id: BoxSoapsAssorted
+  description: A box of various scented soaps. Ooh, lavender.
+  components:
+  - type: StorageFill
+    contents:
+    - id: SoapNT
+      amount: 1
+    - id: Soap
+      amount: 1
+    - id: SoapHomemade
+      amount: 1
+    - id: SoapDeluxe
+      amount: 1
+  - type: Storage
+    maxItemSize: Normal
+    grid:
+    - 0,0,3,1
+    whitelist:
+      tags:
+      - Soap
+  - type: Sprite
+    layers:
+    - state: box
+
+- type: entity
+  name: scented soap sampler pack
+  parent: BoxCardboard
+  id: BoxSoapsAssortedOmega
+  description: A box of various scented soaps. Ooh, bluespace.
+  components:
+  - type: StorageFill
+    contents:
+    - id: SoapNT
+      amount: 1
+    - id: Soap
+      amount: 1
+    - id: SoapOmega
+      amount: 1
+    - id: SoapDeluxe
+      amount: 1
+  - type: Storage
+    maxItemSize: Normal
+    grid:
+    - 0,0,3,1
+    whitelist:
+      tags:
+      - Soap
+  - type: Sprite
+    layers:
+    - state: box
+
+- type: entity
+  name: Build-a-Buddy kit
+  suffix: Human
+  parent: BoxHug
+  id: BoxBuildABuddyHuman
+  description: "\"Henry the Human\" Build-a-Buddy kit. Some assembly required."
+  components:
+  - type: StorageFill
+    contents:
+    - id: HeadHuman
+      amount: 1
+    - id: TorsoHuman
+      amount: 1
+    - id: LeftArmHuman
+      amount: 1
+    - id: RightArmHuman
+      amount: 1
+    - id: LeftHandHuman
+      amount: 1
+    - id: RightHandHuman
+      amount: 1
+    - id: LeftLegHuman
+      amount: 1
+    - id: RightLegHuman
+      amount: 1
+    - id: LeftFootHuman
+      amount: 1
+    - id: RightFootHuman
+      amount: 1
+  - type: Storage
+    grid:
+    - 0,0,4,3
+    whitelist:
+      components:
+      - BodyPart
+
+# DeltaV - Goblins Aren't Real
+#- type: entity
+#  name: Build-a-Buddy kit
+#  suffix: Goblin
+#  parent: BoxBuildABuddyHuman
+#  id: BoxBuildABuddyGoblin
+#  description: "\"Greta the Goblin\" Build-a-Buddy kit. Some assembly required."
+#  components:
+#  - type: StorageFill
+#    contents:
+#      - id: HeadGoblin
+#        amount: 1
+#      - id: TorsoGoblin
+#        amount: 1
+#      - id: LeftArmGoblin
+#        amount: 1
+#      - id: RightArmGoblin
+#        amount: 1
+#      - id: LeftHandGoblin
+#        amount: 1
+#      - id: RightHandGoblin
+#        amount: 1
+#      - id: LeftLegGoblin
+#        amount: 1
+#      - id: RightLegGoblin
+#        amount: 1
+#      - id: LeftFootGoblin
+#        amount: 1
+#      - id: RightFootGoblin
+#        amount: 1
+
+- type: entity
+  name: Build-a-Buddy kit
+  suffix: Reptilian
+  parent: BoxBuildABuddyHuman
+  id: BoxBuildABuddyReptilian
+  description: "\"Randy the Reptilian\" Build-a-Buddy kit. Some assembly required."
+  components:
+  - type: StorageFill
+    contents:
+    - id: HeadReptilian
+      amount: 1
+    - id: TorsoReptilian
+      amount: 1
+    - id: LeftArmReptilian
+      amount: 1
+    - id: RightArmReptilian
+      amount: 1
+    - id: LeftHandReptilian
+      amount: 1
+    - id: RightHandReptilian
+      amount: 1
+    - id: LeftLegReptilian
+      amount: 1
+    - id: RightLegReptilian
+      amount: 1
+    - id: LeftFootReptilian
+      amount: 1
+    - id: RightFootReptilian
+      amount: 1
+
+- type: entity
+  name: Build-a-Buddy kit
+  suffix: Slime
+  parent: BoxBuildABuddyHuman
+  id: BoxBuildABuddySlime
+  description: "\"Steven the Slime\" Build-a-Buddy kit. Some assembly required."
+  components:
+  - type: StorageFill
+    contents:
+    - id: HeadSlime
+      amount: 1
+    - id: TorsoSlime
+      amount: 1
+    - id: LeftArmSlime
+      amount: 1
+    - id: RightArmSlime
+      amount: 1
+    - id: LeftHandSlime
+      amount: 1
+    - id: RightHandSlime
+      amount: 1
+    - id: LeftLegSlime
+      amount: 1
+    - id: RightLegSlime
+      amount: 1
+    - id: LeftFootSlime
+      amount: 1
+    - id: RightFootSlime
+      amount: 1
+
+- type: entity
+  name: Build-a-Buddy kit
+  suffix: Vulpkanin
+  parent: BoxBuildABuddyHuman
+  id: BoxBuildABuddyVulpkanin
+  description: "\"Valerie the Vulpkanin\" Build-a-Buddy kit. Some assembly required."
+  components:
+  - type: StorageFill
+    contents:
+    - id: HeadVulpkanin
+      amount: 1
+    - id: TorsoVulpkanin
+      amount: 1
+    - id: LeftArmVulpkanin
+      amount: 1
+    - id: RightArmVulpkanin
+      amount: 1
+    - id: LeftHandVulpkanin
+      amount: 1
+    - id: RightHandVulpkanin
+      amount: 1
+    - id: LeftLegVulpkanin
+      amount: 1
+    - id: RightLegVulpkanin
+      amount: 1
+    - id: LeftFootVulpkanin
+      amount: 1
+    - id: RightFootVulpkanin
+      amount: 1
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mail/Items/misc.yml b/Resources/Prototypes/Entities/Objects/Specific/Mail/Items/misc.yml
new file mode 100644
index 00000000000..6f1c86e00ba
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Specific/Mail/Items/misc.yml
@@ -0,0 +1,117 @@
+# Mail-only items. If/when these get used for anything else, please move them to another folder.
+# Pranks: admin items or effects put into an envelope, released when opened or damaged.
+- type: entity
+  id: DelayedSmoke
+  parent: BaseItem
+  noSpawn: true
+  name: delayed smoke
+  suffix: "(10s)"
+  components:
+  - type: Sprite #DeltaV: Apparently these want sprites, probably because they're baseitems
+    sprite: /Textures/Objects/Fun/goldbikehorn.rsi
+    visible: false
+    state: icon
+  - type: DelayedItem
+    item: AdminInstantEffectSmoke10
+
+- type: entity
+  id: AdminInstantEffectEMP7
+  noSpawn: true
+  suffix: EMP, 7 meters
+  parent: AdminInstantEffectBase
+  components:
+  - type: EmpOnTrigger
+    range: 7
+    energyConsumption: 50000
+
+- type: entity
+  id: DelayedEMP
+  parent: BaseItem
+  noSpawn: true
+  name: delayed EMP (7 meters)
+  components:
+  - type: Sprite #DeltaV: Apparently these want sprites, probably because they're baseitems
+    sprite: /Textures/Objects/Fun/goldbikehorn.rsi
+    visible: false
+    state: icon
+  - type: DelayedItem
+    item: AdminInstantEffectEMP7
+
+# Miscellaneous Items
+
+- type: entity
+  id: SyringeCognizine
+  parent: Syringe
+  name: cognizine syringe
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 15
+        reagents:
+        - ReagentId: Cognizine
+          Quantity: 15 # Surely three friends is enough.
+
+- type: entity
+  id: SyringeOpporozidone
+  parent: Syringe
+  name: opporozidone syringe
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 15
+#        reagents: # TODO: we don't have that yet. Guess the people will receive an empty syringe instead.
+#        - ReagentId: Opporozidone
+#          Quantity: 15
+
+- type: entity
+  id: NecrosolChemistryBottle
+  parent: BaseChemistryBottleFilled
+  name: necrosol bottle
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Necrosol
+          Quantity: 30
+
+# Premium Alcohol: wait, it's just marketing?
+# TODO: different sprites would be nice.
+- type: entity
+  id: DrinkPremiumVodkaBottleFull
+  parent: DrinkVodkaBottleFull
+  name: Moment of Clarity vodka bottle
+  description: When things get a bit hectic, all you need is a Moment of Clarity.
+
+- type: entity
+  id: DrinkPremiumGinBottleFull
+  parent: DrinkGinBottleFull
+  name: Harry's gin bottle
+  description: An interesting set of botanicals, for sure. Is that pumpkin?
+
+- type: entity
+  id: DrinkPremiumTequilaBottleFull
+  parent: DrinkTequilaBottleFull
+  name: Casa del Eorg tequila bottle
+  description: Save the best for last. Casa del Eorg, 100% agave.
+
+- type: entity
+  id: DrinkPremiumWhiskeyBottleFull
+  parent: DrinkWhiskeyBottleFull
+  name: Ol' Prowler 18 whiskey bottle
+  description: Surprisingly smooth, it has a nasty habit of sneaking up on you.
+
+- type: entity
+  id: DrinkPremiumRumBottleFull
+  parent: DrinkRumBottleFull
+  name: Redeemer's Bounty rum bottle
+  description: Well, you asked for it. Navy strength.
+
+- type: entity
+  id: DrinkPremiumAbsintheBottleFull
+  parent: DrinkAbsintheBottleFull
+  name: Bureaucracy's Kiss absinthe bottle
+  description: A refined taste that tends to linger.
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mail/Items/paper.yml b/Resources/Prototypes/Entities/Objects/Specific/Mail/Items/paper.yml
new file mode 100644
index 00000000000..b21ca407173
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Specific/Mail/Items/paper.yml
@@ -0,0 +1,483 @@
+# Papers (letters, ad copy)
+# TODO: these should really be based on localization strings.
+- type: entity
+  id: PaperMailNFPowerTool
+  name: Hazard Fraught advertisement
+  categories: [ HideSpawnMenu ]
+  suffix: "power tool ad, formatted"
+  parent: Paper
+  components:
+  - type: Paper
+    content: |2
+
+                    [head=1]Hazard Fraught Tools[/head]
+
+                  [head=2]Discount Tools at Quality Prices![/head]
+
+                                [head=2]Fax us for a catalog at
+                      [color=#990000]ERROR: UNEXPECTED EOF[/color][/head]
+
+- type: entity
+  id: PaperMailNFVagueThreat1
+  categories: [ HideSpawnMenu ]
+  suffix: "vague mail threat 1, formatted"
+  parent: Paper
+  components:
+  - type: Paper
+    content: |2
+
+                     [head=1]I know what you did.[/head]
+
+            [head=3]You don't know what I'm going to do to you.[/head]
+
+- type: entity
+  id: PaperMailNFVagueThreat2
+  categories: [ HideSpawnMenu ]
+  suffix: "vague mail threat 2, formatted"
+  parent: Paper
+  components:
+  - type: Paper
+    content: |2
+
+                        [head=1]I'm coming for you.[/head]
+
+- type: entity
+  id: PaperMailNFVagueThreat3
+  categories: [ HideSpawnMenu ]
+  suffix: "vague mail threat 3, formatted"
+  parent: Paper
+  components:
+  - type: Paper
+    content: |2
+
+                                      [head=1]You're next.[/head]
+
+- type: entity
+  id: PaperMailNFVagueThreat4
+  categories: [ HideSpawnMenu ]
+  suffix: "vague mail threat 4, formatted"
+  parent: Paper
+  components:
+  - type: Paper
+    content: |2
+
+                                       [head=1]We see you.[/head]
+
+- type: entity
+  id: PaperMailNFVagueThreat5
+  categories: [ HideSpawnMenu ]
+  suffix: "vague mail threat 5, formatted"
+  parent: Paper
+  components:
+  - type: Paper
+    content: |2
+
+                   [head=2]I hope your affairs are in order.[/head]
+
+- type: entity
+  id: PaperMailNFVagueThreat6
+  categories: [ HideSpawnMenu ]
+  suffix: "vague mail threat 6, formatted"
+  parent: Paper
+  components:
+  - type: Paper
+    content: |2
+
+              [head=1]It's only a matter of time.[/head]
+
+
+                      [head=1]Enjoy it while it lasts.[/head]
+
+- type: entity
+  id: PaperMailNFVagueThreat7
+  categories: [ HideSpawnMenu ]
+  suffix: "vague mail threat 7, formatted"
+  parent: Paper
+  components:
+  - type: Paper
+    content: |2
+
+               [head=2]Who should we mail your pieces to?[/head]
+
+- type: entity
+  id: PaperMailNFVagueThreat8
+  categories: [ HideSpawnMenu ] 
+  suffix: "vague mail threat 8, formatted"
+  parent: Paper
+  components:
+  - type: Paper
+    content: |2
+
+      [head=2]Would you prefer to die slowly or quickly?
+      [/head]
+                                      [head=1]Just kidding.[/head]
+
+                     [head=2]We don't care what you think.[/head]
+
+- type: entity
+  id: PaperMailNFVagueThreat9
+  categories: [ HideSpawnMenu ]
+  suffix: "vague mail threat 9, formatted"
+  parent: Paper
+  components:
+  - type: Paper
+    content: |2
+
+          [head=3]I think your head would look nice on my mantel.[/head]
+
+- type: entity
+  id: PaperMailNFVagueThreat10
+  categories: [ HideSpawnMenu ]
+  suffix: "vague mail threat 10, formatted"
+  parent: Paper
+  components:
+  - type: Paper
+    content: |2
+
+               [head=1]You should have paid up.[/head]
+
+
+                              [head=1]It's too late now.[/head]
+
+- type: entity
+  id: PaperMailNFVagueThreat11
+  categories: [ HideSpawnMenu ]
+  suffix: "vague mail threat 11, formatted"
+  parent: Paper
+  components:
+  - type: Paper
+    content: |2
+
+                [head=3]Your family will miss you, but don't worry.[/head]
+
+
+         [head=1]We'll take care of them too.[/head]
+
+- type: entity
+  id: PaperMailNFVagueThreat12
+  categories: [ HideSpawnMenu ]
+  suffix: "vague mail threat 12, formatted"
+  parent: Paper
+  components:
+  - type: Paper
+    content: |2
+
+               [head=3]I have a bet that you're going to die today.[/head]
+
+
+                  [head=1]I'm not afraid to cheat.[/head]
+
+- type: entity
+  id: PaperMailNFPwrGameAd
+  name: pwr game advertisement
+  categories: [ HideSpawnMenu ]
+  suffix: "pwr game ad"
+  parent: Paper
+  components:
+  - type: Paper
+    content: |2
+
+                            [head=1]Drink Pwr Game![/head]
+
+      [head=3]Proud sponsor of the NT Block Game Championship.[/head]
+
+- type: entity
+  id: PaperMailNFRedBoolAd
+  name: red bool advertisement
+  categories: [ HideSpawnMenu ]
+  suffix: "red bool ad"
+  parent: Paper
+  components:
+  - type: Paper
+    content: |2
+
+                 [head=2]Try NEW Reformulated Red Bool![/head]
+
+                      [head=2]Over [color=#dd0000]1.5g[/color] of caffeine per can![/head]
+
+                 [head=2]Punch your heart into overdrive![/head]
+
+- type: entity
+  id: PaperMailNFSpaceColaAd
+  name: space cola advertisement
+  categories: [ HideSpawnMenu ]
+  suffix: "space cola ad"
+  parent: Paper
+  components:
+  - type: Paper
+    content: |2
+
+            [head=2]The classic taste you love, Space Cola.[/head]
+
+                             [head=2]Now certified lead-free.[/head]
+
+- type: entity
+  id: PaperMailNFSpaceMountainWindAd
+  name: space mountain wind advertisement
+  categories: [ HideSpawnMenu ]
+  suffix: "space mountain wind ad"
+  parent: Paper
+  components:
+  - type: Paper
+    content: |2
+
+               [head=3]When it's time to game, there's one choice:[/head]
+
+                     [head=1]Space Mountain Wind.[/head]
+
+- type: entity
+  id: PaperMailNFSpaceUpAd
+  name: space up advertisement
+  categories: [ HideSpawnMenu ]
+  suffix: "space up ad"
+  parent: Paper
+  components:
+  - type: Paper
+    content: |2
+
+            [head=3]The crisp, refreshing taste of lemon and lime.[/head]
+
+
+                                        [head=1]Space Up![/head]
+
+
+        [head=2]Ask your barkeep for a Sui Dream today![/head]
+
+- type: entity
+  id: PaperMailNTSoapAd1
+  categories: [ HideSpawnMenu ]
+  suffix: "soap ad 1"
+  parent: Paper
+  components:
+  - type: Paper
+    stampedBy:
+    - stampedColor: '#333333FF'
+      stampedName: Christopher Cleanman
+#      stampType: Signature #DeltaV - Not compatible with our signatures code stuff apparently
+    content: |2
+      [head=3]Hello Valued Customer,[/head]
+      You have been selected to receive a complimentary sampler of scented soaps that Nanotrasen has to offer.
+
+      Why not enjoy a nice warm shower with our scented soaps?  Tested and effective vs. vent crud and mold.
+
+      We hope you enjoy.
+
+      Sincerely,
+            Christopher Cleanman, Vice President, NT Habs - Toiletries Dept.
+
+- type: entity
+  id: PaperMailNTSoapAd2
+  categories: [ HideSpawnMenu ] 
+  suffix: "soap ad 2" #DeltaV - Edited to not be addressed to Frontier Citizens, localized
+  parent: Paper
+  components:
+  - type: Paper
+    content: |2
+      [head=2]GREETINGS DELTA SECTOR CITIZEN[/head]
+
+      OUR REPORTS INDICATE THAT:
+      1. YOU HAVE FAILED YOUR QUARTERLY HYGIENE INSPECTION.
+      2. THIS HAS REDUCED SECTOR EFFICIENCY BY [bold]0.02%[/bold].
+
+      ENCLOSED IS A SELECTION OF HYGIENE PRODUCTS SUITABLE FOR USE BY ORGANICS. WE HOPE THAT THIS SITUATION IS RESOLVED PROMPTLY.
+
+      [italic]THIS IS AN AUTOMATED MESSAGE. DO NOT REPLY.[/italic]
+
+- type: entity
+  id: PaperMailNTConscript
+  categories: [ HideSpawnMenu ]
+  suffix: "conscript"
+  parent: Paper
+  components:
+  - type: Paper
+    content: |2
+
+                     [head=1]NOT ONE STEP BACK.[/head]
+
+
+                       [head=1]FOR THE FRONTIER.[/head]
+
+- type: entity
+  id: PaperMailNTMusket
+  categories: [ HideSpawnMenu ]
+  suffix: "musket"
+  parent: Paper
+  components:
+  - type: Paper
+    content: |2
+
+                  [head=2]Use a musket for sector defense,
+             like the founding fathers intended.[/head]
+
+- type: entity
+  id: PaperMailNFPaperPusherAd
+  categories: [ HideSpawnMenu ]
+  suffix: "paper pusher" 
+  parent: Paper
+  components:
+  - type: Paper
+    content: |2
+
+          [head=2]Here is a pen for any letters you write.
+      [/head]
+            [head=1]Keep it close, use it often.[/head]
+
+      [head=2]May you write well, neatly, and with style.[/head]
+
+            [head=3]Sincerely,
+               [italic]The Frontier Paper Pusher's Club[/italic][/head]
+
+- type: entity
+  id: PaperMailNFPetBedAssemblyManual
+  name: pet bed assembly manual
+  categories: [ HideSpawnMenu ]
+  suffix: "pet bed assembly manual"
+  parent: Paper
+  components:
+  - type: Paper
+    content: |2
+      
+      [head=1]HÖGANÄS[/head]
+
+      [italic](There is a black and white picture of a pet bed on the first page.)[/italic]
+
+      [italic](On the next few pages, you see a list of materials and a happy stick figure assembling furniture.)[/italic]
+
+      [italic](On the pages after that, you see a set of instructions to assemble a pet bed. You're sure you don't need them, how hard could it be?)[/italic]
+
+- type: entity
+  id: PaperMailNTBoxer
+  categories: [ HideSpawnMenu ]
+  suffix: "boxer"
+  parent: Paper
+  components:
+  - type: Paper
+    content: |2
+          [head=2]You've gotta defend your belt, champ.
+      [/head]
+                [head=1]They're coming for you.[/head]
+
+                  [head=2]This should help. Knock 'em out.[/head]
+
+# Placeholder for an arm-on-use, flashbang fakeout pipebomb
+- type: entity
+  id: PaperMailNFPipebombIntern
+  categories: [ HideSpawnMenu ]
+  suffix: "pipe bomb intern"
+  parent: Paper
+  components:
+  - type: Paper
+    stampedBy:
+    - stampedColor: '#333333FF'
+      stampedName: craig
+#      stampType: Signature #DeltaV - Not compatible with our signatures code stuff apparently
+    content: |2
+      [bold]hey uh, they told me to send you a pipebomb i guess?
+
+      this is all i could find around here, hope that works
+
+      thanks[/bold]
+
+- type: entity
+  id: PaperMailNFAntivirus
+  name: Snortin Antivirus invoice
+  categories: [ HideSpawnMenu ]
+  suffix: "antivirus ad"
+  parent: Paper
+  components:
+  - type: Paper
+    content: |2
+
+          [head=1]Invoice[/head][head=3]
+          Snortin Antivirus Software[/head]
+
+      [head=3]Order #41003
+      [bold][bullet/][/bold] 1x Snortin Total-275 Antivirus Install Disk[/head]
+
+      [head=3]Total: 947381 Spesos[/head]
+
+      Thank you for making purchase from Snortin Antivirus Software.
+      We assuring you that our product is greatest.
+      Please sending payment at earliest convenience.
+
+- type: entity
+  id: PaperMailNFEMPPreparedness
+  categories: [ HideSpawnMenu ]
+  name: EMP preparedness response form
+  suffix: "emp preparedness" #DeltaV - Replaces mention of SR with HoS
+  parent: Paper
+  components:
+  - type: Paper
+    content: |2
+
+        [head=1]EMP Preparedness Response[/head]
+
+      You have been selected to receive a NT EMP Preparedness kit as a test. Note that this is only a test. In a real emergency, follow the instructions of your vessel's command staff.
+
+      As the recipient of this, please note [bold]any improvements[/bold] that could be made towards the EMP preparedness of the vessel you were aboard when opening and submit this form to your serving Captain or Head of Security.
+
+      [bold]Date of test:[/bold]
+      [bold]Number of affected items:[/bold]
+      [bold]Perceived severity of incident:[/bold]
+      [bold]Suggested improvements:[/bold]
+
+- type: entity
+  id: PaperMailNFBuildABuddy
+  categories: [ HideSpawnMenu ]
+  name: Build-a-Buddy adoption letter
+  suffix: "build-a-buddy" #DeltaV- Body text changed, because Goblins Aren't Real
+  parent: Paper
+  components:
+  - type: Paper
+    stampState: paper_stamp-generic
+    stampedBy:
+    - stampedColor: '#FF6699FF'
+      stampedName: Chief Friendship Officer
+    - stampedColor: '#333333FF'
+      stampedName: Cuts-With-Scalpel
+#      stampType: Signature  #DeltaV - Not compatible with our signatures code stuff apparently. 
+    content: |2
+
+      [head=1]Note of Adoption[/head]
+
+      You're now the proud owner of your very own Build-a-Buddy!
+
+      We hope that your new friend can serve as a shoulder to lean on in the depths of space, and hopefully you won't be quite as lonely out there. Personally, I find putting them together to be rather therapeutic.
+
+      [bold]Collect the whole set![/bold]
+      [bold][bullet/][/bold] Henry the Human
+      [bold][bullet/][/bold] Randy the Reptilian
+      [bold][bullet/][/bold] Steven the Slime
+      [bold][bullet/][/bold] Valerie the Vulpkanin
+
+- type: entity
+  id: PaperMailNFSpaceLaw
+  categories: [ HideSpawnMenu ]
+  suffix: "space-law" #DeltaV- edited contents to be from the Delta Sector instead of the Frontier
+  parent: Paper
+  components:
+  - type: Paper
+    stampState: paper_stamp-centcom
+    stampedBy:
+    - stampedColor: '#006600FF'
+      stampedName: Central Admiralty of the Delta Sector
+    content: |2
+
+            [head=1]Space Law is your shield.[/head]
+
+                  [head=2]With it, you guard the Delta Sector.[/head][head=3]
+      [/head]
+        [head=1]Memorize it. Grasp it firmly.[/head]
+
+          [head=2]The SOP is your sword, don't get rusty.[/head]
+
+        [head=2]Maintain your balance, and wield it well.[/head]
+
+
+
+
+
+
+
+
+                              [head=3][italic]Internal Bureau of Propaganda[/italic][/head]
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mail/base_mail_large.yml b/Resources/Prototypes/Entities/Objects/Specific/Mail/base_mail_large.yml
new file mode 100644
index 00000000000..a5dcefacba5
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Specific/Mail/base_mail_large.yml
@@ -0,0 +1,79 @@
+# Large packages.
+- type: entity
+  parent: BaseMail
+  abstract: true
+  id: BaseMailLarge
+  name: mail-large-item-name-unaddressed
+  components:
+  - type: Item
+    size: Ginormous
+  - type: Sprite
+    scale: 0.8, 0.8
+    sprite: Objects/Specific/Mail/mail_large.rsi
+    layers:
+    - state: icon
+      map: ["enum.MailVisualLayers.Icon"]
+    - state: fragile
+      map: ["enum.MailVisualLayers.FragileStamp"]
+      visible: false
+    - map: ["enum.MailVisualLayers.JobStamp"]
+      scale: 0.8, 0.8
+      offset: 0.235, -0.01
+    - state: locked
+      map: ["enum.MailVisualLayers.Lock"]
+    - state: priority
+      map: ["enum.MailVisualLayers.PriorityTape"]
+      visible: false
+      shader: unshaded
+    - state: broken
+      map: ["enum.MailVisualLayers.Breakage"]
+      visible: false
+  - type: GenericVisualizer
+    visuals:
+      enum.MailVisuals.IsTrash:
+        enum.MailVisualLayers.Icon:
+          True:
+            state: trash
+          False:
+            state: icon
+      enum.MailVisuals.IsLocked:
+        enum.MailVisualLayers.Lock:
+          True:
+            visible: true
+          False:
+            visible: false
+      enum.MailVisuals.IsFragile:
+        enum.MailVisualLayers.FragileStamp:
+          True:
+            visible: true
+          False:
+            visible: false
+      enum.MailVisuals.IsPriority:
+        enum.MailVisualLayers.PriorityTape:
+          True:
+            visible: true
+          False:
+            visible: false
+      enum.MailVisuals.IsPriorityInactive:
+        enum.MailVisualLayers.PriorityTape:
+          True:
+            shader: shaded
+            state: priority_inactive
+          False:
+            shader: unshaded
+            state: priority
+      enum.MailVisuals.IsBroken:
+        enum.MailVisualLayers.Breakage:
+          True:
+            visible: true
+          False:
+            visible: false
+  - type: MultiHandedItem
+  - type: Mail
+    isLarge: true
+
+- type: entity
+  noSpawn: true
+  parent: BaseMailLarge
+  id: MailLargeAdminFun
+  suffix: adminfun
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
index 594ffb4d4d9..62ed28e1148 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
@@ -375,3 +375,29 @@
       tags:
         - CartridgeRocket
     proto: ImmovableRodSlow
+
+# Frontier mail RPDS
+- type: entity
+  name: mail RPDS
+  parent: WeaponLauncherChinaLake
+  id: WeaponMailLake
+  description: Rap(b?)id Parcel Delivery System
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Launchers/mail.rsi
+    layers:
+    - state: icon
+      map: ["enum.GunVisualLayers.Base"]
+  - type: Clothing
+    sprite: Objects/Weapons/Guns/Launchers/mail.rsi
+    quickEquip: false
+    slots:
+    - Back
+    - Belt
+    - suitStorage
+  - type: BallisticAmmoProvider
+    proto: null
+    whitelist:
+      tags:
+      - MailCapsule
+    capacity: 4
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 4ffb270203b..9fe0e0e62ba 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -1239,7 +1239,8 @@
       runningState: building
       staticRecipes:
         - LPPMaterialDiamond
-        - BluespaceCrystal #Nyano - Summary: Bluespace Crystals can be created here.
+        - BluespaceCrystal
+        - NormalityCrystal
         - SheetSteel30
         - SheetGlass30
         - SheetRGlass30
diff --git a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
index 4b2eef6df85..31e8d67ef5c 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
@@ -294,6 +294,50 @@
           state: rock_asteroid_west
         - state: rock_artifact_fragment
 
+- type: entity
+  id: AsteroidRockBluespace
+  parent: AsteroidRock
+  description: A rock wall. What's that sticking out of it?
+  suffix: Bluespace
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreBluespace
+    - type: Sprite
+      layers:
+        - state: rock_asteroid
+        - map: [ "enum.EdgeLayer.South" ]
+          state: rock_asteroid_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: rock_asteroid_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: rock_asteroid_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: rock_asteroid_west
+        - state: rock_bluespace
+
+- type: entity
+  id: AsteroidRockNormality
+  parent: AsteroidRock
+  description: A rock wall. What's that sticking out of it?
+  suffix: Normality
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreNormality
+    - type: Sprite
+      layers:
+        - state: rock_asteroid
+        - map: [ "enum.EdgeLayer.South" ]
+          state: rock_asteroid_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: rock_asteroid_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: rock_asteroid_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: rock_asteroid_west
+        - state: rock_bluespace
+
 - type: entity
   id: AsteroidRockMining
   parent: AsteroidRock
@@ -609,6 +653,50 @@
           state: rock_west
         - state: rock_salt
 
+- type: entity
+  id: WallRockBluespace
+  parent: WallRock
+  description: A rock wall. What's that sticking out of it?
+  suffix: Bluespace
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreBluespace
+    - type: Sprite
+      layers:
+        - state: rock
+        - map: [ "enum.EdgeLayer.South" ]
+          state: rock_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: rock_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: rock_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: rock_west
+        - state: rock_bluespace
+
+- type: entity
+  id: WallRockNormality
+  parent: WallRock
+  description: A rock wall. What's that sticking out of it?
+  suffix: Normality
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreNormality
+    - type: Sprite
+      layers:
+        - state: rock
+        - map: [ "enum.EdgeLayer.South" ]
+          state: rock_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: rock_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: rock_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: rock_west
+        - state: rock_bluespace
+
 # Basalt variants
 - type: entity
   id: WallRockBasalt
@@ -852,6 +940,50 @@
           state: rock_wall_west
         - state: rock_salt
 
+- type: entity
+  id: WallRockBasaltBluespace
+  parent: WallRockBluespace
+  description: A rock wall. What's that sticking out of it?
+  suffix: Bluespace
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreBluespace
+    - type: Sprite
+      layers:
+        - state: rock_wall
+        - map: [ "enum.EdgeLayer.South" ]
+          state: rock_wall_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: rock_wall_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: rock_wall_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: rock_wall_west
+        - state: rock_bluespace
+
+- type: entity
+  id: WallRockBasaltNormality
+  parent: WallRockNormality
+  description: A rock wall. What's that sticking out of it?
+  suffix: Normality
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreNormality
+    - type: Sprite
+      layers:
+        - state: rock_wall
+        - map: [ "enum.EdgeLayer.South" ]
+          state: rock_wall_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: rock_wall_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: rock_wall_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: rock_wall_west
+        - state: rock_bluespace
+
 # Snow variants
 - type: entity
   id: WallRockSnow
@@ -1095,6 +1227,50 @@
           state: rock_snow_west
         - state: rock_salt
 
+- type: entity
+  id: WallRockSnowBluespace
+  parent: WallRockSnow
+  description: A rock wall. What's that sticking out of it?
+  suffix: Bluespace
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreBluespace
+    - type: Sprite
+      layers:
+        - state: rock_snow
+        - map: [ "enum.EdgeLayer.South" ]
+          state: rock_snow_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: rock_snow_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: rock_snow_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: rock_snow_west
+        - state: rock_bluespace
+
+- type: entity
+  id: WallRockSnowNormality
+  parent: WallRockSnow
+  description: A rock wall. What's that sticking out of it?
+  suffix: Normality
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreNormality
+    - type: Sprite
+      layers:
+        - state: rock_snow
+        - map: [ "enum.EdgeLayer.South" ]
+          state: rock_snow_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: rock_snow_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: rock_snow_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: rock_snow_west
+        - state: rock_bluespace
+
 # Sand variants
 - type: entity
   id: WallRockSand
@@ -1338,6 +1514,50 @@
           state: rock_sand_west
         - state: rock_salt
 
+- type: entity
+  id: WallRockSandBluespace
+  parent: WallRockSand
+  description: A rock wall. What's that sticking out of it?
+  suffix: Bluespace
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreBluespace
+    - type: Sprite
+      layers:
+        - state: rock_sand
+        - map: [ "enum.EdgeLayer.South" ]
+          state: rock_sand_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: rock_sand_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: rock_sand_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: rock_sand_west
+        - state: rock_bluespace
+
+- type: entity
+  id: WallRockSandNormality
+  parent: WallRockSand
+  description: A rock wall. What's that sticking out of it?
+  suffix: Normality
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreNormality
+    - type: Sprite
+      layers:
+        - state: rock_sand
+        - map: [ "enum.EdgeLayer.South" ]
+          state: rock_sand_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: rock_sand_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: rock_sand_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: rock_sand_west
+        - state: rock_bluespace
+
 # Chromite variants
 - type: entity
   id: WallRockChromite
@@ -1581,6 +1801,50 @@
           state: rock_chromite_west
         - state: rock_salt
 
+- type: entity
+  id: WallRockChromiteBluespace
+  parent: WallRockChromite
+  description: A rock wall. What's that sticking out of it?
+  suffix: Bluespace
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreBluespace
+    - type: Sprite
+      layers:
+        - state: rock_chromite
+        - map: [ "enum.EdgeLayer.South" ]
+          state: rock_chromite_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: rock_chromite_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: rock_chromite_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: rock_chromite_west
+        - state: rock_bluespace
+
+- type: entity
+  id: WallRockChromiteNormality
+  parent: WallRockChromite
+  description: A rock wall. What's that sticking out of it?
+  suffix: Normality
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreNormality
+    - type: Sprite
+      layers:
+        - state: rock_chromite
+        - map: [ "enum.EdgeLayer.South" ]
+          state: rock_chromite_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: rock_chromite_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: rock_chromite_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: rock_chromite_west
+        - state: rock_bluespace
+
 # Andesite variants
 - type: entity
   id: WallRockAndesite
@@ -1823,3 +2087,47 @@
         - map: [ "enum.EdgeLayer.West" ]
           state: rock_andesite_west
         - state: rock_salt
+
+- type: entity
+  id: WallRockAndesiteBluespace
+  parent: WallRockAndesite
+  description: A rock wall. What's that sticking out of it?
+  suffix: Bluespace
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreBluespace
+    - type: Sprite
+      layers:
+        - state: rock_andesite
+        - map: [ "enum.EdgeLayer.South" ]
+          state: rock_andesite_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: rock_andesite_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: rock_andesite_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: rock_andesite_west
+        - state: rock_bluespace
+
+- type: entity
+  id: WallRockAndesiteNormality
+  parent: WallRockAndesite
+  description: A rock wall. What's that sticking out of it?
+  suffix: Normality
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreNormality
+    - type: Sprite
+      layers:
+        - state: rock_andesite
+        - map: [ "enum.EdgeLayer.South" ]
+          state: rock_andesite_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: rock_andesite_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: rock_andesite_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: rock_andesite_west
+        - state: rock_bluespace
diff --git a/Resources/Prototypes/Loadouts/Categories/categories.yml b/Resources/Prototypes/Loadouts/Categories/categories.yml
index 94e90b663fb..c47d6ddef89 100644
--- a/Resources/Prototypes/Loadouts/Categories/categories.yml
+++ b/Resources/Prototypes/Loadouts/Categories/categories.yml
@@ -65,6 +65,9 @@
   subCategories:
     - JobsServiceUncategorized
     - JobsServiceBartender
+    - JobsServiceBotanist
+    - JobsServiceChef
+    - JobsServiceJanitor
 
 - type: loadoutCategory
   id: JobsServiceUncategorized
@@ -72,6 +75,15 @@
 - type: loadoutCategory
   id: JobsServiceBartender
 
+- type: loadoutCategory
+  id: JobsServiceBotanist
+
+- type: loadoutCategory
+  id: JobsServiceChef
+
+- type: loadoutCategory
+  id: JobsServiceJanitor
+
 - type: loadoutCategory
   id: Mask
   root: true
diff --git a/Resources/Prototypes/Loadouts/Jobs/science.yml b/Resources/Prototypes/Loadouts/Jobs/science.yml
index 9a9526f83fa..198d7f9cc60 100644
--- a/Resources/Prototypes/Loadouts/Jobs/science.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/science.yml
@@ -3,14 +3,14 @@
 - type: loadout
   id: LoadoutScienceUniformJumpskirtSenior
   category: JobsScience
-  cost: 1
+  cost: 0
   exclusive: true
   requirements:
     - !type:CharacterItemGroupRequirement
       group: LoadoutUniformsScience
-    - !type:CharacterJobRequirement
-      jobs:
-        - Scientist
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Epistemics
     - !type:CharacterDepartmentTimeRequirement
       department: Epistemics
       min: 216000 # 60 hours
@@ -20,14 +20,14 @@
 - type: loadout
   id: LoadoutScienceUniformJumpsuitSenior
   category: JobsScience
-  cost: 1
+  cost: 0
   exclusive: true
   requirements:
     - !type:CharacterItemGroupRequirement
       group: LoadoutUniformsScience
-    - !type:CharacterJobRequirement
-      jobs:
-        - Scientist
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Epistemics
     - !type:CharacterDepartmentTimeRequirement
       department: Epistemics
       min: 216000 # 60 hours
@@ -37,28 +37,28 @@
 - type: loadout
   id: LoadoutScienceUniformJumpskirtRoboticist
   category: JobsScience
-  cost: 1
+  cost: 0
   exclusive: true
   requirements:
     - !type:CharacterItemGroupRequirement
       group: LoadoutUniformsScience
-    - !type:CharacterJobRequirement
-      jobs:
-        - Scientist
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Epistemics
   items:
     - ClothingUniformJumpskirtRoboticist
 
 - type: loadout
   id: LoadoutScienceUniformJumpsuitRoboticist
   category: JobsScience
-  cost: 1
+  cost: 0
   exclusive: true
   requirements:
     - !type:CharacterItemGroupRequirement
       group: LoadoutUniformsScience
-    - !type:CharacterJobRequirement
-      jobs:
-        - Scientist
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Epistemics
   items:
     - ClothingUniformJumpsuitRoboticist
 
@@ -100,11 +100,9 @@
   requirements:
     - !type:CharacterItemGroupRequirement
       group: LoadoutOuterScience
-    - !type:CharacterJobRequirement
-      jobs:
-        - Scientist
-        - ResearchAssistant
-        - ResearchDirector
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Epistemics
   items:
     - ClothingOuterCoatRnd
 
@@ -116,11 +114,9 @@
   requirements:
     - !type:CharacterItemGroupRequirement
       group: LoadoutOuterScience
-    - !type:CharacterJobRequirement
-      jobs:
-        - Scientist
-        - ResearchAssistant
-        - ResearchDirector
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Epistemics
   items:
     - ClothingOuterCoatLab
 
@@ -132,37 +128,37 @@
   requirements:
     - !type:CharacterItemGroupRequirement
       group: LoadoutOuterScience
-    - !type:CharacterJobRequirement
-      jobs:
-        - Scientist
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Epistemics
   items:
     - ClothingOuterCoatRobo
 
 - type: loadout
   id: LoadoutScienceOuterWinterSci
   category: JobsScience
-  cost: 1
+  cost: 0
   exclusive: true
   requirements:
     - !type:CharacterItemGroupRequirement
       group: LoadoutOuterScience
-    - !type:CharacterJobRequirement
-      jobs:
-        - Scientist
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Epistemics
   items:
     - ClothingOuterWinterSci
 
 - type: loadout
   id: LoadoutScienceOuterLabcoatSeniorResearcher
   category: JobsScience
-  cost: 1
+  cost: 0
   exclusive: true
   requirements:
     - !type:CharacterItemGroupRequirement
       group: LoadoutOuterScience
-    - !type:CharacterJobRequirement
-      jobs:
-        - Scientist
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Epistemics
     - !type:CharacterDepartmentTimeRequirement
       department: Epistemics
       min: 216000 # 60 hours
@@ -177,11 +173,9 @@
   requirements:
     - !type:CharacterItemGroupRequirement
       group: LoadoutOuterScience
-    - !type:CharacterJobRequirement
-      jobs:
-        - Scientist
-        - ResearchAssistant
-        - ResearchDirector
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Epistemics
   items:
     - ClothingOuterExplorerCoat
 
@@ -265,10 +259,9 @@
   requirements:
     - !type:CharacterItemGroupRequirement
       group: LoadoutGlovesScience
-    - !type:CharacterJobRequirement
-      jobs:
-        - Scientist
-        - ResearchDirector
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Epistemics
   items:
     - ClothingHandsGlovesColorPurple
 
@@ -280,10 +273,9 @@
   requirements:
     - !type:CharacterItemGroupRequirement
       group: LoadoutGlovesScience
-    - !type:CharacterJobRequirement
-      jobs:
-        - Scientist
-        - ResearchDirector
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Epistemics
   items:
     - ClothingHandsGlovesLatex
 
@@ -295,10 +287,9 @@
   requirements:
     - !type:CharacterItemGroupRequirement
       group: LoadoutGlovesScience
-    - !type:CharacterJobRequirement
-      jobs:
-        - Scientist
-        - ResearchDirector
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Epistemics
   items:
     - ClothingHandsGlovesRobohands
 
@@ -312,10 +303,9 @@
   requirements:
     - !type:CharacterItemGroupRequirement
       group: LoadoutNeckScience
-    - !type:CharacterJobRequirement
-      jobs:
-        - Scientist
-        - ResearchDirector
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Epistemics
   items:
     - ClothingNeckTieSci
 
@@ -327,10 +317,9 @@
   requirements:
     - !type:CharacterItemGroupRequirement
       group: LoadoutNeckScience
-    - !type:CharacterJobRequirement
-      jobs:
-        - Scientist
-        - ResearchDirector
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Epistemics
   items:
     - ClothingNeckScarfStripedPurple
 
@@ -356,9 +345,9 @@
   requirements:
     - !type:CharacterItemGroupRequirement
       group: LoadoutNeckScience
-    - !type:CharacterJobRequirement
-      jobs:
-        - Chaplain
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Epistemics
   items:
     - ClothingNeckScarfStripedBlack
 
@@ -388,11 +377,9 @@
   requirements:
     - !type:CharacterItemGroupRequirement
       group: LoadoutHeadScience
-    - !type:CharacterJobRequirement
-      jobs:
-        - Scientist
-        - ResearchAssistant
-        - ResearchDirector
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Epistemics
   items:
     - ClothingHeadHatBeretRND
 
@@ -404,9 +391,9 @@
   requirements:
     - !type:CharacterItemGroupRequirement
       group: LoadoutHeadScience
-    - !type:CharacterJobRequirement
-      jobs:
-        - Chaplain
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Epistemics
   items:
     - ClothingHeadHatFez
 
@@ -476,11 +463,9 @@
   requirements:
     - !type:CharacterItemGroupRequirement
       group: LoadoutEyesScience
-    - !type:CharacterJobRequirement
-      jobs:
-        - Scientist
-        - ResearchAssistant
-        - ResearchDirector
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Epistemics
   items:
     - ClothingEyesHudDiagnostic
 
@@ -492,11 +477,9 @@
   requirements:
     - !type:CharacterItemGroupRequirement
       group: LoadoutEyesScience
-    - !type:CharacterJobRequirement
-      jobs:
-        - Scientist
-        - ResearchAssistant
-        - ResearchDirector
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Epistemics
   items:
     - ClothingEyesEyepatchHudDiag
 
@@ -510,11 +493,9 @@
   requirements:
     - !type:CharacterItemGroupRequirement
       group: LoadoutShoesScience
-    - !type:CharacterJobRequirement
-      jobs:
-        - Scientist
-        - ResearchAssistant
-        - ResearchDirector
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Epistemics
   items:
     - ClothingShoesBootsWinterSci
 
@@ -529,11 +510,9 @@
   requirements:
     - !type:CharacterItemGroupRequirement
       group: LoadoutOuterScience
-    - !type:CharacterJobRequirement
-      jobs:
-        - Scientist
-        - ResearchAssistant
-        - ResearchDirector
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Epistemics
 
 - type: loadout
   id: LoadoutHeadHoodTechPriest
@@ -545,8 +524,105 @@
   requirements:
     - !type:CharacterItemGroupRequirement
       group: LoadoutHeadScience
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Epistemics
+
+# Cataloguer
+- type: loadout
+  id: LoadoutScienceJumpsuitLibrarianNt
+  category: JobsScience
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutCataloguerUniforms
+    - !type:CharacterJobRequirement
+      jobs:
+        - Librarian
+  items:
+    - ClothingUniformJumpsuitLibrarianNt
+
+- type: loadout
+  id: LoadoutScienceJumpsuitLibrarianIdris
+  category: JobsScience
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutCataloguerUniforms
+    - !type:CharacterJobRequirement
+      jobs:
+        - Librarian
+  items:
+    - ClothingUniformJumpsuitLibrarianIdris
+
+- type: loadout
+  id: LoadoutScienceJumpsuitLibrarianOrion
+  category: JobsScience
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutCataloguerUniforms
+    - !type:CharacterJobRequirement
+      jobs:
+        - Librarian
+  items:
+    - ClothingUniformJumpsuitLibrarianOrion
+
+- type: loadout
+  id: LoadoutScienceJumpsuitLibrarianHeph
+  category: JobsScience
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutCataloguerUniforms
     - !type:CharacterJobRequirement
       jobs:
-        - Scientist
-        - ResearchAssistant
-        - ResearchDirector
+        - Librarian
+  items:
+    - ClothingUniformJumpsuitLibrarianHeph
+
+- type: loadout
+  id: LoadoutScienceJumpsuitLibrarianPMCG
+  category: JobsScience
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutCataloguerUniforms
+    - !type:CharacterJobRequirement
+      jobs:
+        - Librarian
+  items:
+    - ClothingUniformJumpsuitLibrarianPMCG
+
+- type: loadout
+  id: LoadoutScienceJumpsuitLibrarianZav
+  category: JobsScience
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutCataloguerUniforms
+    - !type:CharacterJobRequirement
+      jobs:
+        - Librarian
+  items:
+    - ClothingUniformJumpsuitLibrarianZav
+
+- type: loadout
+  id: LoadoutScienceJumpsuitLibrarianZeng
+  category: JobsScience
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutCataloguerUniforms
+    - !type:CharacterJobRequirement
+      jobs:
+        - Librarian
+  items:
+    - ClothingUniformJumpsuitLibrarianZeng
\ No newline at end of file
diff --git a/Resources/Prototypes/Loadouts/Jobs/service.yml b/Resources/Prototypes/Loadouts/Jobs/service.yml
index bdfa3d81656..b346bc31822 100644
--- a/Resources/Prototypes/Loadouts/Jobs/service.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/service.yml
@@ -280,7 +280,7 @@
 - type: loadout
   id: LoadoutServiceBartenderBoxLightRifleRubber
   category: JobsServiceBartender
-  cost: 1
+  cost: 0
   exclusive: true
   requirements:
     - !type:CharacterItemGroupRequirement
@@ -308,7 +308,7 @@
 - type: loadout
   id: LoadoutServiceBartenderMosinRubber
   category: JobsServiceBartender
-  cost: 3
+  cost: 0
   exclusive: true
   requirements:
     - !type:CharacterItemGroupRequirement
@@ -319,10 +319,136 @@
   items:
     - WeaponSniperMosinRubber
 
+- type: loadout
+  id: LoadoutServiceJumpsuitBartenderNt
+  category: JobsServiceBartender
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutBartenderUniforms
+    - !type:CharacterJobRequirement
+      jobs:
+        - Bartender
+  items:
+    - ClothingUniformJumpsuitBartenderNt
+
+- type: loadout
+  id: LoadoutServiceJumpsuitBartenderIdris
+  category: JobsServiceBartender
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutBartenderUniforms
+    - !type:CharacterJobRequirement
+      jobs:
+        - Bartender
+  items:
+    - ClothingUniformJumpsuitBartenderIdris
+
+- type: loadout
+  id: LoadoutServiceJumpsuitBartenderOrion
+  category: JobsServiceBartender
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutBartenderUniforms
+    - !type:CharacterJobRequirement
+      jobs:
+        - Bartender
+  items:
+    - ClothingUniformJumpsuitBartenderOrion
+
+- type: loadout
+  id: LoadoutServiceHeadBartenderNt
+  category: JobsServiceBartender
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutBartenderHead
+    - !type:CharacterJobRequirement
+      jobs:
+        - Bartender
+  items:
+    - ClothingHeadHatFlatcapBartenderNanotrasen
+
+- type: loadout
+  id: LoadoutServiceHeadBartenderIdris
+  category: JobsServiceBartender
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutBartenderHead
+    - !type:CharacterJobRequirement
+      jobs:
+        - Bartender
+  items:
+    - ClothingHeadHatFlatcapBartenderIdris
+
+- type: loadout
+  id: LoadoutServiceHeadBartenderOrion
+  category: JobsServiceBartender
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutBartenderHead
+    - !type:CharacterJobRequirement
+      jobs:
+        - Bartender
+  items:
+    - ClothingHeadHatFlatcapBartenderOrion
+
+- type: loadout
+  id: LoadoutServiceOuterBartenderNt
+  category: JobsServiceBartender
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutBartenderOuterwear
+    - !type:CharacterJobRequirement
+      jobs:
+        - Bartender
+  items:
+    - ClothingOuterVestNt
+
+- type: loadout
+  id: LoadoutServiceOuterBartenderIdris
+  category: JobsServiceBartender
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutBartenderOuterwear
+    - !type:CharacterJobRequirement
+      jobs:
+        - Bartender
+  items:
+    - ClothingOuterVestIdris
+
+- type: loadout
+  id: LoadoutServiceOuterBartenderOrion
+  category: JobsServiceBartender
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutBartenderOuterwear
+    - !type:CharacterJobRequirement
+      jobs:
+        - Bartender
+  items:
+    - ClothingOuterVestOrion
+
 # Botanist
 - type: loadout
   id: LoadoutServiceBotanistUniformOveralls
-  category: JobsServiceUncategorized
+  category: JobsServiceBotanist
   cost: 0
   exclusive: true
   requirements:
@@ -334,6 +460,48 @@
   items:
     - ClothingUniformOveralls
 
+- type: loadout
+  id: LoadoutServiceJumpsuitHydroponicsNt
+  category: JobsServiceBotanist
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutBotanistUniforms
+    - !type:CharacterJobRequirement
+      jobs:
+        - Botanist
+  items:
+    - ClothingUniformJumpsuitHydroponicsNt
+
+- type: loadout
+  id: LoadoutServiceJumpsuitHydroponicsIdris
+  category: JobsServiceBotanist
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutBotanistUniforms
+    - !type:CharacterJobRequirement
+      jobs:
+        - Botanist
+  items:
+    - ClothingUniformJumpsuitHydroponicsIdris
+
+- type: loadout
+  id: LoadoutServiceJumpsuitHydroponicsOrion
+  category: JobsServiceBotanist
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutBotanistUniforms
+    - !type:CharacterJobRequirement
+      jobs:
+        - Botanist
+  items:
+    - ClothingUniformJumpsuitHydroponicsOrion
+
 # Lawyer
 - type: loadout
   id: LoadoutServiceLawyerUniformBlueSuit
@@ -658,4 +826,174 @@
       jobs:
         - Musician
   items:
-    - OcarinaInstrument
\ No newline at end of file
+    - OcarinaInstrument
+
+# Chef
+- type: loadout
+  id: LoadoutServiceJumpsuitChefNt
+  category: JobsServiceChef
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutChefUniforms
+    - !type:CharacterJobRequirement
+      jobs:
+        - Chef
+  items:
+    - ClothingUniformJumpsuitChefNt
+
+- type: loadout
+  id: LoadoutServiceJumpsuitChefIdris
+  category: JobsServiceChef
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutChefUniforms
+    - !type:CharacterJobRequirement
+      jobs:
+        - Chef
+  items:
+    - ClothingUniformJumpsuitChefIdris
+
+- type: loadout
+  id: LoadoutServiceJumpsuitChefOrion
+  category: JobsServiceChef
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutChefUniforms
+    - !type:CharacterJobRequirement
+      jobs:
+        - Chef
+  items:
+    - ClothingUniformJumpsuitChefOrion
+
+- type: loadout
+  id: LoadoutServiceHeadChefNt
+  category: JobsServiceChef
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutChefHead
+    - !type:CharacterJobRequirement
+      jobs:
+        - Chef
+  items:
+    - ClothingHeadHatChefNt
+
+- type: loadout
+  id: LoadoutServiceHeadChefIdris
+  category: JobsServiceChef
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutChefHead
+    - !type:CharacterJobRequirement
+      jobs:
+        - Chef
+  items:
+    - ClothingHeadHatChefIdris
+
+- type: loadout
+  id: LoadoutServiceHeadChefOrion
+  category: JobsServiceChef
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutChefHead
+    - !type:CharacterJobRequirement
+      jobs:
+        - Chef
+  items:
+    - ClothingHeadHatChefOrion
+
+- type: loadout
+  id: LoadoutServiceOuterChefNt
+  category: JobsServiceChef
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutChefOuter
+    - !type:CharacterJobRequirement
+      jobs:
+        - Chef
+  items:
+    - ClothingOuterJacketChefNt
+
+- type: loadout
+  id: LoadoutServiceOuterChefIdris
+  category: JobsServiceChef
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutChefOuter
+    - !type:CharacterJobRequirement
+      jobs:
+        - Chef
+  items:
+    - ClothingOuterJacketChefIdris
+
+- type: loadout
+  id: LoadoutServiceOuterChefOrion
+  category: JobsServiceChef
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutChefOuter
+    - !type:CharacterJobRequirement
+      jobs:
+        - Chef
+  items:
+    - ClothingOuterJacketChefOrion
+
+# Janitor
+- type: loadout
+  id: LoadoutServiceJumpsuitJanitorNt
+  category: JobsServiceJanitor
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutJanitorUniforms
+    - !type:CharacterJobRequirement
+      jobs:
+        - Janitor
+  items:
+    - ClothingUniformJumpsuitJanitorNt
+
+- type: loadout
+  id: LoadoutServiceJumpsuitJanitorIdris
+  category: JobsServiceJanitor
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutJanitorUniforms
+    - !type:CharacterJobRequirement
+      jobs:
+        - Janitor
+  items:
+    - ClothingUniformJumpsuitJanitorIdris
+
+- type: loadout
+  id: LoadoutServiceJumpsuitJanitorOrion
+  category: JobsServiceJanitor
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutJanitorUniforms
+    - !type:CharacterJobRequirement
+      jobs:
+        - Janitor
+  items:
+    - ClothingUniformJumpsuitJanitorOrion
\ No newline at end of file
diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/maildrobe.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/maildrobe.yml
index 579c57ced4e..27642558244 100644
--- a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/maildrobe.yml
+++ b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/maildrobe.yml
@@ -3,6 +3,8 @@
   startingInventory:
     ClothingUniformMailCarrier: 2
     ClothingUniformSkirtMailCarrier: 2
+    WeaponMailLake: 1 # Frontier
+    BoxMailCapsulePrimed: 2 # Frontier
     ClothingHeadMailCarrier: 2
     MailBag: 2
     ClothingHeadsetCargo: 2
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml
index d898124b771..c85255f814e 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml
@@ -32,7 +32,7 @@
     accentVColor: "#DFDFDF"
   - type: Icon
     state: pda-security
-  - type: CartridgeLoader # DeltaV - Crime Assist + SecWatch
+  - type: CartridgeLoader # Adds Crime Assist and SecWatch
     preinstalled:
       - CrewManifestCartridge
       - NotekeeperCartridge
@@ -43,7 +43,7 @@
 - type: entity
   parent: BasePDA
   id: MailCarrierPDA
-  name: courier PDA # DeltaV - Mail Carrier to Courier replacement
+  name: courier PDA
   description: Smells like unopened letters.
   components:
   - type: Sprite
@@ -67,6 +67,12 @@
   - type: Icon
     sprite: DeltaV/Objects/Devices/pda.rsi
     state: pda-mailcarrier
+  - type: CartridgeLoader # Adds a courier performance tracker
+    preinstalled:
+    - CrewManifestCartridge
+    - NotekeeperCartridge
+    - NewsReaderCartridge
+    - MailMetricsCartridge
 
 - type: entity
   parent: BasePDA
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/base_mail.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/base_mail.yml
index c1ca2cd60b1..fd77f19dccb 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/base_mail.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/base_mail.yml
@@ -5,11 +5,13 @@
   name: mail-item-name-unaddressed
   components:
   - type: Item
-    size: Normal
+#    size: Normal # Frontier
+    storedRotation: -90
   - type: Mail
   - type: AccessReader
   - type: Sprite
-    sprite: Nyanotrasen/Objects/Specific/Mail/mail.rsi
+    scale: 0.7, 0.7 # Frontier
+    sprite: Objects/Specific/Mail/mail.rsi
     layers:
     - state: icon
       map: ["enum.MailVisualLayers.Icon"]
@@ -18,8 +20,8 @@
       map: ["enum.MailVisualLayers.FragileStamp"]
       visible: false
     - map: ["enum.MailVisualLayers.JobStamp"]
-      scale: 0.5, 0.5
-      offset: 0.275, 0.2
+      scale: 0.8, 0.8 # Frontier 0.5<0.8
+      offset: 0.225, 0.165 # Frontier (0.275, 0.2)<(0.225, 0.165)
     - state: locked
       map: ["enum.MailVisualLayers.Lock"]
     - state: priority
@@ -92,6 +94,16 @@
     damage:
       types:
         Blunt: 10
+  - type: CargoSellBlacklist # Frontier
+  - type: Food # Frontier - Moth food
+    requiresSpecialDigestion: true
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 1
+        reagents:
+        - ReagentId: Nothing
+          Quantity: 1
 
 # This empty parcel is allowed to exist and evade the tests for the admin
 # mailto command.
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail.yml
deleted file mode 100644
index 7f1b26d9cbf..00000000000
--- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail.yml
+++ /dev/null
@@ -1,835 +0,0 @@
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailAlcohol
-  suffix: alcohol
-  components:
-  - type: Mail
-    contents:
-    - id: DrinkAbsintheBottleFull
-      orGroup: Drink
-    - id: DrinkBlueCuracaoBottleFull
-      orGroup: Drink
-    - id: DrinkGinBottleFull
-      orGroup: Drink
-    - id: DrinkMelonLiquorBottleFull
-      orGroup: Drink
-    - id: DrinkRumBottleFull
-      orGroup: Drink
-    - id: DrinkTequilaBottleFull
-      orGroup: Drink
-    - id: DrinkVermouthBottleFull
-      orGroup: Drink
-    - id: DrinkVodkaBottleFull
-      orGroup: Drink
-    - id: DrinkWineBottleFull
-      orGroup: Drink
-    - id: DrinkGlass
-      amount: 2
-
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailSake
-  suffix: osake
-  components:
-  - type: Mail
-    contents:
-    - id: DrinkSakeCup
-      amount: 2
-    - id: DrinkTokkuri
-
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailAMEGuide
-  suffix: ameguide
-  components:
-  - type: Mail
-    contents:
-    - id: PaperWrittenAMEScribbles
-    - id: Pen
-
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailBible
-  suffix: bible
-  components:
-  - type: Mail
-    contents:
-    - id: Bible
-
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailBikeHorn
-  suffix: bike horn
-  components:
-  - type: Mail
-    contents:
-    - id: BikeHorn
-
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailBlockGameDIY
-  suffix: blockgamediy
-  components:
-  - type: Mail
-    contents:
-    - id: BlockGameArcadeComputerCircuitboard
-
-#- type: entity
-#  noSpawn: true
-#  parent: BaseMail
-#  id: MailBooks
-#  suffix: books
-#  components:
-#  - type: Mail
-#    contents:
-#      # Don't use BookDemonomiconRandom.
-#      # It uses a RandomSpawner which just spawns the book outside of the mail.
-#    - id: BookDemonomicon1
-#      orGroup: Demonomicon
-#    - id: BookDemonomicon2
-#      orGroup: Demonomicon
-#    - id: BookDemonomicon3
-#      orGroup: Demonomicon
-#      # There's no way to signal "spawn nothing" with an orGroup,
-#      # so have this blank book instead. Write your own demon summoning tome!
-#    - id: BookRandom
-#      prob: 3
-#      orGroup: Demonomicon
-#    - id: BookChemistryInsane
-#      prob: 0.10
-#    - id: BookBotanicalTextbook
-#      prob: 0.5
-#    - id: BookFishing
-#      prob: 0.10
-#    - id: BookDetective
-#      prob: 0.10
-#    - id: BookGnominomicon
-#      prob: 0.2
-#    - id: BookFishops # DeltaV - fishops book
-#      prob: 0.2
-#    - id: BookSalvageEpistemics1
-#      prob: 0.025
-
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailCake
-  suffix: cake
-  components:
-  - type: Mail
-    isFragile: true
-    isPriority: true
-    contents:
-    - id: FoodCakeBlueberry
-      orGroup: Cake
-    - id: FoodCakeCarrot
-      orGroup: Cake
-    - id: FoodCakeCheese
-      orGroup: Cake
-    - id: FoodCakeChocolate
-      orGroup: Cake
-    - id: FoodCakeChristmas
-      orGroup: Cake
-    - id: FoodCakeClown
-      orGroup: Cake
-    - id: FoodCakeLemon
-      orGroup: Cake
-    - id: FoodCakeLime
-      orGroup: Cake
-    - id: FoodCakeOrange
-      orGroup: Cake
-    - id: FoodCakePumpkin
-      orGroup: Cake
-    - id: FoodCakeVanilla
-      orGroup: Cake
-    - id: FoodMothMothmallow
-      orGroup: Cake
-      prob: 0.5
-    - id: KnifePlastic
-    - id: ForkPlastic
-      amount: 2
-
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailCallForHelp
-  suffix: call-for-help
-  components:
-  - type: Mail
-    contents:
-    - id: PaperMailCallForHelp1
-      orGroup: Paper
-    - id: PaperMailCallForHelp2
-      orGroup: Paper
-    - id: PaperMailCallForHelp3
-      orGroup: Paper
-    - id: PaperMailCallForHelp4
-      orGroup: Paper
-    - id: PaperMailCallForHelp5
-      orGroup: Paper
-    - id: FlashlightLantern
-      orGroup: Gift
-    - id: Crowbar
-      orGroup: Gift
-      prob: 0.5
-    - id: CrowbarRed
-      orGroup: Gift
-      prob: 0.5
-    - id: ClothingMaskGas
-      orGroup: Gift
-    - id: WeaponFlareGun
-      orGroup: Gift
-      prob: 0.25
-
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailCheese
-  suffix: cheese
-  components:
-  - type: Mail
-    isFragile: true
-    isPriority: true
-    contents:
-    - id: FoodCheese
-    - id: KnifePlastic
-
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailChocolate
-  suffix: chocolate
-  components:
-  - type: Mail
-    contents:
-    # TODO make some actual chocolate candy items.
-    - id: FoodSnackChocolate
-      amount: 3
-
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailCigarettes
-  suffix: cigs
-  components:
-  - type: Mail
-    contents:
-    - id: CigPackRed
-    - id: CheapLighter
-
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailCigars
-  suffix: Cigars
-  components:
-  - type: Mail
-    contents:
-    - id: CigarCase
-    - id: Lighter
-
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailCookies
-  suffix: cookies
-  components:
-  - type: Mail
-    # What, you want to eat stale cookies?
-    isPriority: true
-    contents:
-    - id: FoodBakedCookie
-    - id: FoodBakedCookieOatmeal
-    - id: FoodBakedCookieRaisin
-    - id: FoodBakedCookieSugar
-
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailCosplayArc
-  suffix: cosplay-arc
-  components:
-  - type: Mail
-    openSound: /Audio/Nyanotrasen/Voice/Felinid/cat_wilhelm.ogg
-    contents:
-    - id: ClothingCostumeArcDress
-
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailCosplayGeisha
-  suffix: cosplay-geisha
-  components:
-  - type: Mail
-    contents:
-      - id: UniformGeisha
-      - id: DrinkTeapot
-      - id: DrinkTeacup
-        amount: 3
-
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailCosplayMaid
-  suffix: cosplay-maid
-  components:
-  - type: Mail
-    contents:
-      - id: UniformMaid
-      - id: SprayBottleSpaceCleaner
-
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailCosplayNurse
-  suffix: cosplay-nurse
-  components:
-  - type: Mail
-    contents:
-      - id: ClothingUniformJumpskirtNurse
-      - id: Syringe
-
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailCosplaySchoolgirl
-  suffix: cosplay-schoolgirl
-  components:
-  - type: Mail
-    contents:
-    - id: UniformSchoolgirlBlack
-      orGroup: Color
-    - id: UniformSchoolgirlBlue
-      orGroup: Color
-    - id: UniformSchoolgirlCyan
-      orGroup: Color
-    - id: UniformSchoolgirlGreen
-      orGroup: Color
-    - id: UniformSchoolgirlOrange
-      orGroup: Color
-    - id: UniformSchoolgirlPink
-      orGroup: Color
-    - id: UniformSchoolgirlPurple
-      orGroup: Color
-    - id: UniformSchoolgirlRed
-      orGroup: Color
-
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailCosplayWizard
-  suffix: cosplay-wizard
-  components:
-  - type: Mail
-    contents:
-    - id: ClothingOuterWizardFake
-    - id: ClothingHeadHatWizardFake
-    - id: ClothingShoesWizardFake
-
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailCrayon
-  suffix: Crayon
-  components:
-  - type: Mail
-    contents:
-    - id: CrayonBox
-
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailFigurine
-  suffix: figurine
-  components:
-  - type: Mail
-    isFragile: true
-    contents:
-    - id: ToyAi
-      orGroup: Toy
-    - id: ToyNuke
-      orGroup: Toy
-    - id: ToyFigurinePassenger
-      orGroup: Toy
-    - id: ToyGriffin
-      orGroup: Toy
-    - id: ToyHonk
-      orGroup: Toy
-    - id: ToyIan
-      orGroup: Toy
-    - id: ToyMarauder
-      orGroup: Toy
-    - id: ToyMauler
-      orGroup: Toy
-    - id: ToyGygax
-      orGroup: Toy
-    - id: ToyOdysseus
-      orGroup: Toy
-    - id: ToyOwlman
-      orGroup: Toy
-    - id: ToyDeathRipley
-      orGroup: Toy
-    - id: ToyPhazon
-      orGroup: Toy
-    - id: ToyFireRipley
-      orGroup: Toy
-    - id: ToyReticence
-      orGroup: Toy
-    - id: ToyRipley
-      orGroup: Toy
-    - id: ToySeraph
-      orGroup: Toy
-    - id: ToyDurand
-      orGroup: Toy
-
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailFishingCap
-  suffix: fishingcap
-  components:
-  - type: Mail
-    contents:
-    - id: ClothingHeadFishCap
-
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailFlashlight
-  suffix: Flashlight
-  components:
-  - type: Mail
-    contents:
-    - id: FlashlightLantern
-
-#- type: entity
-#  noSpawn: true
-#  parent: BaseMail
-#  id: MailFlowers
-#  suffix: flowers
-#  components:
-#  - type: Mail
-#    contents:
-#    # TODO actual flowers
-#    - id: ClothingHeadHatFlowerCrown
-#      orGroup: Flower
-#    - id: ClothingHeadHatHairflower
-#      orGroup: Flower
-
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailHighlander
-  suffix: highlander
-  components:
-  - type: Mail
-    contents:
-    - id: ClothingUniformJumpskirtColorRed
-    - id: ClothingHeadHatBeret
-    - id: DrinkRedMeadGlass
-    - id: Claymore
-
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailHighlanderDulled
-  suffix: highlander, dulled
-  components:
-  - type: Mail
-    contents:
-    - id: ClothingUniformJumpskirtColorRed
-    - id: ClothingHeadHatBeret
-    - id: DrinkGlass
-    - id: ClaymoreDulled
-
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailHoneyBuns
-  suffix: honeybuns
-  components:
-  - type: Mail
-    contents:
-    - id: FoodBakedBunHoney
-      amount: 2
-
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailJunkFood
-  suffix: junk food
-  components:
-  - type: Mail
-    contents:
-    - id: FoodBoxDonkpocket
-    - id: FoodSnackChips
-
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailKatana
-  suffix: Katana
-  components:
-  - type: Mail
-    contents:
-    - id: Katana
-      prob: 0.1
-      orGroup: Katana
-    - id: KatanaDulled
-      prob: 0.9
-      orGroup: Katana
-
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailKnife
-  suffix: Knife
-  components:
-  - type: Mail
-    contents:
-    - id: CombatKnife
-
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailMoney
-  suffix: money
-  components:
-  - type: Mail
-    contents:
-    - id: SpaceCash100
-      orGroup: Cash
-      prob: 0.3
-    - id: SpaceCash500
-      orGroup: Cash
-      prob: 0.6
-    - id: SpaceCash1000
-      orGroup: Cash
-      prob: 0.3
-
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailMuffins
-  suffix: muffins
-  components:
-  - type: Mail
-    isPriority: true
-    contents:
-    - id: FoodBakedMuffinBerry
-    - id: FoodBakedMuffinCherry
-    - id: FoodBakedMuffinBluecherry
-
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailMoffins
-  suffix: moffins
-  components:
-  - type: Mail
-    isPriority: true
-    contents:
-    - id: FoodMothMoffin
-      amount: 3
-
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailNoir
-  suffix: noir
-  components:
-  - type: Mail
-    contents:
-    - id: ClothingUniformJumpsuitDetectiveGrey
-    - id: ClothingUniformJumpskirtDetectiveGrey
-    - id: ClothingHeadHatBowlerHat
-    - id: ClothingOuterCoatGentle
-
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailPAI
-  suffix: PAI
-  components:
-  - type: Mail
-    contents:
-    - id: PersonalAI
-
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailPlushie
-  suffix: plushie
-  components:
-  - type: Mail
-    contents:
-    - id: PlushieMothRandom
-      orGroup: Prize
-    - id: PlushieMothMusician
-      orGroup: Prize
-    - id: PlushieMothBartender
-      orGroup: Prize
-    - id: PlushieBee
-      orGroup: Prize
-    - id: PlushieHampter
-      orGroup: Prize
-    - id: PlushieRouny
-      orGroup: Prize
-    - id: PlushieLamp
-      orGroup: Prize
-    - id: PlushieArachind
-      orGroup: Prize
-    - id: PlushieLizard
-      orGroup: Prize
-    - id: PlushieLizardMirrored
-      orGroup: Prize
-    - id: PlushieSpaceLizard
-      orGroup: Prize
-    - id: PlushieDiona
-      orGroup: Prize
-    - id: PlushieSharkBlue
-      orGroup: Prize
-    - id: PlushieSharkPink
-      orGroup: Prize
-    - id: PlushieSharkGrey
-      orGroup: Prize
-    - id: PlushieCarp
-      orGroup: Prize
-    - id: PlushieMagicarp
-      orGroup: Prize
-    - id: PlushieHolocarp
-      orGroup: Prize
-    - id: PlushieSlime
-      orGroup: Prize
-    - id: PlushieSnake
-      orGroup: Prize
-    - id: PlushieVox
-      orGroup: Prize
-    - id: PlushieAtmosian
-      orGroup: Prize
-    - id: PlushiePenguin
-      orGroup: Prize
-    - id: PlushieHuman
-      orGroup: Prize
-    - id: PlushieArachne
-      orGroup: Prize
-    - id: PlushieGnome
-      orGroup: Prize
-    - id: PlushieLoveable
-      orGroup: Prize
-    - id: PlushieDeer
-      orGroup: Prize
-    - id: PlushieIpc
-      orGroup: Prize
-    - id: PlushieGrey
-      orGroup: Prize
-    - id: PlushieRedFox
-      orGroup: Prize
-    - id: PlushiePurpleFox
-      orGroup: Prize
-    - id: PlushiePinkFox
-      orGroup: Prize
-    - id: PlushieOrangeFox
-      orGroup: Prize
-    - id: PlushieMarbleFox
-      orGroup: Prize
-    - id: PlushieCrimsonFox
-      orGroup: Prize
-    - id: PlushieCoffeeFox
-      orGroup: Prize
-    - id: PlushieBlueFox
-      orGroup: Prize
-    - id: PlushieBlackFox
-      orGroup: Prize
-    - id: PlushieVulp
-      orGroup: Prize
-    - id: PlushieCorgi
-      orGroup: Prize
-    - id: PlushieGirlyCorgi
-      orGroup: Prize
-    - id: PlushieRobotCorgi
-      orGroup: Prize
-    - id: PlushieCatBlack
-      orGroup: Prize
-    - id: PlushieCatGrey
-      orGroup: Prize
-    - id: PlushieCatOrange
-      orGroup: Prize
-    - id: PlushieCatSiames
-      orGroup: Prize
-    - id: PlushieCatTabby
-      orGroup: Prize
-    - id: PlushieCatTuxedo
-      orGroup: Prize
-    - id: PlushieCatWhite
-      orGroup: Prize
-    - id: PlushieGhost
-      orGroup: Prize
-    - id: PlushieRGBee
-      orGroup: Prize
-    - id: PlushieRatvar
-      orGroup: Prize
-    - id: PlushieNar
-      orGroup: Prize
-    - id: PlushieRainbowCarp
-      orGroup: Prize
-    - id: PlushieXeno
-      orGroup: Prize
-    - id: PlushieJester
-      orGroup: Prize
-    - id: PlushieSlips
-      orGroup: Prize
-    - id: PlushieAbductor
-      orGroup: Prize
-    - id: PlushieTrystan
-      orGroup: Prize
-    - id: PlushieAbductorAgent
-      orGroup: Prize
-    - id: PlushieNuke
-      orGroup: Prize
-
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailRestraints
-  suffix: restraints
-  components:
-  - type: Mail
-    contents:
-    - id: Handcuffs
-    - id: ClothingMaskMuzzle
-    - id: ClothingEyesBlindfold
-
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailSignallerKit
-  suffix: signallerkit
-  components:
-  - type: Mail
-    contents:
-    - id: Multitool
-    - id: RemoteSignaller
-
-# - type: entity
-#   noSpawn: true
-#   parent: BaseMail
-#   id: MailSixPack
-#   suffix: sixpack
-#   components:
-#   - type: Mail
-#     contents:
-#     - id: DrinkCanPack
-
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailSkub
-  suffix: skub
-  components:
-  - type: Mail
-    contents:
-    - id: Skub
-
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailSoda
-  suffix: soda
-  components:
-  - type: Mail
-    contents:
-    - id: DrinkColaBottleFull
-      orGroup: Soda
-    - id: DrinkSpaceMountainWindBottleFull
-      orGroup: Soda
-    - id: DrinkSpaceUpBottleFull
-      orGroup: Soda
-
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailSpaceVillainDIY
-  suffix: spacevilliandiy
-  components:
-  - type: Mail
-    contents:
-    - id: SpaceVillainArcadeComputerCircuitboard
-
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailSunglasses
-  suffix: Sunglasses
-  components:
-  - type: Mail
-    contents:
-    - id: ClothingEyesGlassesSunglasses
-
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailVagueThreat
-  suffix: vague-threat
-  components:
-  - type: Mail
-    contents:
-    - id: PaperMailVagueThreat1
-      orGroup: Paper
-    - id: PaperMailVagueThreat2
-      orGroup: Paper
-    - id: PaperMailVagueThreat3
-      orGroup: Paper
-    - id: PaperMailVagueThreat4
-      orGroup: Paper
-    - id: PaperMailVagueThreat5
-      orGroup: Paper
-    - id: PaperMailVagueThreat6
-      orGroup: Paper
-    - id: PaperMailVagueThreat7
-      orGroup: Paper
-    - id: PaperMailVagueThreat8
-      orGroup: Paper
-    - id: PaperMailVagueThreat9
-      orGroup: Paper
-    - id: PaperMailVagueThreat10
-      orGroup: Paper
-    - id: PaperMailVagueThreat11
-      orGroup: Paper
-    - id: PaperMailVagueThreat12
-      orGroup: Paper
-    - id: KitchenKnife
-      orGroup: ThreateningObject
-    - id: ButchCleaver
-      orGroup: ThreateningObject
-    - id: CombatKnife
-      orGroup: ThreateningObject
-    - id: SurvivalKnife
-      orGroup: ThreateningObject
-    - id: SoapHomemade
-      orGroup: ThreateningObject
-    - id: FoodMeat
-      orGroup: ThreateningObject
-    - id: OrganHumanHeart
-      orGroup: ThreateningObject
-
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailWinterCoat
-  suffix: wintercoat
-  components:
-  - type: Mail
-    contents:
-    - id: ClothingOuterWinterCoat
-      orGroup: Coat
-    - id: ClothingOuterWinterCoatLong
-      orGroup: Coat
-    - id: ClothingOuterWinterCoatPlaid
-      orGroup: Coat
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_command.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_command.yml
deleted file mode 100644
index 7e2a935f908..00000000000
--- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_command.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailCommandPinpointerNuclear
-  suffix: pinpointernuclear
-  components:
-  - type: Mail
-    contents:
-    - id: PinpointerNuclear
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_engineering.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_engineering.yml
deleted file mode 100644
index 461d9bf1365..00000000000
--- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_engineering.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailEngineeringCables
-  suffix: cables
-  components:
-  - type: Mail
-    contents:
-    - id: CableHVStack
-      orGroup: Cables
-    - id: CableMVStack
-      orGroup: Cables
-    - id: CableApcStack
-      orGroup: Cables
-
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailEngineeringKudzuDeterrent
-  suffix: antikudzu
-  components:
-  - type: Mail
-    contents:
-    - id: PlantBGoneSpray
-
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailEngineeringSheetGlass
-  suffix: sheetglass
-  components:
-  - type: Mail
-    contents:
-    - id: SheetGlass
-
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailEngineeringWelderReplacement
-  suffix: welder
-  components:
-  - type: Mail
-    contents:
-    - id: Welder
-
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_specific_items.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_specific_items.yml
deleted file mode 100644
index b4d2b547798..00000000000
--- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_specific_items.yml
+++ /dev/null
@@ -1,169 +0,0 @@
-- type: entity
-  id: PaperMailCallForHelp1
-  noSpawn: true
-  suffix: "call for help 1"
-  parent: Paper
-  components:
-  - type: Paper
-    content: |
-      Help! They're coming! Take this!
-
-- type: entity
-  id: PaperMailCallForHelp2
-  noSpawn: true
-  suffix: "call for help 2"
-  parent: Paper
-  components:
-  - type: Paper
-    content: |
-      Check disposals!
-
-- type: entity
-  id: PaperMailCallForHelp3
-  noSpawn: true
-  suffix: "call for help 3"
-  parent: Paper
-  components:
-  - type: Paper
-    content: |
-      GET ME OUT!
-
-- type: entity
-  id: PaperMailCallForHelp4
-  noSpawn: true
-  suffix: "call for help 4"
-  parent: Paper
-  components:
-  - type: Paper
-    content: |
-      Check maintenance!
-
-- type: entity
-  id: PaperMailCallForHelp5
-  noSpawn: true
-  suffix: "call for help 5"
-  parent: Paper
-  components:
-  - type: Paper
-    content: |
-      Save me, please!
-
-- type: entity
-  id: PaperMailVagueThreat1
-  noSpawn: true
-  suffix: "vague mail threat 1"
-  parent: Paper
-  components:
-  - type: Paper
-    content: |
-      I know what you did. You don't know what I'm going to do to you.
-
-- type: entity
-  id: PaperMailVagueThreat2
-  noSpawn: true
-  suffix: "vague mail threat 2"
-  parent: Paper
-  components:
-  - type: Paper
-    content: |
-      I'm coming for you.
-
-- type: entity
-  id: PaperMailVagueThreat3
-  noSpawn: true
-  suffix: "vague mail threat 3"
-  parent: Paper
-  components:
-  - type: Paper
-    content: |
-      You're next.
-
-- type: entity
-  id: PaperMailVagueThreat4
-  noSpawn: true
-  suffix: "vague mail threat 4"
-  parent: Paper
-  components:
-  - type: Paper
-    content: |
-      We see you.
-
-- type: entity
-  id: PaperMailVagueThreat5
-  noSpawn: true
-  suffix: "vague mail threat 5"
-  parent: Paper
-  components:
-  - type: Paper
-    content: |
-      I hope your affairs are in order.
-
-- type: entity
-  id: PaperMailVagueThreat6
-  noSpawn: true
-  suffix: "vague mail threat 6"
-  parent: Paper
-  components:
-  - type: Paper
-    content: |
-      It's only a matter of time. Enjoy it while it lasts.
-
-- type: entity
-  id: PaperMailVagueThreat7
-  noSpawn: true
-  suffix: "vague mail threat 7"
-  parent: Paper
-  components:
-  - type: Paper
-    content: |
-      Who should we mail your pieces to?
-
-- type: entity
-  id: PaperMailVagueThreat8
-  noSpawn: true
-  suffix: "vague mail threat 8"
-  parent: Paper
-  components:
-  - type: Paper
-    content: |
-      Do you prefer to die slowly or quickly? Just kidding. We don't care what you think.
-
-- type: entity
-  id: PaperMailVagueThreat9
-  noSpawn: true
-  suffix: "vague mail threat 9"
-  parent: Paper
-  components:
-  - type: Paper
-    content: |
-      I think your head would look nice on my mantel.
-
-- type: entity
-  id: PaperMailVagueThreat10
-  noSpawn: true
-  suffix: "vague mail threat 10"
-  parent: Paper
-  components:
-  - type: Paper
-    content: |
-      You should have paid up. It's too late now.
-
-- type: entity
-  id: PaperMailVagueThreat11
-  noSpawn: true
-  suffix: "vague mail threat 11"
-  parent: Paper
-  components:
-  - type: Paper
-    content: |
-      Your family will miss you, but don't worry. We'll take care of them too.
-
-- type: entity
-  id: PaperMailVagueThreat12
-  noSpawn: true
-  suffix: "vague mail threat 12"
-  parent: Paper
-  components:
-  - type: Paper
-    content: |
-      I have a bet that you're going to die today. I'm not afraid of cheating.
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Research/crystals.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Research/crystals.yml
index b4d3ca1abff..3f6539c5027 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Research/crystals.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Research/crystals.yml
@@ -34,3 +34,60 @@
 #           Quantity: 50
 #   - type: Extractable
 #     grindableSolutionName: ectoplasm
+
+- type: entity
+  parent: MaterialBase
+  id: MaterialNormality
+  suffix: Full
+  name: normality crystal
+  components:
+  - type: Sprite
+    sprite: Nyanotrasen/Objects/Materials/materials.rsi
+    layers:
+    - state: bluespace_3
+      map: ["base"]
+  - type: Appearance
+  - type: Material
+  - type: PhysicalComposition
+    materialComposition:
+      Bluespace: 100
+  - type: Tag
+    tags:
+    - NormalityCrystal
+    - RawMaterial
+  - type: Stack
+    stackType: Normality
+    baseLayer: base
+    layerStates:
+    - bluespace
+    - bluespace_2
+    - bluespace_3
+    count: 5
+  - type: Item
+    size: Small
+
+- type: entity
+  parent: MaterialNormality
+  id: MaterialNormality1
+  suffix: 1
+  components:
+  - type: Sprite
+    state: bluespace
+  - type: Stack
+    count: 1
+
+- type: entity
+  parent: MaterialNormality1
+  id: MaterialNormality3
+  suffix: 3
+  components:
+  - type: Stack
+    count: 3
+
+- type: entity
+  parent: MaterialNormality1
+  id: MaterialNormality5
+  suffix: 5
+  components:
+  - type: Stack
+    count: 5
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Stations/mail.yml b/Resources/Prototypes/Nyanotrasen/Entities/Stations/mail.yml
index ceb87bbaa1b..b85cfef87ab 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Stations/mail.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Stations/mail.yml
@@ -3,3 +3,4 @@
   abstract: true
   components:
     - type: StationMailRouter
+    - type: StationLogisticStats # DeltaV - Tracks statistics related to mail and income
diff --git a/Resources/Prototypes/Nyanotrasen/Reagents/Materials/materials.yml b/Resources/Prototypes/Nyanotrasen/Reagents/Materials/materials.yml
deleted file mode 100644
index 9146f297132..00000000000
--- a/Resources/Prototypes/Nyanotrasen/Reagents/Materials/materials.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-- type: material
-  id: Bluespace
-  name: bluespace
-  unit: materials-unit-crystal
-  icon: /Textures/Nyanotrasen/Objects/Materials/materials.rsi/bluespace.png
-  color: "#53a9ff"
-  stackEntity: MaterialBluespace
-  price: 15
diff --git a/Resources/Prototypes/Nyanotrasen/Recipes/Construction/Graphs/structures/glimmerdevices.yml b/Resources/Prototypes/Nyanotrasen/Recipes/Construction/Graphs/structures/glimmerdevices.yml
index 2d6a1c8ee5f..011c9748c05 100644
--- a/Resources/Prototypes/Nyanotrasen/Recipes/Construction/Graphs/structures/glimmerdevices.yml
+++ b/Resources/Prototypes/Nyanotrasen/Recipes/Construction/Graphs/structures/glimmerdevices.yml
@@ -30,18 +30,9 @@
           conditions:
             - !type:EntityAnchored {}
           steps:
-            - tag: NormalityCrystal
-              icon:
-                sprite: Nyanotrasen/Objects/Materials/materials.rsi
-                state: bluespace
-              name: a normality crystal
-              doAfter: 1
-            - tag: NormalityCrystal
-              icon:
-                sprite: Nyanotrasen/Objects/Materials/materials.rsi
-                state: bluespace
-              name: a normality crystal
-              doAfter: 1
+            - material: Normality
+              amount: 1
+              doAfter: 10
             - tool: Welding
               doAfter: 5
 
diff --git a/Resources/Prototypes/Nyanotrasen/Recipes/Lathes/bluespace.yml b/Resources/Prototypes/Nyanotrasen/Recipes/Lathes/bluespace.yml
index 443f2a03f93..094e4f557cf 100644
--- a/Resources/Prototypes/Nyanotrasen/Recipes/Lathes/bluespace.yml
+++ b/Resources/Prototypes/Nyanotrasen/Recipes/Lathes/bluespace.yml
@@ -20,3 +20,14 @@
   completetime: 4
   materials:
     Bluespace: 100
+
+- type: latheRecipe
+  id: NormalityCrystal
+  icon:
+    sprite: Nyanotrasen/Objects/Materials/materials.rsi
+    state: bluespace
+  result: MaterialNormality1
+  applyMaterialDiscount: false
+  completetime: 4
+  materials:
+    Normality: 100
diff --git a/Resources/Prototypes/Nyanotrasen/Stacks/materials.yml b/Resources/Prototypes/Nyanotrasen/Stacks/materials.yml
index e8c1b98b93a..35f50575a5f 100644
--- a/Resources/Prototypes/Nyanotrasen/Stacks/materials.yml
+++ b/Resources/Prototypes/Nyanotrasen/Stacks/materials.yml
@@ -2,6 +2,28 @@
   id: Bluespace
   name: bluespace
   icon: { sprite: Nyanotrasen/Objects/Materials/materials.rsi, state: bluespace }
-  spawn: MaterialBluespace
+  spawn: MaterialBluespace1
   maxCount: 5
   itemSize: 1
+
+- type: stack
+  id: BluespaceOre
+  name: rough bluespace
+  icon: { sprite: Objects/Materials/ore.rsi, state: bluespace }
+  spawn: BluespaceOre1
+  maxCount: 30
+
+- type: stack
+  id: Normality
+  name: normality
+  icon: { sprite: Nyanotrasen/Objects/Materials/materials.rsi, state: bluespace }
+  spawn: MaterialNormality1
+  maxCount: 5
+  itemSize: 1
+
+- type: stack
+  id: NormalityOre
+  name: rough normality
+  icon: { sprite: Objects/Materials/ore.rsi, state: bluespace }
+  spawn: NormalityOre1
+  maxCount: 30
\ No newline at end of file
diff --git a/Resources/Prototypes/Procedural/Magnet/asteroid.yml b/Resources/Prototypes/Procedural/Magnet/asteroid.yml
index a21b709afad..8fcd265297d 100644
--- a/Resources/Prototypes/Procedural/Magnet/asteroid.yml
+++ b/Resources/Prototypes/Procedural/Magnet/asteroid.yml
@@ -10,6 +10,8 @@
     OrePlasma: 0.15
     OreUranium: 0.15
     OreArtifactFragment: 0.15
+    OreBluespace: 0.1
+    OreNormality: 0.1
 
 # Large asteroids, typically 1
 - type: dungeonConfig
diff --git a/Resources/Prototypes/Procedural/biome_ore_templates.yml b/Resources/Prototypes/Procedural/biome_ore_templates.yml
index 4a60427e305..c0001367d5c 100644
--- a/Resources/Prototypes/Procedural/biome_ore_templates.yml
+++ b/Resources/Prototypes/Procedural/biome_ore_templates.yml
@@ -144,3 +144,32 @@
   minGroupSize: 1
   maxGroupSize: 2
   radius: 4
+
+# Bluespace
+- type: biomeMarkerLayer
+  id: OreBluespace
+  entityMask:
+    AsteroidRock: AsteroidRockBluespace
+    WallRock: WallRockBluespace
+    WallRockBasalt: WallRockBasaltBluespace
+    WallRockChromite: WallRockChromiteBluespace
+    WallRockSand: WallRockSandBluespace
+    WallRockSnow: WallRockSnowBluespace
+  maxCount: 6
+  minGroupSize: 1
+  maxGroupSize: 2
+  radius: 4
+
+- type: biomeMarkerLayer
+  id: OreNormality
+  entityMask:
+    AsteroidRock: AsteroidRockNormality
+    WallRock: WallRockNormality
+    WallRockBasalt: WallRockBasaltNormality
+    WallRockChromite: WallRockChromiteNormality
+    WallRockSand: WallRockSandNormality
+    WallRockSnow: WallRockSnowNormality
+  maxCount: 6
+  minGroupSize: 1
+  maxGroupSize: 2
+  radius: 4
diff --git a/Resources/Prototypes/Procedural/salvage_loot.yml b/Resources/Prototypes/Procedural/salvage_loot.yml
index f12e8c7ffda..b256c73dfd9 100644
--- a/Resources/Prototypes/Procedural/salvage_loot.yml
+++ b/Resources/Prototypes/Procedural/salvage_loot.yml
@@ -185,3 +185,17 @@
   loots:
     - !type:BiomeMarkerLoot
       proto: OreArtifactFragment
+
+- type: salvageLoot
+  id: OreBluespace
+  guaranteed: true
+  loots:
+    - !type:BiomeMarkerLoot
+      proto: OreBluespace
+
+- type: salvageLoot
+  id: OreNormality
+  guaranteed: true
+  loots:
+    - !type:BiomeMarkerLoot
+      proto: OreNormality
diff --git a/Resources/Prototypes/Reagents/Materials/ores.yml b/Resources/Prototypes/Reagents/Materials/ores.yml
index 18f1d9ebb3a..efba840639a 100644
--- a/Resources/Prototypes/Reagents/Materials/ores.yml
+++ b/Resources/Prototypes/Reagents/Materials/ores.yml
@@ -67,4 +67,22 @@
   unit: materials-unit-chunk
   icon: { sprite: Objects/Materials/ore.rsi, state: salt }
   color: "#f5e7d7"
-  price: 0.075
\ No newline at end of file
+  price: 0.075
+
+- type: material
+  id: Bluespace
+  stackEntity: BluespaceOre1
+  name: materials-raw-bluespace
+  unit: materials-unit-piece
+  icon: { sprite: Nyanotrasen/Objects/Materials/materials.rsi, state: bluespace } # TODO actual ore sprite
+  color: "#53a9ff"
+  price: 7.5
+
+- type: material
+  id: Normality
+  stackEntity: NormalityOre1
+  name: materials-raw-normality
+  unit: materials-unit-piece
+  icon: { sprite: Nyanotrasen/Objects/Materials/materials.rsi, state: bluespace } # TODO actual ore sprite
+  color: "#53a9ff"
+  price: 7.5
diff --git a/Resources/Prototypes/Recipes/Lathes/misc.yml b/Resources/Prototypes/Recipes/Lathes/misc.yml
index 81ccb3d3519..a941fc81e00 100644
--- a/Resources/Prototypes/Recipes/Lathes/misc.yml
+++ b/Resources/Prototypes/Recipes/Lathes/misc.yml
@@ -208,3 +208,19 @@
   materials:
     Steel: 400
     Glass: 200
+
+- type: latheRecipe
+  id: ClothingShoesBootsMagAdv
+  result: ClothingShoesBootsMagAdv
+  completetime: 12
+  materials:
+    Silver: 1000
+    Gold: 500
+
+- type: latheRecipe
+  id: MailCapsule
+  result: MailCapsulePrimed
+  completetime: 1
+  materials:
+    Glass: 100
+    Plastic: 100
diff --git a/Resources/Prototypes/Traits/physical.yml b/Resources/Prototypes/Traits/physical.yml
index 8f34cf084c2..eb60e352b7e 100644
--- a/Resources/Prototypes/Traits/physical.yml
+++ b/Resources/Prototypes/Traits/physical.yml
@@ -356,6 +356,10 @@
   category: Physical
   points: -4
   requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Prisoner # Bionics should be "Confiscated" from long term prisoners.
     - !type:CharacterSpeciesRequirement
       species:
         - Human # Entirely arbitrary, I've decided I want a trait unique to humans. Since they don't normally get anything exciting.
@@ -390,6 +394,10 @@
   category: Physical
   points: -4
   requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Prisoner # Bionics should be "Confiscated" from long term prisoners.
     - !type:CharacterSpeciesRequirement
       inverted: true
       species:
@@ -402,3 +410,183 @@
       productionLength: 2
       entityProduced: MaterialWebSilk1
       hungerCost: 4
+
+- type: trait
+  id: BionicArm
+  category: Physical
+  points: -9
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Prisoner # Bionics should be "Confiscated" from long term prisoners.
+  components:
+    - type: Prying
+      speedModifier: 1
+      pryPowered: true
+      force: true
+
+- type: trait
+  id: PlateletFactories
+  category: Physical
+  points: -10
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Prisoner # Bionics should be "Confiscated" from long term prisoners.
+    - !type:CharacterSpeciesRequirement
+      inverted: true
+      species:
+        - IPC
+  componentRemovals:
+    - PassiveDamage
+  components:
+    - type: PassiveDamage
+      allowedStates:
+      - Alive
+      - Critical
+      damageCap: 200
+      damage:
+        groups:
+          Brute: -0.07
+          Burn: -0.07
+          Airloss: -0.07
+          Toxin: -0.07
+          Genetic: -0.07
+
+- type: trait
+  id: DermalArmor
+  category: Physical
+  points: -9
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Prisoner # Bionics should be "Confiscated" from long term prisoners.
+    - !type:CharacterSpeciesRequirement
+      species:
+        - Human
+  componentRemovals:
+    - Damageable
+  components:
+    - type: Damageable
+      damageModifierSet: DermalArmor
+
+- type: trait
+  id: CyberEyes
+  category: Physical
+  points: -8
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Prisoner # Bionics should be "Confiscated" from long term prisoners.
+    - !type:CharacterTraitRequirement
+      inverted: true
+      traits:
+        - Photophobia
+        - Blindness
+        - Nearsighted
+  componentRemovals:
+    - Flashable
+  components:
+    - type: FlashImmunity
+    - type: EyeProtection
+    - type: CyberEyes
+
+- type: trait
+  id: CyberEyesSecurity
+  category: Physical
+  points: -1
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Prisoner # Bionics should be "Confiscated" from long term prisoners.
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Security
+    - !type:CharacterTraitRequirement
+      traits:
+        - CyberEyes
+    - !type:CharacterTraitRequirement
+      inverted: true
+      traits:
+        - CyberEyesOmni
+  components:
+  - type: ShowSecurityIcons
+
+- type: trait
+  id: CyberEyesMedical
+  category: Physical
+  points: -1
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Prisoner # Bionics should be "Confiscated" from long term prisoners.
+    - !type:CharacterTraitRequirement
+      traits:
+        - CyberEyes
+    - !type:CharacterTraitRequirement
+      inverted: true
+      traits:
+        - CyberEyesDiagnostic
+        - CyberEyesOmni
+  components:
+  - type: ShowHealthBars
+    damageContainers:
+    - Biological
+
+- type: trait
+  id: CyberEyesDiagnostic
+  category: Physical
+  points: -1
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Prisoner # Bionics should be "Confiscated" from long term prisoners.
+    - !type:CharacterTraitRequirement
+      traits:
+        - CyberEyes
+    - !type:CharacterTraitRequirement
+      inverted: true
+      traits:
+        - CyberEyesMedical
+        - CyberEyesOmni
+  components:
+    - type: ShowHealthBars
+      damageContainers:
+      - Inorganic
+      - Silicon
+
+- type: trait
+  id: CyberEyesOmni
+  category: Physical
+  points: -3
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Prisoner # Bionics should be "Confiscated" from long term prisoners.
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Security
+    - !type:CharacterTraitRequirement
+      traits:
+        - CyberEyes
+    - !type:CharacterTraitRequirement
+      inverted: true
+      traits:
+        - CyberEyesMedical
+        - CyberEyesDiagnostic
+        - CyberEyesSecurity
+  components:
+    - type: ShowSecurityIcons
+    - type: ShowHealthBars
+      damageContainers:
+      - Biological
+      - Inorganic
+      - Silicon
diff --git a/Resources/Prototypes/ore.yml b/Resources/Prototypes/ore.yml
index 6ba654fa806..5de32b35f7e 100644
--- a/Resources/Prototypes/ore.yml
+++ b/Resources/Prototypes/ore.yml
@@ -84,6 +84,18 @@
   minOreYield: 2
   maxOreYield: 4
 
+- type: ore
+  id: OreBluespace
+  oreEntity: BluespaceOre1
+  minOreYield: 1
+  maxOreYield: 1
+
+- type: ore
+  id: OreNormality
+  oreEntity: NormalityOre1
+  minOreYield: 1
+  maxOreYield: 1
+
 - type: weightedRandomOre
   id: RandomOreDistributionStandard
   weights:
@@ -96,6 +108,8 @@
     OreUranium: 1
     OreBananium: 0.5
     OreArtifactFragment: 0.5
+    OreBluespace: 0.5
+    OreNormality: 0.3
     LPPOreDiamond: 3
 
 - type: weightedRandomOre
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 6a5791844cd..f8ae06eab2a 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -25,6 +25,9 @@
 - type: Tag
   id: Arrow
 
+- type: Tag
+  id: Ash
+
 - type: Tag
   id: ATVKeys
 
@@ -352,6 +355,9 @@
 - type: Tag
   id: CartridgeRocket
 
+- type: Tag
+  id: CaveFactory
+
 # Allows you to walk over tile entities such as lava without steptrigger
 - type: Tag
   id: Catwalk
@@ -806,6 +812,12 @@
 - type: Tag
   id: MacroBomb
 
+- type: Tag
+  id: Mail
+
+- type: Tag
+  id: MailCapsule
+
 - type: Tag
   id: MimeBelt
 
@@ -919,6 +931,12 @@
 - type: Tag
   id: Multitool
 
+- type: Tag
+  id: Mustard
+
+- type: Tag
+  id: MysteryFigureBox
+
 - type: Tag
   id: NoBlockAnchoring
 
@@ -1298,6 +1316,9 @@
 - type: Tag
   id: WhitelistChameleon
 
+- type: Tag
+  id: WhoopieCushion
+
 - type: Tag
   id: Window
 
diff --git a/Resources/Textures/DeltaV/Objects/Devices/cartridge.rsi/cart-mail.png b/Resources/Textures/DeltaV/Objects/Devices/cartridge.rsi/cart-mail.png
new file mode 100644
index 00000000000..5734abb6fd1
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Devices/cartridge.rsi/cart-mail.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Devices/cartridge.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Devices/cartridge.rsi/meta.json
index 293870d3a3b..4a4ba3352f8 100644
--- a/Resources/Textures/DeltaV/Objects/Devices/cartridge.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Objects/Devices/cartridge.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Timfa",
+    "copyright": "Timfa, plus edits by portfiend",
     "size": {
         "x": 32,
         "y": 32
@@ -9,6 +9,9 @@
     "states": [
         {
             "name": "cart-cri"
+        },
+        {
+            "name": "cart-mail"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/bluespace.png b/Resources/Textures/Objects/Materials/ore.rsi/bluespace.png
new file mode 100644
index 00000000000..8aa4a335526
Binary files /dev/null and b/Resources/Textures/Objects/Materials/ore.rsi/bluespace.png differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/meta.json b/Resources/Textures/Objects/Materials/ore.rsi/meta.json
index 12cc0b8b6be..8c8bbe507db 100644
--- a/Resources/Textures/Objects/Materials/ore.rsi/meta.json
+++ b/Resources/Textures/Objects/Materials/ore.rsi/meta.json
@@ -1,53 +1,56 @@
 {
-  "version": 1,
-  "license": "CC-BY-NC-SA-3.0",
-  "copyright": "silver, plasma taken from https://github.com/vgstation-coders/vgstation13 at commit f2ef221849675915a78fd92fe622c32ab740e085, spacequartz taken from https://github.com/goonstation/goonstation at commit b51daf824df46a3a1426475f982c09479818e522 and reshaded by Alekshhh, bananium; uranium; iron; gold; coal by Alekshhh, diamond at commit https://github.com/tgstation/tgstation/pull/78524, edited by TheShuEd",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "bananium"
-    },
-    {
-      "name": "gold"
-    },
-    {
-      "name": "iron"
-    },
-    {
-      "name": "uranium"
-    },
-    {
-      "name": "plasma"
-    },
-    {
-      "name": "spacequartz"
-    },
-    {
-      "name": "silver"
-    },
-    {
-      "name": "adamantine"
-    },
-    {
-      "name": "copper"
-    },
-    {
-      "name": "ammonia"
-    },
-    {
-      "name": "titanium"
-    },
-    {
-      "name": "coal"
-    },
-    {
-      "name": "salt"
-    },
-    {
-      "name": "diamond"
-    }
-  ]
+    "version": 1,
+    "license": "CC-BY-NC-SA-3.0",
+    "copyright": "silver, plasma taken from https://github.com/vgstation-coders/vgstation13 at commit f2ef221849675915a78fd92fe622c32ab740e085, spacequartz taken from https://github.com/goonstation/goonstation at commit b51daf824df46a3a1426475f982c09479818e522 and reshaded by Alekshhh, bananium; uranium; iron; gold; coal by Alekshhh, diamond at commit https://github.com/tgstation/tgstation/pull/78524, edited by TheShuEd",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "bananium"
+        },
+        {
+            "name": "gold"
+        },
+        {
+            "name": "iron"
+        },
+        {
+            "name": "uranium"
+        },
+        {
+            "name": "plasma"
+        },
+        {
+            "name": "spacequartz"
+        },
+        {
+            "name": "silver"
+        },
+        {
+            "name": "adamantine"
+        },
+        {
+            "name": "copper"
+        },
+        {
+            "name": "ammonia"
+        },
+        {
+            "name": "titanium"
+        },
+        {
+            "name": "coal"
+        },
+        {
+            "name": "salt"
+        },
+        {
+            "name": "diamond"
+        },
+        {
+            "name": "bluespace"
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Misc/mail_capsule.rsi/icon-cash.png b/Resources/Textures/Objects/Misc/mail_capsule.rsi/icon-cash.png
new file mode 100644
index 00000000000..8ba33c95b57
Binary files /dev/null and b/Resources/Textures/Objects/Misc/mail_capsule.rsi/icon-cash.png differ
diff --git a/Resources/Textures/Objects/Misc/mail_capsule.rsi/icon-empty.png b/Resources/Textures/Objects/Misc/mail_capsule.rsi/icon-empty.png
new file mode 100644
index 00000000000..085b787410b
Binary files /dev/null and b/Resources/Textures/Objects/Misc/mail_capsule.rsi/icon-empty.png differ
diff --git a/Resources/Textures/Objects/Misc/mail_capsule.rsi/icon-food.png b/Resources/Textures/Objects/Misc/mail_capsule.rsi/icon-food.png
new file mode 100644
index 00000000000..d08489cec89
Binary files /dev/null and b/Resources/Textures/Objects/Misc/mail_capsule.rsi/icon-food.png differ
diff --git a/Resources/Textures/Objects/Misc/mail_capsule.rsi/icon-mail.png b/Resources/Textures/Objects/Misc/mail_capsule.rsi/icon-mail.png
new file mode 100644
index 00000000000..b35a2acc0f3
Binary files /dev/null and b/Resources/Textures/Objects/Misc/mail_capsule.rsi/icon-mail.png differ
diff --git a/Resources/Textures/Objects/Misc/mail_capsule.rsi/meta.json b/Resources/Textures/Objects/Misc/mail_capsule.rsi/meta.json
new file mode 100644
index 00000000000..2e9bfc36170
--- /dev/null
+++ b/Resources/Textures/Objects/Misc/mail_capsule.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-4.0",
+    "copyright": "Made for Frontier by erhardsteinhauer (discord)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon-empty"
+        },
+        {
+            "name": "icon-mail"
+        },
+        {
+            "name": "icon-food"
+        },
+        {
+            "name": "icon-cash"
+        },
+        {
+            "name": "spent"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Misc/mail_capsule.rsi/spent.png b/Resources/Textures/Objects/Misc/mail_capsule.rsi/spent.png
new file mode 100644
index 00000000000..acd0d0577fc
Binary files /dev/null and b/Resources/Textures/Objects/Misc/mail_capsule.rsi/spent.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Specific/Mail/mail.rsi/broken.png b/Resources/Textures/Objects/Specific/Mail/mail.rsi/broken.png
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Objects/Specific/Mail/mail.rsi/broken.png
rename to Resources/Textures/Objects/Specific/Mail/mail.rsi/broken.png
diff --git a/Resources/Textures/Nyanotrasen/Objects/Specific/Mail/mail.rsi/fragile.png b/Resources/Textures/Objects/Specific/Mail/mail.rsi/fragile.png
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Objects/Specific/Mail/mail.rsi/fragile.png
rename to Resources/Textures/Objects/Specific/Mail/mail.rsi/fragile.png
diff --git a/Resources/Textures/Nyanotrasen/Objects/Specific/Mail/mail.rsi/icon.png b/Resources/Textures/Objects/Specific/Mail/mail.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Objects/Specific/Mail/mail.rsi/icon.png
rename to Resources/Textures/Objects/Specific/Mail/mail.rsi/icon.png
diff --git a/Resources/Textures/Nyanotrasen/Objects/Specific/Mail/mail.rsi/locked.png b/Resources/Textures/Objects/Specific/Mail/mail.rsi/locked.png
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Objects/Specific/Mail/mail.rsi/locked.png
rename to Resources/Textures/Objects/Specific/Mail/mail.rsi/locked.png
diff --git a/Resources/Textures/Nyanotrasen/Objects/Specific/Mail/mail.rsi/meta.json b/Resources/Textures/Objects/Specific/Mail/mail.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Objects/Specific/Mail/mail.rsi/meta.json
rename to Resources/Textures/Objects/Specific/Mail/mail.rsi/meta.json
diff --git a/Resources/Textures/Nyanotrasen/Objects/Specific/Mail/mail.rsi/postmark.png b/Resources/Textures/Objects/Specific/Mail/mail.rsi/postmark.png
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Objects/Specific/Mail/mail.rsi/postmark.png
rename to Resources/Textures/Objects/Specific/Mail/mail.rsi/postmark.png
diff --git a/Resources/Textures/Nyanotrasen/Objects/Specific/Mail/mail.rsi/priority.png b/Resources/Textures/Objects/Specific/Mail/mail.rsi/priority.png
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Objects/Specific/Mail/mail.rsi/priority.png
rename to Resources/Textures/Objects/Specific/Mail/mail.rsi/priority.png
diff --git a/Resources/Textures/Nyanotrasen/Objects/Specific/Mail/mail.rsi/priority_inactive.png b/Resources/Textures/Objects/Specific/Mail/mail.rsi/priority_inactive.png
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Objects/Specific/Mail/mail.rsi/priority_inactive.png
rename to Resources/Textures/Objects/Specific/Mail/mail.rsi/priority_inactive.png
diff --git a/Resources/Textures/Nyanotrasen/Objects/Specific/Mail/mail.rsi/trash.png b/Resources/Textures/Objects/Specific/Mail/mail.rsi/trash.png
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Objects/Specific/Mail/mail.rsi/trash.png
rename to Resources/Textures/Objects/Specific/Mail/mail.rsi/trash.png
diff --git a/Resources/Textures/Objects/Specific/Mail/mail_large.rsi/broken.png b/Resources/Textures/Objects/Specific/Mail/mail_large.rsi/broken.png
new file mode 100644
index 00000000000..1c798c4075b
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mail/mail_large.rsi/broken.png differ
diff --git a/Resources/Textures/Objects/Specific/Mail/mail_large.rsi/fragile.png b/Resources/Textures/Objects/Specific/Mail/mail_large.rsi/fragile.png
new file mode 100644
index 00000000000..0917000cbef
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mail/mail_large.rsi/fragile.png differ
diff --git a/Resources/Textures/Objects/Specific/Mail/mail_large.rsi/icon.png b/Resources/Textures/Objects/Specific/Mail/mail_large.rsi/icon.png
new file mode 100644
index 00000000000..f3974ab116c
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mail/mail_large.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Specific/Mail/mail_large.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Mail/mail_large.rsi/inhand-left.png
new file mode 100644
index 00000000000..ccbc87cf3bd
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mail/mail_large.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Mail/mail_large.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Mail/mail_large.rsi/inhand-right.png
new file mode 100644
index 00000000000..ccbc87cf3bd
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mail/mail_large.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Mail/mail_large.rsi/locked.png b/Resources/Textures/Objects/Specific/Mail/mail_large.rsi/locked.png
new file mode 100644
index 00000000000..1cacaf19213
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mail/mail_large.rsi/locked.png differ
diff --git a/Resources/Textures/Objects/Specific/Mail/mail_large.rsi/meta.json b/Resources/Textures/Objects/Specific/Mail/mail_large.rsi/meta.json
new file mode 100644
index 00000000000..ac5345ba1a5
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Mail/mail_large.rsi/meta.json
@@ -0,0 +1,40 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation (obj/storage/closet.dmi, obj/service/bureaucracy.dmi), modified by Whatstone (Discord).  broken, inhand-left, inhand-right by Whatstone.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "broken"
+    },
+    {
+      "name": "fragile"
+    },
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "locked"
+    },
+    {
+      "name": "priority"
+    },
+    {
+      "name": "priority_inactive"
+    },
+    {
+      "name": "trash"
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Specific/Mail/mail_large.rsi/priority.png b/Resources/Textures/Objects/Specific/Mail/mail_large.rsi/priority.png
new file mode 100644
index 00000000000..9c5a74ad103
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mail/mail_large.rsi/priority.png differ
diff --git a/Resources/Textures/Objects/Specific/Mail/mail_large.rsi/priority_inactive.png b/Resources/Textures/Objects/Specific/Mail/mail_large.rsi/priority_inactive.png
new file mode 100644
index 00000000000..fc03165b576
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mail/mail_large.rsi/priority_inactive.png differ
diff --git a/Resources/Textures/Objects/Specific/Mail/mail_large.rsi/trash.png b/Resources/Textures/Objects/Specific/Mail/mail_large.rsi/trash.png
new file mode 100644
index 00000000000..2ef4ee72338
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mail/mail_large.rsi/trash.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/mail.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/mail.rsi/bolt-open.png
new file mode 100644
index 00000000000..87c6d812ec2
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Launchers/mail.rsi/bolt-open.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/mail.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/mail.rsi/equipped-BACKPACK.png
new file mode 100644
index 00000000000..c17a68eb35a
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Launchers/mail.rsi/equipped-BACKPACK.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/mail.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/mail.rsi/equipped-BELT.png
new file mode 100644
index 00000000000..59dc5f13ed0
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Launchers/mail.rsi/equipped-BELT.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/mail.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/mail.rsi/icon.png
new file mode 100644
index 00000000000..dd7b21e1671
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Launchers/mail.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/mail.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/mail.rsi/inhand-left.png
new file mode 100644
index 00000000000..427389f40d5
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Launchers/mail.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/mail.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/mail.rsi/inhand-right.png
new file mode 100644
index 00000000000..8e50ef04f91
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Launchers/mail.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/mail.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Launchers/mail.rsi/meta.json
new file mode 100644
index 00000000000..464c22d1a7a
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Guns/Launchers/mail.rsi/meta.json
@@ -0,0 +1,33 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-4.0",
+    "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/pull/6042/commits/64916c98f4847acc4adf3a2416bf78c005fd7dd7, https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/launcher/grenadelauncher.dmi, backpack sprite by Peptide, resprited for mail gun by erhardsteinhauer (discord)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "bolt-open"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/meta.json b/Resources/Textures/Structures/Walls/rock.rsi/meta.json
index 6dd8f54d83a..e6b0be11116 100644
--- a/Resources/Textures/Structures/Walls/rock.rsi/meta.json
+++ b/Resources/Textures/Structures/Walls/rock.rsi/meta.json
@@ -106,20 +106,20 @@
         {
             "name": "rock_diamond",
             "delays": [
-              [
-               0.2,
-               0.2,
-               0.2,
-               0.2,
-               0.2,
-               0.2,
-               0.2,
-               0.2,
-               0.2,
-               0.2,
-               0.2,
-               0.2
-              ]
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
             ]
         },
         {
@@ -288,21 +288,24 @@
         {
             "name": "rock_ore_diamond",
             "delays":[
-            [
-               0.2,
-               0.2,
-               0.2,
-               0.2,
-               0.2,
-               0.2,
-               0.2,
-               0.2,
-               0.2,
-               0.2,
-               0.2,
-               0.2
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
             ]
-        ]
+        },
+        {
+            "name": "rock_bluespace"
         }
     ]
 }
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_bluespace.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_bluespace.png
new file mode 100644
index 00000000000..e3368c34d71
Binary files /dev/null and b/Resources/Textures/Structures/Walls/rock.rsi/rock_bluespace.png differ
diff --git a/Resources/keybinds.yml b/Resources/keybinds.yml
index c74e160f688..8d70bb40f9f 100644
--- a/Resources/keybinds.yml
+++ b/Resources/keybinds.yml
@@ -268,6 +268,10 @@ binds:
 - function: ToggleStanding
   type: State
   key: R
+- function: ToggleCrawlingUnder
+  type: State
+  mod1: Shift
+  key: R
 - function: ShowDebugConsole
   type: State
   key: Tilde