diff --git a/.github/workflows/conflict-labeler.yml b/.github/workflows/labeler-conflict.yml
similarity index 100%
rename from .github/workflows/conflict-labeler.yml
rename to .github/workflows/labeler-conflict.yml
diff --git a/.github/workflows/labeler-needsreview.yml b/.github/workflows/labeler-needsreview.yml
index 819b34b7bbd..4d895cad771 100644
--- a/.github/workflows/labeler-needsreview.yml
+++ b/.github/workflows/labeler-needsreview.yml
@@ -3,10 +3,17 @@
 on:
   pull_request_target:
     types: [review_requested]
+  pull_request_review:
+    types: [submitted]
+
+permissions:
+  pull-requests: write
+  contents: write
 
 jobs:
   add_label:
     runs-on: ubuntu-latest
+    if: github.event_name == 'pull_request_target'
     steps:
     - uses: actions-ecosystem/action-add-labels@v1
       with:
@@ -14,3 +21,23 @@ jobs:
     - uses: actions-ecosystem/action-remove-labels@v1
       with:
         labels: "S: Awaiting Changes"
+
+  handle_review:
+    runs-on: ubuntu-latest
+    if: github.event_name == 'pull_request_review'
+    steps:
+    - uses: actions-ecosystem/action-add-labels@v1
+      if: |
+        github.event.review.state == 'changes_requested' &&
+        (github.event.review.author_association == 'OWNER' ||
+         github.event.review.author_association == 'MEMBER')
+      with:
+        labels: "S: Awaiting Changes"
+
+    - uses: actions-ecosystem/action-remove-labels@v1
+      if: |
+        github.event.review.state == 'changes_requested' &&
+        (github.event.review.author_association == 'OWNER' ||
+         github.event.review.author_association == 'MEMBER')
+      with:
+        labels: "S: Needs Review"
diff --git a/.github/workflows/labeler-size.yml b/.github/workflows/labeler-size.yml
new file mode 100644
index 00000000000..418faed79b8
--- /dev/null
+++ b/.github/workflows/labeler-size.yml
@@ -0,0 +1,21 @@
+name: "Labels: Size"
+on: pull_request_target
+jobs:
+  size-label:
+    runs-on: ubuntu-latest
+    steps:
+      - name: size-label
+        uses: "pascalgn/size-label-action@v0.5.5"
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+        with:
+          # Custom size configuration
+          # DeltaV: changed to powers of 4
+          sizes: >
+            {
+              "0": "XS",
+              "16": "S",
+              "64": "M",
+              "256": "L",
+              "1024": "XL"
+            }
diff --git a/Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs b/Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs
index 588d62e5603..3c7322d4739 100644
--- a/Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs
+++ b/Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs
@@ -22,11 +22,11 @@ namespace Content.Client.Administration.UI.BanPanel;
 [GenerateTypedNameReferences]
 public sealed partial class BanPanel : DefaultWindow
 {
-    public event Action<string?, (IPAddress, int)?, bool, byte[]?, bool, uint, string, NoteSeverity, string[]?, bool>? BanSubmitted;
+    public event Action<string?, (IPAddress, int)?, bool, ImmutableTypedHwid?, bool, uint, string, NoteSeverity, string[]?, bool>? BanSubmitted;
     public event Action<string>? PlayerChanged;
     private string? PlayerUsername { get; set; }
     private (IPAddress, int)? IpAddress { get; set; }
-    private byte[]? Hwid { get; set; }
+    private ImmutableTypedHwid? Hwid { get; set; }
     private double TimeEntered { get; set; }
     private uint Multiplier { get; set; }
     private bool HasBanFlag { get; set; }
@@ -371,9 +371,8 @@ private void OnIpChanged()
     private void OnHwidChanged()
     {
         var hwidString = HwidLine.Text;
-        var length = 3 * (hwidString.Length / 4) - hwidString.TakeLast(2).Count(c => c == '=');
-        Hwid = new byte[length];
-        if (HwidCheckbox.Pressed && !(string.IsNullOrEmpty(hwidString) && LastConnCheckbox.Pressed) && !Convert.TryFromBase64String(hwidString, Hwid, out _))
+        ImmutableTypedHwid? hwid = null;
+        if (HwidCheckbox.Pressed && !(string.IsNullOrEmpty(hwidString) && LastConnCheckbox.Pressed) && !ImmutableTypedHwid.TryParse(hwidString, out hwid))
         {
             ErrorLevel |= ErrorLevelEnum.Hwid;
             HwidLine.ModulateSelfOverride = Color.Red;
@@ -390,7 +389,7 @@ private void OnHwidChanged()
             Hwid = null;
             return;
         }
-        Hwid = Convert.FromHexString(hwidString);
+        Hwid = hwid;
     }
 
     private void OnTypeChanged()
diff --git a/Content.Client/Administration/UI/Notes/NoteEdit.xaml b/Content.Client/Administration/UI/Notes/NoteEdit.xaml
index 506abac540c..72b2c55ce8d 100644
--- a/Content.Client/Administration/UI/Notes/NoteEdit.xaml
+++ b/Content.Client/Administration/UI/Notes/NoteEdit.xaml
@@ -8,6 +8,7 @@
             <Label Name="ExpiryLabel" Text="{Loc admin-note-editor-expiry-label}" Visible="False" />
             <HistoryLineEdit Name="ExpiryLineEdit" PlaceHolder="{Loc admin-note-editor-expiry-placeholder}"
                              Visible="False" HorizontalExpand="True" />
+            <OptionButton Name="ExpiryLengthDropdown" Visible="False" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
             <OptionButton Name="TypeOption" HorizontalAlignment="Center" />
diff --git a/Content.Client/Administration/UI/Notes/NoteEdit.xaml.cs b/Content.Client/Administration/UI/Notes/NoteEdit.xaml.cs
index 6f314f79542..a412e47396b 100644
--- a/Content.Client/Administration/UI/Notes/NoteEdit.xaml.cs
+++ b/Content.Client/Administration/UI/Notes/NoteEdit.xaml.cs
@@ -17,6 +17,17 @@ public sealed partial class NoteEdit : FancyWindow
     [Dependency] private readonly IGameTiming _gameTiming = default!;
     [Dependency] private readonly IClientConsoleHost _console = default!;
 
+    private enum Multipliers
+    {
+        Minutes,
+        Hours,
+        Days,
+        Weeks,
+        Months,
+        Years,
+        Centuries
+    }
+
     public event Action<int, NoteType, string, NoteSeverity?, bool, DateTime?>? SubmitPressed;
 
     public NoteEdit(SharedAdminNote? note, string playerName, bool canCreate, bool canEdit)
@@ -31,6 +42,20 @@ public NoteEdit(SharedAdminNote? note, string playerName, bool canCreate, bool c
 
         ResetSubmitButton();
 
+        // It's weird to use minutes as the IDs, but it works and makes sense kind of :)
+        ExpiryLengthDropdown.AddItem(Loc.GetString("admin-note-button-minutes"), (int) Multipliers.Minutes);
+        ExpiryLengthDropdown.AddItem(Loc.GetString("admin-note-button-hours"), (int) Multipliers.Hours);
+        ExpiryLengthDropdown.AddItem(Loc.GetString("admin-note-button-days"), (int) Multipliers.Days);
+        ExpiryLengthDropdown.AddItem(Loc.GetString("admin-note-button-weeks"), (int) Multipliers.Weeks);
+        ExpiryLengthDropdown.AddItem(Loc.GetString("admin-note-button-months"), (int) Multipliers.Months);
+        ExpiryLengthDropdown.AddItem(Loc.GetString("admin-note-button-years"), (int) Multipliers.Years);
+        ExpiryLengthDropdown.AddItem(Loc.GetString("admin-note-button-centuries"), (int) Multipliers.Centuries);
+        ExpiryLengthDropdown.OnItemSelected += OnLengthChanged;
+
+        ExpiryLengthDropdown.SelectId((int) Multipliers.Weeks);
+
+        ExpiryLineEdit.OnTextChanged += OnTextChanged;
+
         TypeOption.AddItem(Loc.GetString("admin-note-editor-type-note"), (int) NoteType.Note);
         TypeOption.AddItem(Loc.GetString("admin-note-editor-type-message"), (int) NoteType.Message);
         TypeOption.AddItem(Loc.GetString("admin-note-editor-type-watchlist"), (int) NoteType.Watchlist);
@@ -172,8 +197,9 @@ private void UpdatePermanentCheckboxFields()
     {
         ExpiryLabel.Visible = !PermanentCheckBox.Pressed;
         ExpiryLineEdit.Visible = !PermanentCheckBox.Pressed;
+        ExpiryLengthDropdown.Visible = !PermanentCheckBox.Pressed;
 
-        ExpiryLineEdit.Text = !PermanentCheckBox.Pressed ? DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") : string.Empty;
+        ExpiryLineEdit.Text = !PermanentCheckBox.Pressed ? 1.ToString() : string.Empty;
     }
 
     private void OnSecretPressed(BaseButton.ButtonEventArgs _)
@@ -187,6 +213,16 @@ private void OnSeverityChanged(OptionButton.ItemSelectedEventArgs args)
         SeverityOption.SelectId(args.Id);
     }
 
+    private void OnLengthChanged(OptionButton.ItemSelectedEventArgs args)
+    {
+        ExpiryLengthDropdown.SelectId(args.Id);
+    }
+
+    private void OnTextChanged(HistoryLineEdit.LineEditEventArgs args)
+    {
+        ParseExpiryTime();
+    }
+
     private void OnSubmitButtonPressed(BaseButton.ButtonEventArgs args)
     {
         if (!ParseExpiryTime())
@@ -263,13 +299,24 @@ private bool ParseExpiryTime()
             return true;
         }
 
-        if (string.IsNullOrWhiteSpace(ExpiryLineEdit.Text) || !DateTime.TryParse(ExpiryLineEdit.Text, out var result) || DateTime.UtcNow > result)
+        if (string.IsNullOrWhiteSpace(ExpiryLineEdit.Text) || !uint.TryParse(ExpiryLineEdit.Text, out var inputInt))
         {
             ExpiryLineEdit.ModulateSelfOverride = Color.Red;
             return false;
         }
 
-        ExpiryTime = result.ToUniversalTime();
+        var mult = ExpiryLengthDropdown.SelectedId switch
+        {
+            (int) Multipliers.Minutes => TimeSpan.FromMinutes(1).TotalMinutes,
+            (int) Multipliers.Hours => TimeSpan.FromHours(1).TotalMinutes,
+            (int) Multipliers.Days => TimeSpan.FromDays(1).TotalMinutes,
+            (int) Multipliers.Weeks => TimeSpan.FromDays(7).TotalMinutes,
+            (int) Multipliers.Months => TimeSpan.FromDays(30).TotalMinutes,
+            (int) Multipliers.Years => TimeSpan.FromDays(365).TotalMinutes,
+            (int) Multipliers.Centuries => TimeSpan.FromDays(36525).TotalMinutes,
+            _ => throw new ArgumentOutOfRangeException(nameof(ExpiryLengthDropdown.SelectedId), "Multiplier out of range :(")
+        };
+        ExpiryTime = DateTime.UtcNow.AddMinutes(inputInt * mult);
         ExpiryLineEdit.ModulateSelfOverride = null;
         return true;
     }
diff --git a/Content.Client/Alerts/ClientAlertsSystem.cs b/Content.Client/Alerts/ClientAlertsSystem.cs
index 525ef1f018f..c5ec254c0cc 100644
--- a/Content.Client/Alerts/ClientAlertsSystem.cs
+++ b/Content.Client/Alerts/ClientAlertsSystem.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Alert;
 using JetBrains.Annotations;
 using Robust.Client.Player;
+using Robust.Shared.GameStates;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 
@@ -24,8 +25,7 @@ public override void Initialize()
 
         SubscribeLocalEvent<AlertsComponent, LocalPlayerAttachedEvent>(OnPlayerAttached);
         SubscribeLocalEvent<AlertsComponent, LocalPlayerDetachedEvent>(OnPlayerDetached);
-
-        SubscribeLocalEvent<AlertsComponent, AfterAutoHandleStateEvent>(ClientAlertsHandleState);
+        SubscribeLocalEvent<AlertsComponent, ComponentHandleState>(OnHandleState);
     }
     protected override void LoadPrototypes()
     {
@@ -47,17 +47,22 @@ public IReadOnlyDictionary<AlertKey, AlertState>? ActiveAlerts
         }
     }
 
-    protected override void AfterShowAlert(Entity<AlertsComponent> alerts)
+    private void OnHandleState(Entity<AlertsComponent> alerts, ref ComponentHandleState args)
     {
+        if (args.Current is not AlertComponentState cast)
+            return;
+
+        alerts.Comp.Alerts = cast.Alerts;
+
         UpdateHud(alerts);
     }
 
-    protected override void AfterClearAlert(Entity<AlertsComponent> alerts)
+    protected override void AfterShowAlert(Entity<AlertsComponent> alerts)
     {
         UpdateHud(alerts);
     }
 
-    private void ClientAlertsHandleState(Entity<AlertsComponent> alerts, ref AfterAutoHandleStateEvent args)
+    protected override void AfterClearAlert(Entity<AlertsComponent> alerts)
     {
         UpdateHud(alerts);
     }
diff --git a/Content.Client/Clothing/ClientClothingSystem.cs b/Content.Client/Clothing/ClientClothingSystem.cs
index 3462fc92360..46f879e8156 100644
--- a/Content.Client/Clothing/ClientClothingSystem.cs
+++ b/Content.Client/Clothing/ClientClothingSystem.cs
@@ -58,6 +58,7 @@ public override void Initialize()
         base.Initialize();
 
         SubscribeLocalEvent<ClothingComponent, GetEquipmentVisualsEvent>(OnGetVisuals);
+        SubscribeLocalEvent<ClothingComponent, InventoryTemplateUpdated>(OnInventoryTemplateUpdated);
 
         SubscribeLocalEvent<InventoryComponent, VisualsChangedEvent>(OnVisualsChanged);
         SubscribeLocalEvent<SpriteComponent, DidUnequipEvent>(OnDidUnequip);
@@ -70,11 +71,7 @@ private void OnAppearanceUpdate(EntityUid uid, InventoryComponent component, ref
         if (args.Sprite == null)
             return;
 
-        var enumerator = _inventorySystem.GetSlotEnumerator((uid, component));
-        while (enumerator.NextItem(out var item, out var slot))
-        {
-            RenderEquipment(uid, item, slot.Name, component);
-        }
+        UpdateAllSlots(uid, component);
 
         // No clothing equipped -> make sure the layer is hidden, though this should already be handled by on-unequip.
         if (args.Sprite.LayerMapTryGet(HumanoidVisualLayers.StencilMask, out var layer))
@@ -84,6 +81,23 @@ private void OnAppearanceUpdate(EntityUid uid, InventoryComponent component, ref
         }
     }
 
+    private void OnInventoryTemplateUpdated(Entity<ClothingComponent> ent, ref InventoryTemplateUpdated args)
+    {
+        UpdateAllSlots(ent.Owner, clothing: ent.Comp);
+    }
+
+    private void UpdateAllSlots(
+        EntityUid uid,
+        InventoryComponent? inventoryComponent = null,
+        ClothingComponent? clothing = null)
+    {
+        var enumerator = _inventorySystem.GetSlotEnumerator((uid, inventoryComponent));
+        while (enumerator.NextItem(out var item, out var slot))
+        {
+            RenderEquipment(uid, item, slot.Name, inventoryComponent, clothingComponent: clothing);
+        }
+    }
+
     private void OnGetVisuals(EntityUid uid, ClothingComponent item, GetEquipmentVisualsEvent args)
     {
         if (!TryComp(args.Equipee, out InventoryComponent? inventory))
diff --git a/Content.Client/Commands/ShowHealthBarsCommand.cs b/Content.Client/Commands/ShowHealthBarsCommand.cs
index 0811f966637..6ea9d06c8c3 100644
--- a/Content.Client/Commands/ShowHealthBarsCommand.cs
+++ b/Content.Client/Commands/ShowHealthBarsCommand.cs
@@ -1,6 +1,8 @@
+using Content.Shared.Damage.Prototypes;
 using Content.Shared.Overlays;
 using Robust.Client.Player;
 using Robust.Shared.Console;
+using Robust.Shared.Prototypes;
 using System.Linq;
 
 namespace Content.Client.Commands;
@@ -34,7 +36,7 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
             var showHealthBarsComponent = new ShowHealthBarsComponent
             {
-                DamageContainers = args.ToList(),
+                DamageContainers = args.Select(arg => new ProtoId<DamageContainerPrototype>(arg)).ToList(),
                 HealthStatusIcon = null,
                 NetSyncEnabled = false
             };
diff --git a/Content.Client/Effects/ColorFlashEffectSystem.cs b/Content.Client/Effects/ColorFlashEffectSystem.cs
index 956c9465244..b584aa9ad1b 100644
--- a/Content.Client/Effects/ColorFlashEffectSystem.cs
+++ b/Content.Client/Effects/ColorFlashEffectSystem.cs
@@ -124,6 +124,10 @@ private void OnColorFlashEffect(ColorFlashEffectEvent ev)
                 continue;
             }
 
+            var targetEv = new GetFlashEffectTargetEvent(ent);
+            RaiseLocalEvent(ent, ref targetEv);
+            ent = targetEv.Target;
+
             EnsureComp<ColorFlashEffectComponent>(ent, out comp);
             comp.NetSyncEnabled = false;
             comp.Color = sprite.Color;
@@ -132,3 +136,9 @@ private void OnColorFlashEffect(ColorFlashEffectEvent ev)
         }
     }
 }
+
+/// <summary>
+/// Raised on an entity to change the target for a color flash effect.
+/// </summary>
+[ByRefEvent]
+public record struct GetFlashEffectTargetEvent(EntityUid Target);
diff --git a/Content.Client/Inventory/ClientInventorySystem.cs b/Content.Client/Inventory/ClientInventorySystem.cs
index 87cea4e3d2f..dce401eefda 100644
--- a/Content.Client/Inventory/ClientInventorySystem.cs
+++ b/Content.Client/Inventory/ClientInventorySystem.cs
@@ -235,9 +235,23 @@ public void UIInventoryAltActivateItem(string slot, EntityUid uid)
             EntityManager.RaisePredictiveEvent(new InteractInventorySlotEvent(GetNetEntity(item.Value), altInteract: true));
         }
 
+        protected override void UpdateInventoryTemplate(Entity<InventoryComponent> ent)
+        {
+            base.UpdateInventoryTemplate(ent);
+
+            if (TryComp(ent, out InventorySlotsComponent? inventorySlots))
+            {
+                foreach (var slot in ent.Comp.Slots)
+                {
+                    if (inventorySlots.SlotData.TryGetValue(slot.Name, out var slotData))
+                        slotData.SlotDef = slot;
+                }
+            }
+        }
+
         public sealed class SlotData
         {
-            public readonly SlotDefinition SlotDef;
+            public SlotDefinition SlotDef;
             public EntityUid? HeldEntity => Container?.ContainedEntity;
             public bool Blocked;
             public bool Highlighted;
diff --git a/Content.Client/Overlays/EquipmentHudSystem.cs b/Content.Client/Overlays/EquipmentHudSystem.cs
index c7578b6793f..502a1f36274 100644
--- a/Content.Client/Overlays/EquipmentHudSystem.cs
+++ b/Content.Client/Overlays/EquipmentHudSystem.cs
@@ -14,6 +14,7 @@ public abstract class EquipmentHudSystem<T> : EntitySystem where T : IComponent
 {
     [Dependency] private readonly IPlayerManager _player = default!;
 
+    [ViewVariables]
     protected bool IsActive;
     protected virtual SlotFlags TargetSlots => ~SlotFlags.POCKET;
 
@@ -102,7 +103,7 @@ protected virtual void OnRefreshComponentHud(EntityUid uid, T component, Refresh
         args.Components.Add(component);
     }
 
-    private void RefreshOverlay(EntityUid uid)
+    protected void RefreshOverlay(EntityUid uid)
     {
         if (uid != _player.LocalSession?.AttachedEntity)
             return;
diff --git a/Content.Client/Overlays/ShowHealthBarsSystem.cs b/Content.Client/Overlays/ShowHealthBarsSystem.cs
index 1eb712a8988..b23209ff202 100644
--- a/Content.Client/Overlays/ShowHealthBarsSystem.cs
+++ b/Content.Client/Overlays/ShowHealthBarsSystem.cs
@@ -21,9 +21,16 @@ public override void Initialize()
     {
         base.Initialize();
 
+        SubscribeLocalEvent<ShowHealthBarsComponent, AfterAutoHandleStateEvent>(OnHandleState);
+
         _overlay = new(EntityManager, _prototype);
     }
 
+    private void OnHandleState(Entity<ShowHealthBarsComponent> ent, ref AfterAutoHandleStateEvent args)
+    {
+        RefreshOverlay(ent);
+    }
+
     protected override void UpdateInternal(RefreshEquipmentHudEvent<ShowHealthBarsComponent> component)
     {
         base.UpdateInternal(component);
diff --git a/Content.Client/Overlays/ShowHealthIconsSystem.cs b/Content.Client/Overlays/ShowHealthIconsSystem.cs
index 8c22c78f17c..b4d845e4217 100644
--- a/Content.Client/Overlays/ShowHealthIconsSystem.cs
+++ b/Content.Client/Overlays/ShowHealthIconsSystem.cs
@@ -17,6 +17,7 @@ public sealed class ShowHealthIconsSystem : EquipmentHudSystem<ShowHealthIconsCo
 {
     [Dependency] private readonly IPrototypeManager _prototypeMan = default!;
 
+    [ViewVariables]
     public HashSet<string> DamageContainers = new();
 
     public override void Initialize()
@@ -24,6 +25,7 @@ public override void Initialize()
         base.Initialize();
 
         SubscribeLocalEvent<DamageableComponent, GetStatusIconsEvent>(OnGetStatusIconsEvent);
+        SubscribeLocalEvent<ShowHealthIconsComponent, AfterAutoHandleStateEvent>(OnHandleState);
     }
 
     protected override void UpdateInternal(RefreshEquipmentHudEvent<ShowHealthIconsComponent> component)
@@ -43,6 +45,11 @@ protected override void DeactivateInternal()
         DamageContainers.Clear();
     }
 
+    private void OnHandleState(Entity<ShowHealthIconsComponent> ent, ref AfterAutoHandleStateEvent args)
+    {
+        RefreshOverlay(ent);
+    }
+
     private void OnGetStatusIconsEvent(Entity<DamageableComponent> entity, ref GetStatusIconsEvent args)
     {
         if (!IsActive)
diff --git a/Content.Client/Overlays/ShowThirstIconsSystem.cs b/Content.Client/Overlays/ShowThirstIconsSystem.cs
index 44be1f7a67f..9fc64165c56 100644
--- a/Content.Client/Overlays/ShowThirstIconsSystem.cs
+++ b/Content.Client/Overlays/ShowThirstIconsSystem.cs
@@ -22,6 +22,6 @@ private void OnGetStatusIconsEvent(EntityUid uid, ThirstComponent component, ref
             return;
 
         if (_thirst.TryGetStatusIconPrototype(component, out var iconPrototype))
-            ev.StatusIcons.Add(iconPrototype!);
+            ev.StatusIcons.Add(iconPrototype);
     }
 }
diff --git a/Content.Client/Physics/Controllers/MoverController.cs b/Content.Client/Physics/Controllers/MoverController.cs
index c97110b208e..d2ac0cdefdc 100644
--- a/Content.Client/Physics/Controllers/MoverController.cs
+++ b/Content.Client/Physics/Controllers/MoverController.cs
@@ -1,9 +1,12 @@
+using Content.Shared.Alert;
+using Content.Shared.CCVar;
 using Content.Shared.Movement.Components;
 using Content.Shared.Movement.Pulling.Components;
 using Content.Shared.Movement.Systems;
 using Robust.Client.GameObjects;
 using Robust.Client.Physics;
 using Robust.Client.Player;
+using Robust.Shared.Configuration;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Player;
 using Robust.Shared.Timing;
@@ -14,6 +17,8 @@ public sealed class MoverController : SharedMoverController
 {
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly IPlayerManager _playerManager = default!;
+    [Dependency] private readonly AlertsSystem _alerts = default!;
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
 
     public override void Initialize()
     {
@@ -135,4 +140,15 @@ protected override bool CanSound()
     {
         return _timing is { IsFirstTimePredicted: true, InSimulation: true };
     }
+
+    public override void SetSprinting(Entity<InputMoverComponent> entity, ushort subTick, bool walking)
+    {
+        // Logger.Info($"[{_gameTiming.CurTick}/{subTick}] Sprint: {enabled}");
+        base.SetSprinting(entity, subTick, walking);
+
+        if (walking && _cfg.GetCVar(CCVars.ToggleWalk))
+            _alerts.ShowAlert(entity, WalkingAlert, showCooldown: false, autoRemove: false);
+        else
+            _alerts.ClearAlert(entity, WalkingAlert);
+    }
 }
diff --git a/Content.Client/Polymorph/Systems/ChameleonProjectorSystem.cs b/Content.Client/Polymorph/Systems/ChameleonProjectorSystem.cs
index 4acbf540f06..8ba09c66170 100644
--- a/Content.Client/Polymorph/Systems/ChameleonProjectorSystem.cs
+++ b/Content.Client/Polymorph/Systems/ChameleonProjectorSystem.cs
@@ -1,8 +1,10 @@
+using Content.Client.Effects;
 using Content.Client.Smoking;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Polymorph.Components;
 using Content.Shared.Polymorph.Systems;
 using Robust.Client.GameObjects;
+using Robust.Shared.Player;
 
 namespace Content.Client.Polymorph.Systems;
 
@@ -24,6 +26,7 @@ public override void Initialize()
 
         SubscribeLocalEvent<ChameleonDisguisedComponent, ComponentStartup>(OnStartup);
         SubscribeLocalEvent<ChameleonDisguisedComponent, ComponentShutdown>(OnShutdown);
+        SubscribeLocalEvent<ChameleonDisguisedComponent, GetFlashEffectTargetEvent>(OnGetFlashEffectTargetEvent);
     }
 
     private void OnHandleState(Entity<ChameleonDisguiseComponent> ent, ref AfterAutoHandleStateEvent args)
@@ -52,4 +55,9 @@ private void OnShutdown(Entity<ChameleonDisguisedComponent> ent, ref ComponentSh
         if (_spriteQuery.TryComp(ent, out var sprite))
             sprite.Visible = ent.Comp.WasVisible;
     }
+
+    private void OnGetFlashEffectTargetEvent(Entity<ChameleonDisguisedComponent> ent, ref GetFlashEffectTargetEvent args)
+    {
+        args.Target = ent.Comp.Disguise;
+    }
 }
diff --git a/Content.Client/Silicons/Borgs/BorgMenu.xaml.cs b/Content.Client/Silicons/Borgs/BorgMenu.xaml.cs
index f6a861aa057..b8f0e69c022 100644
--- a/Content.Client/Silicons/Borgs/BorgMenu.xaml.cs
+++ b/Content.Client/Silicons/Borgs/BorgMenu.xaml.cs
@@ -131,7 +131,8 @@ private void UpdateModulePanel()
         _modules.Clear();
         foreach (var module in chassis.ModuleContainer.ContainedEntities)
         {
-            var control = new BorgModuleControl(module, _entity);
+            var moduleComponent = _entity.GetComponent<BorgModuleComponent>(module);
+            var control = new BorgModuleControl(module, _entity, !moduleComponent.DefaultModule);
             control.RemoveButtonPressed += () =>
             {
                 RemoveModuleButtonPressed?.Invoke(module);
diff --git a/Content.Client/Silicons/Borgs/BorgModuleControl.xaml.cs b/Content.Client/Silicons/Borgs/BorgModuleControl.xaml.cs
index d5cf05ba63e..245425524ca 100644
--- a/Content.Client/Silicons/Borgs/BorgModuleControl.xaml.cs
+++ b/Content.Client/Silicons/Borgs/BorgModuleControl.xaml.cs
@@ -9,7 +9,7 @@ public sealed partial class BorgModuleControl : PanelContainer
 {
     public Action? RemoveButtonPressed;
 
-    public BorgModuleControl(EntityUid entity, IEntityManager entityManager)
+    public BorgModuleControl(EntityUid entity, IEntityManager entityManager, bool canRemove)
     {
         RobustXamlLoader.Load(this);
 
@@ -20,6 +20,7 @@ public BorgModuleControl(EntityUid entity, IEntityManager entityManager)
         {
             RemoveButtonPressed?.Invoke();
         };
+        RemoveButton.Visible = canRemove;
     }
 }
 
diff --git a/Content.Client/Silicons/Borgs/BorgSelectTypeMenu.xaml b/Content.Client/Silicons/Borgs/BorgSelectTypeMenu.xaml
new file mode 100644
index 00000000000..f51c2f53fd0
--- /dev/null
+++ b/Content.Client/Silicons/Borgs/BorgSelectTypeMenu.xaml
@@ -0,0 +1,43 @@
+<controls:FancyWindow xmlns="https://spacestation14.io"
+                      xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+                      xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
+                      Title="{Loc 'borg-select-type-menu-title'}"
+                      SetSize="550 300">
+    <BoxContainer Orientation="Vertical">
+        <BoxContainer Orientation="Horizontal" VerticalExpand="True">
+            <!-- Left pane: selection of borg type -->
+            <BoxContainer Orientation="Vertical" MinWidth="200" Margin="2 0">
+                <Label Text="{Loc 'borg-select-type-menu-available'}" StyleClasses="LabelHeading" />
+                <ScrollContainer HScrollEnabled="False" VerticalExpand="True">
+                    <BoxContainer Name="SelectionsContainer" Orientation="Vertical" />
+                </ScrollContainer>
+            </BoxContainer>
+
+            <customControls:VSeparator />
+
+            <!-- Right pane: information about selected borg module, confirm button. -->
+            <BoxContainer Orientation="Vertical" HorizontalExpand="True" Margin="2 0">
+                <Label Text="{Loc 'borg-select-type-menu-information'}" StyleClasses="LabelHeading" />
+                <Control VerticalExpand="True">
+                    <controls:Placeholder Name="InfoPlaceholder" PlaceholderText="{Loc 'borg-select-type-menu-select-type'}" />
+                    <BoxContainer Name="InfoContents" Orientation="Vertical" Visible="False">
+                        <BoxContainer Orientation="Horizontal" Margin="0 0 0 4">
+                            <EntityPrototypeView Name="ChassisView" Scale="2,2" />
+                            <Label Name="NameLabel" HorizontalExpand="True" />
+                        </BoxContainer>
+
+                        <RichTextLabel Name="DescriptionLabel" VerticalExpand="True" VerticalAlignment="Top" />
+                    </BoxContainer>
+                </Control>
+                <controls:ConfirmButton Name="ConfirmTypeButton" Text="{Loc 'borg-select-type-menu-confirm'}"
+                                        Disabled="True" HorizontalAlignment="Right"
+                                        MinWidth="200" />
+            </BoxContainer>
+        </BoxContainer>
+
+        <controls:StripeBack Margin="0 0 0 4">
+            <Label Text="{Loc 'borg-select-type-menu-bottom-text'}" HorizontalAlignment="Center" StyleClasses="LabelSubText" Margin="4 4 0 4"/>
+        </controls:StripeBack>
+    </BoxContainer>
+
+</controls:FancyWindow>
diff --git a/Content.Client/Silicons/Borgs/BorgSelectTypeMenu.xaml.cs b/Content.Client/Silicons/Borgs/BorgSelectTypeMenu.xaml.cs
new file mode 100644
index 00000000000..e1fbd376b54
--- /dev/null
+++ b/Content.Client/Silicons/Borgs/BorgSelectTypeMenu.xaml.cs
@@ -0,0 +1,81 @@
+using System.Linq;
+using Content.Client.UserInterface.Controls;
+using Content.Client.UserInterface.Systems.Guidebook;
+using Content.Shared.Guidebook;
+using Content.Shared.Silicons.Borgs;
+using Content.Shared.Silicons.Borgs.Components;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.Silicons.Borgs;
+
+/// <summary>
+/// Menu used by borgs to select their type.
+/// </summary>
+/// <seealso cref="BorgSelectTypeUserInterface"/>
+/// <seealso cref="BorgSwitchableTypeComponent"/>
+[GenerateTypedNameReferences]
+public sealed partial class BorgSelectTypeMenu : FancyWindow
+{
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+
+    private BorgTypePrototype? _selectedBorgType;
+
+    public event Action<ProtoId<BorgTypePrototype>>? ConfirmedBorgType;
+
+    [ValidatePrototypeId<GuideEntryPrototype>]
+    private static readonly List<ProtoId<GuideEntryPrototype>> GuidebookEntries = new() { "Cyborgs", "Robotics" };
+
+    public BorgSelectTypeMenu()
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+
+        var group = new ButtonGroup();
+        foreach (var borgType in _prototypeManager.EnumeratePrototypes<BorgTypePrototype>().OrderBy(PrototypeName))
+        {
+            var button = new Button
+            {
+                Text = PrototypeName(borgType),
+                Group = group,
+            };
+            button.OnPressed += _ =>
+            {
+                _selectedBorgType = borgType;
+                UpdateInformation(borgType);
+            };
+            SelectionsContainer.AddChild(button);
+        }
+
+        ConfirmTypeButton.OnPressed += ConfirmButtonPressed;
+        HelpGuidebookIds = GuidebookEntries;
+    }
+
+    private void UpdateInformation(BorgTypePrototype prototype)
+    {
+        _selectedBorgType = prototype;
+
+        InfoContents.Visible = true;
+        InfoPlaceholder.Visible = false;
+        ConfirmTypeButton.Disabled = false;
+
+        NameLabel.Text = PrototypeName(prototype);
+        DescriptionLabel.Text = Loc.GetString($"borg-type-{prototype.ID}-desc");
+        ChassisView.SetPrototype(prototype.DummyPrototype);
+    }
+
+    private void ConfirmButtonPressed(BaseButton.ButtonEventArgs obj)
+    {
+        if (_selectedBorgType == null)
+            return;
+
+        ConfirmedBorgType?.Invoke(_selectedBorgType);
+    }
+
+    private static string PrototypeName(BorgTypePrototype prototype)
+    {
+        return Loc.GetString($"borg-type-{prototype.ID}-name");
+    }
+}
diff --git a/Content.Client/Silicons/Borgs/BorgSelectTypeUserInterface.cs b/Content.Client/Silicons/Borgs/BorgSelectTypeUserInterface.cs
new file mode 100644
index 00000000000..8c76fade8c9
--- /dev/null
+++ b/Content.Client/Silicons/Borgs/BorgSelectTypeUserInterface.cs
@@ -0,0 +1,30 @@
+using Content.Shared.Silicons.Borgs.Components;
+using JetBrains.Annotations;
+using Robust.Client.UserInterface;
+
+namespace Content.Client.Silicons.Borgs;
+
+/// <summary>
+/// User interface used by borgs to select their type.
+/// </summary>
+/// <seealso cref="BorgSelectTypeMenu"/>
+/// <seealso cref="BorgSwitchableTypeComponent"/>
+/// <seealso cref="BorgSwitchableTypeUiKey"/>
+[UsedImplicitly]
+public sealed class BorgSelectTypeUserInterface : BoundUserInterface
+{
+    [ViewVariables]
+    private BorgSelectTypeMenu? _menu;
+
+    public BorgSelectTypeUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+    {
+    }
+
+    protected override void Open()
+    {
+        base.Open();
+
+        _menu = this.CreateWindow<BorgSelectTypeMenu>();
+        _menu.ConfirmedBorgType += prototype => SendMessage(new BorgSelectTypeMessage(prototype));
+    }
+}
diff --git a/Content.Client/Silicons/Borgs/BorgSwitchableTypeSystem.cs b/Content.Client/Silicons/Borgs/BorgSwitchableTypeSystem.cs
new file mode 100644
index 00000000000..d94562e374b
--- /dev/null
+++ b/Content.Client/Silicons/Borgs/BorgSwitchableTypeSystem.cs
@@ -0,0 +1,85 @@
+using Content.Shared.Movement.Components;
+using Content.Shared.Silicons.Borgs;
+using Content.Shared.Silicons.Borgs.Components;
+using Robust.Client.GameObjects;
+
+namespace Content.Client.Silicons.Borgs;
+
+/// <summary>
+/// Client side logic for borg type switching. Sets up primarily client-side visual information.
+/// </summary>
+/// <seealso cref="SharedBorgSwitchableTypeSystem"/>
+/// <seealso cref="BorgSwitchableTypeComponent"/>
+public sealed class BorgSwitchableTypeSystem : SharedBorgSwitchableTypeSystem
+{
+    [Dependency] private readonly BorgSystem _borgSystem = default!;
+    [Dependency] private readonly AppearanceSystem _appearance = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<BorgSwitchableTypeComponent, AfterAutoHandleStateEvent>(AfterStateHandler);
+        SubscribeLocalEvent<BorgSwitchableTypeComponent, ComponentStartup>(OnComponentStartup);
+    }
+
+    private void OnComponentStartup(Entity<BorgSwitchableTypeComponent> ent, ref ComponentStartup args)
+    {
+        UpdateEntityAppearance(ent);
+    }
+
+    private void AfterStateHandler(Entity<BorgSwitchableTypeComponent> ent, ref AfterAutoHandleStateEvent args)
+    {
+        UpdateEntityAppearance(ent);
+    }
+
+    protected override void UpdateEntityAppearance(
+        Entity<BorgSwitchableTypeComponent> entity,
+        BorgTypePrototype prototype)
+    {
+        // Begin DeltaV Code
+        if (prototype.ClientComponents is {} add)
+            EntityManager.AddComponents(entity, add);
+        // End DeltaV Code
+        if (TryComp(entity, out SpriteComponent? sprite))
+        {
+            sprite.LayerSetState(BorgVisualLayers.Body, prototype.SpriteBodyState);
+            sprite.LayerSetState(BorgVisualLayers.LightStatus, prototype.SpriteToggleLightState);
+        }
+
+        if (TryComp(entity, out BorgChassisComponent? chassis))
+        {
+            _borgSystem.SetMindStates(
+                (entity.Owner, chassis),
+                prototype.SpriteHasMindState,
+                prototype.SpriteNoMindState);
+
+            if (TryComp(entity, out AppearanceComponent? appearance))
+            {
+                // Queue update so state changes apply.
+                _appearance.QueueUpdate(entity, appearance);
+            }
+        }
+
+        if (prototype.SpriteBodyMovementState is { } movementState)
+        {
+            var spriteMovement = EnsureComp<SpriteMovementComponent>(entity);
+            spriteMovement.NoMovementLayers.Clear();
+            spriteMovement.NoMovementLayers["movement"] = new PrototypeLayerData
+            {
+                State = prototype.SpriteBodyState,
+            };
+            spriteMovement.MovementLayers.Clear();
+            spriteMovement.MovementLayers["movement"] = new PrototypeLayerData
+            {
+                State = movementState,
+            };
+        }
+        else
+        {
+            RemComp<SpriteMovementComponent>(entity);
+        }
+
+        base.UpdateEntityAppearance(entity, prototype);
+    }
+}
diff --git a/Content.Client/Silicons/Borgs/BorgSystem.cs b/Content.Client/Silicons/Borgs/BorgSystem.cs
index e92ce5cc777..387a56384e9 100644
--- a/Content.Client/Silicons/Borgs/BorgSystem.cs
+++ b/Content.Client/Silicons/Borgs/BorgSystem.cs
@@ -92,4 +92,18 @@ private void OnMMIAppearanceChanged(EntityUid uid, MMIComponent component, ref A
             sprite.LayerSetState(MMIVisualLayers.Base, state);
         }
     }
+
+    /// <summary>
+    /// Sets the sprite states used for the borg "is there a mind or not" indication.
+    /// </summary>
+    /// <param name="borg">The entity and component to modify.</param>
+    /// <param name="hasMindState">The state to use if the borg has a mind.</param>
+    /// <param name="noMindState">The state to use if the borg has no mind.</param>
+    /// <seealso cref="BorgChassisComponent.HasMindState"/>
+    /// <seealso cref="BorgChassisComponent.NoMindState"/>
+    public void SetMindStates(Entity<BorgChassisComponent> borg, string hasMindState, string noMindState)
+    {
+        borg.Comp.HasMindState = hasMindState;
+        borg.Comp.NoMindState = noMindState;
+    }
 }
diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleButtonsBox.xaml b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleButtonsBox.xaml
new file mode 100644
index 00000000000..32d611e7717
--- /dev/null
+++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleButtonsBox.xaml
@@ -0,0 +1,9 @@
+<BoxContainer xmlns="https://spacestation14.io"
+              Orientation="Vertical"
+              Margin="8 0 8 0">
+    <BoxContainer Name="Buttons"
+                  Orientation="Vertical"
+                  SeparationOverride="5">
+        <!-- Buttons are added here by code -->
+    </BoxContainer>
+</BoxContainer>
diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEntry.xaml.cs b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleButtonsBox.xaml.cs
similarity index 86%
rename from Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEntry.xaml.cs
rename to Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleButtonsBox.xaml.cs
index fc53cc72ae6..7df02434160 100644
--- a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEntry.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleButtonsBox.xaml.cs
@@ -10,20 +10,17 @@
 namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles
 {
     [GenerateTypedNameReferences]
-    public sealed partial class GhostRolesEntry : BoxContainer
+    public sealed partial class GhostRoleButtonsBox : BoxContainer
     {
         private SpriteSystem _spriteSystem;
         public event Action<GhostRoleInfo>? OnRoleSelected;
         public event Action<GhostRoleInfo>? OnRoleFollow;
 
-        public GhostRolesEntry(string name, string description, bool hasAccess, FormattedMessage? reason, IEnumerable<GhostRoleInfo> roles, SpriteSystem spriteSystem)
+        public GhostRoleButtonsBox(bool hasAccess, FormattedMessage? reason, IEnumerable<GhostRoleInfo> roles, SpriteSystem spriteSystem)
         {
             RobustXamlLoader.Load(this);
             _spriteSystem = spriteSystem;
 
-            Title.Text = name;
-            Description.SetMessage(description);
-
             foreach (var role in roles)
             {
                 var button = new GhostRoleEntryButtons(role);
diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleEntryButtons.xaml b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleEntryButtons.xaml
index ffde5d69f76..05c52deef16 100644
--- a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleEntryButtons.xaml
+++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleEntryButtons.xaml
@@ -1,15 +1,15 @@
 <BoxContainer xmlns="https://spacestation14.io"
-              Orientation="Horizontal">
+              Orientation="Horizontal"
+              HorizontalAlignment="Stretch">
     <Button Name="RequestButton"
             Access="Public"
             Text="{Loc 'ghost-roles-window-request-role-button'}"
             StyleClasses="OpenRight"
-            HorizontalAlignment="Left"
-            SetWidth="300"/>
+            HorizontalExpand="True"
+            SizeFlagsStretchRatio="3"/>
     <Button Name="FollowButton"
             Access="Public"
             Text="{Loc 'ghost-roles-window-follow-role-button'}"
             StyleClasses="OpenLeft"
-            HorizontalAlignment="Right"
-            SetWidth="150"/>
+            HorizontalExpand="True"/>
 </BoxContainer>
diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleInfoBox.xaml b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleInfoBox.xaml
new file mode 100644
index 00000000000..e24455bdf52
--- /dev/null
+++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleInfoBox.xaml
@@ -0,0 +1,8 @@
+<BoxContainer xmlns="https://spacestation14.io"
+              Orientation="Vertical">
+    <Label Name="Title"
+           StyleClasses="LabelKeyText"/>
+    <PanelContainer StyleClasses="HighDivider" />
+    <RichTextLabel Name="Description"
+                   Margin="0 4"/>
+</BoxContainer>
diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleInfoBox.xaml.cs b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleInfoBox.xaml.cs
new file mode 100644
index 00000000000..705a9f0bb8c
--- /dev/null
+++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleInfoBox.xaml.cs
@@ -0,0 +1,18 @@
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles
+{
+    [GenerateTypedNameReferences]
+    public sealed partial class GhostRoleInfoBox : BoxContainer
+    {
+        public GhostRoleInfoBox(string name, string description)
+        {
+            RobustXamlLoader.Load(this);
+
+            Title.Text = name;
+            Description.SetMessage(description);
+        }
+    }
+}
diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEntry.xaml b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEntry.xaml
deleted file mode 100644
index d9ed1728107..00000000000
--- a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEntry.xaml
+++ /dev/null
@@ -1,16 +0,0 @@
-<BoxContainer xmlns="https://spacestation14.io"
-              Orientation="Vertical"
-              HorizontalExpand="True"
-              Margin="0 0 8 8">
-    <Label Name="Title"
-           StyleClasses="LabelKeyText"/>
-    <PanelContainer StyleClasses="HighDivider" />
-    <RichTextLabel Name="Description"
-                   Margin="0 4"/>
-    <BoxContainer Name="Buttons"
-                  HorizontalAlignment="Left"
-                  Orientation="Vertical"
-                  SeparationOverride="5">
-        <!-- Buttons are added here by code -->
-    </BoxContainer>
-</BoxContainer>
diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEui.cs b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEui.cs
index 6b183362e56..1cf1e55103d 100644
--- a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEui.cs
+++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEui.cs
@@ -5,7 +5,6 @@
 using Content.Shared.Ghost.Roles;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
-using Robust.Shared.Utility;
 
 namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles
 {
@@ -77,6 +76,13 @@ public override void HandleState(EuiStateBase state)
 
             if (state is not GhostRolesEuiState ghostState)
                 return;
+
+            // We must save BodyVisible state, so all Collapsible boxes will not close
+            // on adding new ghost role.
+            // Save the current state of each Collapsible box being visible or not
+            _window.SaveCollapsibleBoxesStates();
+
+            // Clearing the container before adding new roles
             _window.ClearEntries();
 
             var entityManager = IoCManager.Resolve<IEntityManager>();
@@ -84,28 +90,32 @@ public override void HandleState(EuiStateBase state)
             var spriteSystem = sysManager.GetEntitySystem<SpriteSystem>();
             var requirementsManager = IoCManager.Resolve<JobRequirementsManager>();
 
+            // TODO: role.Requirements value doesn't work at all as an equality key, this must be fixed
+            // Grouping roles
             var groupedRoles = ghostState.GhostRoles.GroupBy(
                 role => (role.Name, role.Description, role.Requirements));
+
+            // Add a new entry for each role group
             foreach (var group in groupedRoles)
             {
                 var name = group.Key.Name;
                 var description = group.Key.Description;
-                bool hasAccess = true;
-                FormattedMessage? reason;
-
-                if (!requirementsManager.CheckRoleRequirements(group.Key.Requirements, null, out reason))
-                {
-                    hasAccess = false;
-                }
+                var hasAccess = requirementsManager.CheckRoleRequirements(
+                    group.Key.Requirements,
+                    null,
+                    out var reason);
 
+                // Adding a new role
                 _window.AddEntry(name, description, hasAccess, reason, group, spriteSystem);
             }
 
+            // Restore the Collapsible box state if it is saved
+            _window.RestoreCollapsibleBoxesStates();
+
+            // Close the rules window if it is no longer needed
             var closeRulesWindow = ghostState.GhostRoles.All(role => role.Identifier != _windowRulesId);
             if (closeRulesWindow)
-            {
                 _windowRules?.Close();
-            }
         }
     }
 }
diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesWindow.xaml.cs b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesWindow.xaml.cs
index 2e7c99641b7..627ecfe987a 100644
--- a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesWindow.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesWindow.xaml.cs
@@ -1,7 +1,10 @@
+using System.Linq;
 using Content.Shared.Ghost.Roles;
 using Robust.Client.AutoGenerated;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Utility;
 
 namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles
@@ -12,20 +15,86 @@ public sealed partial class GhostRolesWindow : DefaultWindow
         public event Action<GhostRoleInfo>? OnRoleRequestButtonClicked;
         public event Action<GhostRoleInfo>? OnRoleFollow;
 
+        private Dictionary<(string name, string description), Collapsible> _collapsibleBoxes = new();
+        private HashSet<(string name, string description)> _uncollapsedStates = new();
+
+        public GhostRolesWindow()
+        {
+            RobustXamlLoader.Load(this);
+        }
+
         public void ClearEntries()
         {
             NoRolesMessage.Visible = true;
             EntryContainer.DisposeAllChildren();
+            _collapsibleBoxes.Clear();
+        }
+
+        public void SaveCollapsibleBoxesStates()
+        {
+            _uncollapsedStates.Clear();
+            foreach (var (key, collapsible) in _collapsibleBoxes)
+            {
+                if (collapsible.BodyVisible)
+                {
+                    _uncollapsedStates.Add(key);
+                }
+            }
+        }
+
+        public void RestoreCollapsibleBoxesStates()
+        {
+            foreach (var (key, collapsible) in _collapsibleBoxes)
+            {
+                collapsible.BodyVisible = _uncollapsedStates.Contains(key);
+            }
         }
 
         public void AddEntry(string name, string description, bool hasAccess, FormattedMessage? reason, IEnumerable<GhostRoleInfo> roles, SpriteSystem spriteSystem)
         {
             NoRolesMessage.Visible = false;
 
-            var entry = new GhostRolesEntry(name, description, hasAccess, reason, roles, spriteSystem);
-            entry.OnRoleSelected += OnRoleRequestButtonClicked;
-            entry.OnRoleFollow += OnRoleFollow;
-            EntryContainer.AddChild(entry);
+            var ghostRoleInfos = roles.ToList();
+            var rolesCount = ghostRoleInfos.Count;
+
+            var info = new GhostRoleInfoBox(name, description);
+            var buttons = new GhostRoleButtonsBox(hasAccess, reason, ghostRoleInfos, spriteSystem);
+            buttons.OnRoleSelected += OnRoleRequestButtonClicked;
+            buttons.OnRoleFollow += OnRoleFollow;
+
+            EntryContainer.AddChild(info);
+
+            if (rolesCount > 1)
+            {
+                var buttonHeading = new CollapsibleHeading(Loc.GetString("ghost-roles-window-available-button", ("rolesCount", rolesCount)));
+
+                buttonHeading.AddStyleClass(ContainerButton.StyleClassButton);
+                buttonHeading.Label.HorizontalAlignment = HAlignment.Center;
+                buttonHeading.Label.HorizontalExpand = true;
+
+                var body = new CollapsibleBody
+                {
+                    Margin = new Thickness(0, 5, 0, 0),
+                };
+
+                // TODO: Add Requirements to this key when it'll be fixed and work as an equality key in GhostRolesEui
+                var key = (name, description);
+
+                var collapsible = new Collapsible(buttonHeading, body)
+                {
+                    Orientation = BoxContainer.LayoutOrientation.Vertical,
+                    Margin = new Thickness(0, 0, 0, 8),
+                };
+
+                body.AddChild(buttons);
+
+                EntryContainer.AddChild(collapsible);
+                _collapsibleBoxes.Add(key, collapsible);
+            }
+            else
+            {
+                EntryContainer.AddChild(buttons);
+            }
         }
     }
 }
diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
index 1af471f28a3..710ee7c7cbf 100644
--- a/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
+++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
@@ -157,7 +157,7 @@ public override void Update(float frameTime)
 
         var useKey = gun.UseKey ? EngineKeyFunctions.Use : EngineKeyFunctions.UseSecondary;
 
-        if (_inputSystem.CmdStates.GetState(useKey) != BoundKeyState.Down)
+        if (_inputSystem.CmdStates.GetState(useKey) != BoundKeyState.Down && !gun.BurstActivated)
         {
             if (gun.ShotCounter != 0)
                 EntityManager.RaisePredictiveEvent(new RequestStopShootEvent { Gun = GetNetEntity(gunUid) });
diff --git a/Content.IntegrationTests/Tests/Commands/PardonCommand.cs b/Content.IntegrationTests/Tests/Commands/PardonCommand.cs
index 4db9eabf5c6..9e57cd4b0e6 100644
--- a/Content.IntegrationTests/Tests/Commands/PardonCommand.cs
+++ b/Content.IntegrationTests/Tests/Commands/PardonCommand.cs
@@ -32,9 +32,9 @@ public async Task PardonTest()
             // No bans on record
             Assert.Multiple(async () =>
             {
-                Assert.That(await sDatabase.GetServerBanAsync(null, clientId, null), Is.Null);
+                Assert.That(await sDatabase.GetServerBanAsync(null, clientId, null, null), Is.Null);
                 Assert.That(await sDatabase.GetServerBanAsync(1), Is.Null);
-                Assert.That(await sDatabase.GetServerBansAsync(null, clientId, null), Is.Empty);
+                Assert.That(await sDatabase.GetServerBansAsync(null, clientId, null, null), Is.Empty);
             });
 
             // Try to pardon a ban that does not exist
@@ -43,9 +43,9 @@ public async Task PardonTest()
             // Still no bans on record
             Assert.Multiple(async () =>
             {
-                Assert.That(await sDatabase.GetServerBanAsync(null, clientId, null), Is.Null);
+                Assert.That(await sDatabase.GetServerBanAsync(null, clientId, null, null), Is.Null);
                 Assert.That(await sDatabase.GetServerBanAsync(1), Is.Null);
-                Assert.That(await sDatabase.GetServerBansAsync(null, clientId, null), Is.Empty);
+                Assert.That(await sDatabase.GetServerBansAsync(null, clientId, null, null), Is.Empty);
             });
 
             var banReason = "test";
@@ -57,9 +57,9 @@ public async Task PardonTest()
             // Should have one ban on record now
             Assert.Multiple(async () =>
             {
-                Assert.That(await sDatabase.GetServerBanAsync(null, clientId, null), Is.Not.Null);
+                Assert.That(await sDatabase.GetServerBanAsync(null, clientId, null, null), Is.Not.Null);
                 Assert.That(await sDatabase.GetServerBanAsync(1), Is.Not.Null);
-                Assert.That(await sDatabase.GetServerBansAsync(null, clientId, null), Has.Count.EqualTo(1));
+                Assert.That(await sDatabase.GetServerBansAsync(null, clientId, null, null), Has.Count.EqualTo(1));
             });
 
             await pair.RunTicksSync(5);
@@ -70,13 +70,13 @@ public async Task PardonTest()
             await server.WaitPost(() => sConsole.ExecuteCommand("pardon 2"));
 
             // The existing ban is unaffected
-            Assert.That(await sDatabase.GetServerBanAsync(null, clientId, null), Is.Not.Null);
+            Assert.That(await sDatabase.GetServerBanAsync(null, clientId, null, null), Is.Not.Null);
 
             var ban = await sDatabase.GetServerBanAsync(1);
             Assert.Multiple(async () =>
             {
                 Assert.That(ban, Is.Not.Null);
-                Assert.That(await sDatabase.GetServerBansAsync(null, clientId, null), Has.Count.EqualTo(1));
+                Assert.That(await sDatabase.GetServerBansAsync(null, clientId, null, null), Has.Count.EqualTo(1));
 
                 // Check that it matches
                 Assert.That(ban.Id, Is.EqualTo(1));
@@ -95,7 +95,7 @@ public async Task PardonTest()
             await server.WaitPost(() => sConsole.ExecuteCommand("pardon 1"));
 
             // No bans should be returned
-            Assert.That(await sDatabase.GetServerBanAsync(null, clientId, null), Is.Null);
+            Assert.That(await sDatabase.GetServerBanAsync(null, clientId, null, null), Is.Null);
 
             // Direct id lookup returns a pardoned ban
             var pardonedBan = await sDatabase.GetServerBanAsync(1);
@@ -105,7 +105,7 @@ public async Task PardonTest()
                 Assert.That(pardonedBan, Is.Not.Null);
 
                 // The list is still returned since that ignores pardons
-                Assert.That(await sDatabase.GetServerBansAsync(null, clientId, null), Has.Count.EqualTo(1));
+                Assert.That(await sDatabase.GetServerBansAsync(null, clientId, null, null), Has.Count.EqualTo(1));
 
                 Assert.That(pardonedBan.Id, Is.EqualTo(1));
                 Assert.That(pardonedBan.UserId, Is.EqualTo(clientId));
@@ -133,13 +133,13 @@ public async Task PardonTest()
             Assert.Multiple(async () =>
             {
                 // No bans should be returned
-                Assert.That(await sDatabase.GetServerBanAsync(null, clientId, null), Is.Null);
+                Assert.That(await sDatabase.GetServerBanAsync(null, clientId, null, null), Is.Null);
 
                 // Direct id lookup returns a pardoned ban
                 Assert.That(await sDatabase.GetServerBanAsync(1), Is.Not.Null);
 
                 // The list is still returned since that ignores pardons
-                Assert.That(await sDatabase.GetServerBansAsync(null, clientId, null), Has.Count.EqualTo(1));
+                Assert.That(await sDatabase.GetServerBansAsync(null, clientId, null, null), Has.Count.EqualTo(1));
             });
 
             // Reconnect client. Slightly faster than dirtying the pair.
diff --git a/Content.Server.Database/Migrations/Postgres/20241111170112_ModernHwid.Designer.cs b/Content.Server.Database/Migrations/Postgres/20241111170112_ModernHwid.Designer.cs
new file mode 100644
index 00000000000..155d6a163fd
--- /dev/null
+++ b/Content.Server.Database/Migrations/Postgres/20241111170112_ModernHwid.Designer.cs
@@ -0,0 +1,2072 @@
+// <auto-generated />
+using System;
+using System.Net;
+using System.Text.Json;
+using Content.Server.Database;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using NpgsqlTypes;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Postgres
+{
+    [DbContext(typeof(PostgresServerDbContext))]
+    [Migration("20241111170112_ModernHwid")]
+    partial class ModernHwid
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.0")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<int?>("AdminRankId")
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("text")
+                        .HasColumnName("title");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_admin");
+
+                    b.HasIndex("AdminRankId")
+                        .HasDatabaseName("IX_admin_admin_rank_id");
+
+                    b.ToTable("admin", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_flag_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("AdminId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("admin_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("flag");
+
+                    b.Property<bool>("Negative")
+                        .HasColumnType("boolean")
+                        .HasColumnName("negative");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_flag");
+
+                    b.HasIndex("AdminId")
+                        .HasDatabaseName("IX_admin_flag_admin_id");
+
+                    b.HasIndex("Flag", "AdminId")
+                        .IsUnique();
+
+                    b.ToTable("admin_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_log_id");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date");
+
+                    b.Property<short>("Impact")
+                        .HasColumnType("smallint")
+                        .HasColumnName("impact");
+
+                    b.Property<JsonDocument>("Json")
+                        .IsRequired()
+                        .HasColumnType("jsonb")
+                        .HasColumnName("json");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("message");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer")
+                        .HasColumnName("type");
+
+                    b.HasKey("RoundId", "Id")
+                        .HasName("PK_admin_log");
+
+                    b.HasIndex("Date");
+
+                    b.HasIndex("Message")
+                        .HasAnnotation("Npgsql:TsVectorConfig", "english");
+
+                    NpgsqlIndexBuilderExtensions.HasMethod(b.HasIndex("Message"), "GIN");
+
+                    b.HasIndex("Type")
+                        .HasDatabaseName("IX_admin_log_type");
+
+                    b.ToTable("admin_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("LogId")
+                        .HasColumnType("integer")
+                        .HasColumnName("log_id");
+
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.HasKey("RoundId", "LogId", "PlayerUserId")
+                        .HasName("PK_admin_log_player");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_log_player_player_user_id");
+
+                    b.ToTable("admin_log_player", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_messages_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<bool>("Dismissed")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dismissed");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("character varying(4096)")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Seen")
+                        .HasColumnType("boolean")
+                        .HasColumnName("seen");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_messages");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_messages_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_messages_round_id");
+
+                    b.ToTable("admin_messages", null, t =>
+                        {
+                            t.HasCheckConstraint("NotDismissedAndSeen", "NOT dismissed OR seen");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_notes_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("character varying(4096)")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Secret")
+                        .HasColumnType("boolean")
+                        .HasColumnName("secret");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("integer")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_notes");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_notes_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_notes_round_id");
+
+                    b.ToTable("admin_notes", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank");
+
+                    b.ToTable("admin_rank", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_flag_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("AdminRankId")
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("flag");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank_flag");
+
+                    b.HasIndex("AdminRankId");
+
+                    b.HasIndex("Flag", "AdminRankId")
+                        .IsUnique();
+
+                    b.ToTable("admin_rank_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_watchlists_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("character varying(4096)")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_watchlists");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_watchlists_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_watchlists_round_id");
+
+                    b.ToTable("admin_watchlists", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("antag_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("AntagName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("antag_name");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_antag");
+
+                    b.HasIndex("ProfileId", "AntagName")
+                        .IsUnique();
+
+                    b.ToTable("antag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AssignedUserId", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("assigned_user_id_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_assigned_user_id");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.HasIndex("UserName")
+                        .IsUnique();
+
+                    b.ToTable("assigned_user_id", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.BanTemplate", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_template_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<bool>("AutoDelete")
+                        .HasColumnType("boolean")
+                        .HasColumnName("auto_delete");
+
+                    b.Property<int>("ExemptFlags")
+                        .HasColumnType("integer")
+                        .HasColumnName("exempt_flags");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("boolean")
+                        .HasColumnName("hidden");
+
+                    b.Property<TimeSpan>("Length")
+                        .HasColumnType("interval")
+                        .HasColumnName("length");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("reason");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("integer")
+                        .HasColumnName("severity");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("title");
+
+                    b.HasKey("Id")
+                        .HasName("PK_ban_template");
+
+                    b.ToTable("ban_template", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Blacklist", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_blacklist");
+
+                    b.ToTable("blacklist", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("connection_log_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<IPAddress>("Address")
+                        .IsRequired()
+                        .HasColumnType("inet")
+                        .HasColumnName("address");
+
+                    b.Property<byte?>("Denied")
+                        .HasColumnType("smallint")
+                        .HasColumnName("denied");
+
+                    b.Property<int>("ServerId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasDefaultValue(0)
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("time");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_connection_log");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_connection_log_server_id");
+
+                    b.HasIndex("Time");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("connection_log", null, t =>
+                        {
+                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("job_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("JobName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("job_name");
+
+                    b.Property<int>("Priority")
+                        .HasColumnType("integer")
+                        .HasColumnName("priority");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_job");
+
+                    b.HasIndex("ProfileId");
+
+                    b.HasIndex("ProfileId", "JobName")
+                        .IsUnique();
+
+                    b.HasIndex(new[] { "ProfileId" }, "IX_job_one_high_priority")
+                        .IsUnique()
+                        .HasFilter("priority = 3");
+
+                    b.ToTable("job", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.PlayTime", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("play_time_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("PlayerId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_id");
+
+                    b.Property<TimeSpan>("TimeSpent")
+                        .HasColumnType("interval")
+                        .HasColumnName("time_spent");
+
+                    b.Property<string>("Tracker")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("tracker");
+
+                    b.HasKey("Id")
+                        .HasName("PK_play_time");
+
+                    b.HasIndex("PlayerId", "Tracker")
+                        .IsUnique();
+
+                    b.ToTable("play_time", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("player_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("FirstSeenTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("first_seen_time");
+
+                    b.Property<DateTime?>("LastReadRules")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_read_rules");
+
+                    b.Property<IPAddress>("LastSeenAddress")
+                        .IsRequired()
+                        .HasColumnType("inet")
+                        .HasColumnName("last_seen_address");
+
+                    b.Property<DateTime>("LastSeenTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_seen_time");
+
+                    b.Property<string>("LastSeenUserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("last_seen_user_name");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_player");
+
+                    b.HasAlternateKey("UserId")
+                        .HasName("ak_player_user_id");
+
+                    b.HasIndex("LastSeenUserName");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("player", null, t =>
+                        {
+                            t.HasCheckConstraint("LastSeenAddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= last_seen_address");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("preference_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("AdminOOCColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("admin_ooc_color");
+
+                    b.Property<int>("SelectedCharacterSlot")
+                        .HasColumnType("integer")
+                        .HasColumnName("selected_character_slot");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_preference");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("preference", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("Age")
+                        .HasColumnType("integer")
+                        .HasColumnName("age");
+
+                    b.Property<string>("CharacterName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("char_name");
+
+                    b.Property<string>("EyeColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("eye_color");
+
+                    b.Property<string>("FacialHairColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("facial_hair_color");
+
+                    b.Property<string>("FacialHairName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("facial_hair_name");
+
+                    b.Property<string>("FlavorText")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("flavor_text");
+
+                    b.Property<string>("Gender")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("gender");
+
+                    b.Property<string>("HairColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("hair_color");
+
+                    b.Property<string>("HairName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("hair_name");
+
+                    b.Property<JsonDocument>("Markings")
+                        .HasColumnType("jsonb")
+                        .HasColumnName("markings");
+
+                    b.Property<int>("PreferenceId")
+                        .HasColumnType("integer")
+                        .HasColumnName("preference_id");
+
+                    b.Property<int>("PreferenceUnavailable")
+                        .HasColumnType("integer")
+                        .HasColumnName("pref_unavailable");
+
+                    b.Property<string>("Sex")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("sex");
+
+                    b.Property<string>("SkinColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("skin_color");
+
+                    b.Property<int>("Slot")
+                        .HasColumnType("integer")
+                        .HasColumnName("slot");
+
+                    b.Property<int>("SpawnPriority")
+                        .HasColumnType("integer")
+                        .HasColumnName("spawn_priority");
+
+                    b.Property<string>("Species")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("species");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile");
+
+                    b.HasIndex("PreferenceId")
+                        .HasDatabaseName("IX_profile_preference_id");
+
+                    b.HasIndex("Slot", "PreferenceId")
+                        .IsUnique();
+
+                    b.ToTable("profile", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadout", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_loadout_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("LoadoutName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("loadout_name");
+
+                    b.Property<int>("ProfileLoadoutGroupId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_loadout_group_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_loadout");
+
+                    b.HasIndex("ProfileLoadoutGroupId");
+
+                    b.ToTable("profile_loadout", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_loadout_group_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("GroupName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("group_name");
+
+                    b.Property<int>("ProfileRoleLoadoutId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_role_loadout_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_loadout_group");
+
+                    b.HasIndex("ProfileRoleLoadoutId");
+
+                    b.ToTable("profile_loadout_group", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_role_loadout_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("RoleName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("role_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_role_loadout");
+
+                    b.HasIndex("ProfileId");
+
+                    b.ToTable("profile_role_loadout", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
+                {
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("text")
+                        .HasColumnName("role_id");
+
+                    b.HasKey("PlayerUserId", "RoleId")
+                        .HasName("PK_role_whitelists");
+
+                    b.ToTable("role_whitelists", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ServerId")
+                        .HasColumnType("integer")
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime?>("StartDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("start_date");
+
+                    b.HasKey("Id")
+                        .HasName("PK_round");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_round_server_id");
+
+                    b.HasIndex("StartDate");
+
+                    b.ToTable("round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server");
+
+                    b.ToTable("server", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_ban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<NpgsqlInet?>("Address")
+                        .HasColumnType("inet")
+                        .HasColumnName("address");
+
+                    b.Property<bool>("AutoDelete")
+                        .HasColumnType("boolean")
+                        .HasColumnName("auto_delete");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<int>("ExemptFlags")
+                        .HasColumnType("integer")
+                        .HasColumnName("exempt_flags");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("boolean")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("reason");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("integer")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_ban_round_id");
+
+                    b.ToTable("server_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
+
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanExemption", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<int>("Flags")
+                        .HasColumnType("integer")
+                        .HasColumnName("flags");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_server_ban_exemption");
+
+                    b.ToTable("server_ban_exemption", null, t =>
+                        {
+                            t.HasCheckConstraint("FlagsNotZero", "flags != 0");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_ban_hit_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.Property<int>("ConnectionId")
+                        .HasColumnType("integer")
+                        .HasColumnName("connection_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban_hit");
+
+                    b.HasIndex("BanId")
+                        .HasDatabaseName("IX_server_ban_hit_ban_id");
+
+                    b.HasIndex("ConnectionId")
+                        .HasDatabaseName("IX_server_ban_hit_connection_id");
+
+                    b.ToTable("server_ban_hit", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_role_ban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<NpgsqlInet?>("Address")
+                        .HasColumnType("inet")
+                        .HasColumnName("address");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("boolean")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("reason");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("role_id");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("integer")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_role_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_role_ban_round_id");
+
+                    b.ToTable("server_role_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
+
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("role_unban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_role_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("unban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("trait_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("TraitName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("trait_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_trait");
+
+                    b.HasIndex("ProfileId", "TraitName")
+                        .IsUnique();
+
+                    b.ToTable("trait", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.UploadedResourceLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("uploaded_resource_log_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<byte[]>("Data")
+                        .IsRequired()
+                        .HasColumnType("bytea")
+                        .HasColumnName("data");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_uploaded_resource_log");
+
+                    b.ToTable("uploaded_resource_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Whitelist", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_whitelist");
+
+                    b.ToTable("whitelist", (string)null);
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.Property<int>("PlayersId")
+                        .HasColumnType("integer")
+                        .HasColumnName("players_id");
+
+                    b.Property<int>("RoundsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("rounds_id");
+
+                    b.HasKey("PlayersId", "RoundsId")
+                        .HasName("PK_player_round");
+
+                    b.HasIndex("RoundsId")
+                        .HasDatabaseName("IX_player_round_rounds_id");
+
+                    b.ToTable("player_round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "AdminRank")
+                        .WithMany("Admins")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_admin_rank_admin_rank_id");
+
+                    b.Navigation("AdminRank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Admin", "Admin")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_flag_admin_admin_id");
+
+                    b.Navigation("Admin");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("RoundId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_round_round_id");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.AdminLog", "Log")
+                        .WithMany("Players")
+                        .HasForeignKey("RoundId", "LogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_admin_log_round_id_log_id");
+
+                    b.Navigation("Log");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminMessagesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminMessagesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminMessagesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminMessagesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_messages_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_messages_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminNotesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminNotesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminNotesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminNotesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_notes_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_notes_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "Rank")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_rank_flag_admin_rank_admin_rank_id");
+
+                    b.Navigation("Rank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminWatchlistsCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminWatchlistsDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminWatchlistsLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminWatchlistsReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_watchlists_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_watchlists_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Antags")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_antag_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("ConnectionLogs")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .IsRequired()
+                        .HasConstraintName("FK_connection_log_server_server_id");
+
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "HWId", b1 =>
+                        {
+                            b1.Property<int>("ConnectionLogId")
+                                .HasColumnType("integer")
+                                .HasColumnName("connection_log_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("bytea")
+                                .HasColumnName("hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("integer")
+                                .HasDefaultValue(0)
+                                .HasColumnName("hwid_type");
+
+                            b1.HasKey("ConnectionLogId");
+
+                            b1.ToTable("connection_log");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ConnectionLogId")
+                                .HasConstraintName("FK_connection_log_connection_log_connection_log_id");
+                        });
+
+                    b.Navigation("HWId");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Jobs")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_job_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "LastSeenHWId", b1 =>
+                        {
+                            b1.Property<int>("PlayerId")
+                                .HasColumnType("integer")
+                                .HasColumnName("player_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("bytea")
+                                .HasColumnName("last_seen_hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("integer")
+                                .HasDefaultValue(0)
+                                .HasColumnName("last_seen_hwid_type");
+
+                            b1.HasKey("PlayerId");
+
+                            b1.ToTable("player");
+
+                            b1.WithOwner()
+                                .HasForeignKey("PlayerId")
+                                .HasConstraintName("FK_player_player_player_id");
+                        });
+
+                    b.Navigation("LastSeenHWId");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.HasOne("Content.Server.Database.Preference", "Preference")
+                        .WithMany("Profiles")
+                        .HasForeignKey("PreferenceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_preference_preference_id");
+
+                    b.Navigation("Preference");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadout", b =>
+                {
+                    b.HasOne("Content.Server.Database.ProfileLoadoutGroup", "ProfileLoadoutGroup")
+                        .WithMany("Loadouts")
+                        .HasForeignKey("ProfileLoadoutGroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_loadout_profile_loadout_group_profile_loadout_group~");
+
+                    b.Navigation("ProfileLoadoutGroup");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.HasOne("Content.Server.Database.ProfileRoleLoadout", "ProfileRoleLoadout")
+                        .WithMany("Groups")
+                        .HasForeignKey("ProfileRoleLoadoutId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_loadout_group_profile_role_loadout_profile_role_loa~");
+
+                    b.Navigation("ProfileRoleLoadout");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Loadouts")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_role_loadout_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("JobWhitelists")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_role_whitelists_player_player_user_id");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("Rounds")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_round_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_ban_round_round_id");
+
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "HWId", b1 =>
+                        {
+                            b1.Property<int>("ServerBanId")
+                                .HasColumnType("integer")
+                                .HasColumnName("server_ban_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("bytea")
+                                .HasColumnName("hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("integer")
+                                .HasDefaultValue(0)
+                                .HasColumnName("hwid_type");
+
+                            b1.HasKey("ServerBanId");
+
+                            b1.ToTable("server_ban");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ServerBanId")
+                                .HasConstraintName("FK_server_ban_server_ban_server_ban_id");
+                        });
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("HWId");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithMany("BanHits")
+                        .HasForeignKey("BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_server_ban_ban_id");
+
+                    b.HasOne("Content.Server.Database.ConnectionLog", "Connection")
+                        .WithMany("BanHits")
+                        .HasForeignKey("ConnectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_connection_log_connection_id");
+
+                    b.Navigation("Ban");
+
+                    b.Navigation("Connection");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerRoleBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerRoleBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_role_ban_round_round_id");
+
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "HWId", b1 =>
+                        {
+                            b1.Property<int>("ServerRoleBanId")
+                                .HasColumnType("integer")
+                                .HasColumnName("server_role_ban_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("bytea")
+                                .HasColumnName("hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("integer")
+                                .HasDefaultValue(0)
+                                .HasColumnName("hwid_type");
+
+                            b1.HasKey("ServerRoleBanId");
+
+                            b1.ToTable("server_role_ban");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ServerRoleBanId")
+                                .HasConstraintName("FK_server_role_ban_server_role_ban_server_role_ban_id");
+                        });
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("HWId");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerRoleBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerRoleUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_role_unban_server_role_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_unban_server_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Traits")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_trait_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", null)
+                        .WithMany()
+                        .HasForeignKey("PlayersId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_player_players_id");
+
+                    b.HasOne("Content.Server.Database.Round", null)
+                        .WithMany()
+                        .HasForeignKey("RoundsId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_round_rounds_id");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Navigation("Players");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Navigation("Admins");
+
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Navigation("BanHits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Navigation("AdminLogs");
+
+                    b.Navigation("AdminMessagesCreated");
+
+                    b.Navigation("AdminMessagesDeleted");
+
+                    b.Navigation("AdminMessagesLastEdited");
+
+                    b.Navigation("AdminMessagesReceived");
+
+                    b.Navigation("AdminNotesCreated");
+
+                    b.Navigation("AdminNotesDeleted");
+
+                    b.Navigation("AdminNotesLastEdited");
+
+                    b.Navigation("AdminNotesReceived");
+
+                    b.Navigation("AdminServerBansCreated");
+
+                    b.Navigation("AdminServerBansLastEdited");
+
+                    b.Navigation("AdminServerRoleBansCreated");
+
+                    b.Navigation("AdminServerRoleBansLastEdited");
+
+                    b.Navigation("AdminWatchlistsCreated");
+
+                    b.Navigation("AdminWatchlistsDeleted");
+
+                    b.Navigation("AdminWatchlistsLastEdited");
+
+                    b.Navigation("AdminWatchlistsReceived");
+
+                    b.Navigation("JobWhitelists");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Navigation("Profiles");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Navigation("Antags");
+
+                    b.Navigation("Jobs");
+
+                    b.Navigation("Loadouts");
+
+                    b.Navigation("Traits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.Navigation("Loadouts");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.Navigation("Groups");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Navigation("AdminLogs");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Navigation("ConnectionLogs");
+
+                    b.Navigation("Rounds");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Navigation("BanHits");
+
+                    b.Navigation("Unban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Navigation("Unban");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Postgres/20241111170112_ModernHwid.cs b/Content.Server.Database/Migrations/Postgres/20241111170112_ModernHwid.cs
new file mode 100644
index 00000000000..c70a5ffaa58
--- /dev/null
+++ b/Content.Server.Database/Migrations/Postgres/20241111170112_ModernHwid.cs
@@ -0,0 +1,62 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Postgres
+{
+    /// <inheritdoc />
+    public partial class ModernHwid : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "hwid_type",
+                table: "server_role_ban",
+                type: "integer",
+                nullable: true,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "hwid_type",
+                table: "server_ban",
+                type: "integer",
+                nullable: true,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "last_seen_hwid_type",
+                table: "player",
+                type: "integer",
+                nullable: true,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "hwid_type",
+                table: "connection_log",
+                type: "integer",
+                nullable: true,
+                defaultValue: 0);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "hwid_type",
+                table: "server_role_ban");
+
+            migrationBuilder.DropColumn(
+                name: "hwid_type",
+                table: "server_ban");
+
+            migrationBuilder.DropColumn(
+                name: "last_seen_hwid_type",
+                table: "player");
+
+            migrationBuilder.DropColumn(
+                name: "hwid_type",
+                table: "connection_log");
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Postgres/20241111193608_ConnectionTrust.Designer.cs b/Content.Server.Database/Migrations/Postgres/20241111193608_ConnectionTrust.Designer.cs
new file mode 100644
index 00000000000..dc1b4a0eeb7
--- /dev/null
+++ b/Content.Server.Database/Migrations/Postgres/20241111193608_ConnectionTrust.Designer.cs
@@ -0,0 +1,2076 @@
+// <auto-generated />
+using System;
+using System.Net;
+using System.Text.Json;
+using Content.Server.Database;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using NpgsqlTypes;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Postgres
+{
+    [DbContext(typeof(PostgresServerDbContext))]
+    [Migration("20241111193608_ConnectionTrust")]
+    partial class ConnectionTrust
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.0")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<int?>("AdminRankId")
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("text")
+                        .HasColumnName("title");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_admin");
+
+                    b.HasIndex("AdminRankId")
+                        .HasDatabaseName("IX_admin_admin_rank_id");
+
+                    b.ToTable("admin", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_flag_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("AdminId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("admin_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("flag");
+
+                    b.Property<bool>("Negative")
+                        .HasColumnType("boolean")
+                        .HasColumnName("negative");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_flag");
+
+                    b.HasIndex("AdminId")
+                        .HasDatabaseName("IX_admin_flag_admin_id");
+
+                    b.HasIndex("Flag", "AdminId")
+                        .IsUnique();
+
+                    b.ToTable("admin_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_log_id");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date");
+
+                    b.Property<short>("Impact")
+                        .HasColumnType("smallint")
+                        .HasColumnName("impact");
+
+                    b.Property<JsonDocument>("Json")
+                        .IsRequired()
+                        .HasColumnType("jsonb")
+                        .HasColumnName("json");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("message");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer")
+                        .HasColumnName("type");
+
+                    b.HasKey("RoundId", "Id")
+                        .HasName("PK_admin_log");
+
+                    b.HasIndex("Date");
+
+                    b.HasIndex("Message")
+                        .HasAnnotation("Npgsql:TsVectorConfig", "english");
+
+                    NpgsqlIndexBuilderExtensions.HasMethod(b.HasIndex("Message"), "GIN");
+
+                    b.HasIndex("Type")
+                        .HasDatabaseName("IX_admin_log_type");
+
+                    b.ToTable("admin_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("LogId")
+                        .HasColumnType("integer")
+                        .HasColumnName("log_id");
+
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.HasKey("RoundId", "LogId", "PlayerUserId")
+                        .HasName("PK_admin_log_player");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_log_player_player_user_id");
+
+                    b.ToTable("admin_log_player", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_messages_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<bool>("Dismissed")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dismissed");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("character varying(4096)")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Seen")
+                        .HasColumnType("boolean")
+                        .HasColumnName("seen");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_messages");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_messages_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_messages_round_id");
+
+                    b.ToTable("admin_messages", null, t =>
+                        {
+                            t.HasCheckConstraint("NotDismissedAndSeen", "NOT dismissed OR seen");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_notes_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("character varying(4096)")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Secret")
+                        .HasColumnType("boolean")
+                        .HasColumnName("secret");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("integer")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_notes");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_notes_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_notes_round_id");
+
+                    b.ToTable("admin_notes", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank");
+
+                    b.ToTable("admin_rank", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_flag_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("AdminRankId")
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("flag");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank_flag");
+
+                    b.HasIndex("AdminRankId");
+
+                    b.HasIndex("Flag", "AdminRankId")
+                        .IsUnique();
+
+                    b.ToTable("admin_rank_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_watchlists_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("character varying(4096)")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_watchlists");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_watchlists_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_watchlists_round_id");
+
+                    b.ToTable("admin_watchlists", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("antag_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("AntagName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("antag_name");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_antag");
+
+                    b.HasIndex("ProfileId", "AntagName")
+                        .IsUnique();
+
+                    b.ToTable("antag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AssignedUserId", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("assigned_user_id_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_assigned_user_id");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.HasIndex("UserName")
+                        .IsUnique();
+
+                    b.ToTable("assigned_user_id", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.BanTemplate", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_template_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<bool>("AutoDelete")
+                        .HasColumnType("boolean")
+                        .HasColumnName("auto_delete");
+
+                    b.Property<int>("ExemptFlags")
+                        .HasColumnType("integer")
+                        .HasColumnName("exempt_flags");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("boolean")
+                        .HasColumnName("hidden");
+
+                    b.Property<TimeSpan>("Length")
+                        .HasColumnType("interval")
+                        .HasColumnName("length");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("reason");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("integer")
+                        .HasColumnName("severity");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("title");
+
+                    b.HasKey("Id")
+                        .HasName("PK_ban_template");
+
+                    b.ToTable("ban_template", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Blacklist", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_blacklist");
+
+                    b.ToTable("blacklist", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("connection_log_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<IPAddress>("Address")
+                        .IsRequired()
+                        .HasColumnType("inet")
+                        .HasColumnName("address");
+
+                    b.Property<byte?>("Denied")
+                        .HasColumnType("smallint")
+                        .HasColumnName("denied");
+
+                    b.Property<int>("ServerId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasDefaultValue(0)
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("time");
+
+                    b.Property<float>("Trust")
+                        .HasColumnType("real")
+                        .HasColumnName("trust");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_connection_log");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_connection_log_server_id");
+
+                    b.HasIndex("Time");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("connection_log", null, t =>
+                        {
+                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("job_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("JobName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("job_name");
+
+                    b.Property<int>("Priority")
+                        .HasColumnType("integer")
+                        .HasColumnName("priority");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_job");
+
+                    b.HasIndex("ProfileId");
+
+                    b.HasIndex("ProfileId", "JobName")
+                        .IsUnique();
+
+                    b.HasIndex(new[] { "ProfileId" }, "IX_job_one_high_priority")
+                        .IsUnique()
+                        .HasFilter("priority = 3");
+
+                    b.ToTable("job", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.PlayTime", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("play_time_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("PlayerId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_id");
+
+                    b.Property<TimeSpan>("TimeSpent")
+                        .HasColumnType("interval")
+                        .HasColumnName("time_spent");
+
+                    b.Property<string>("Tracker")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("tracker");
+
+                    b.HasKey("Id")
+                        .HasName("PK_play_time");
+
+                    b.HasIndex("PlayerId", "Tracker")
+                        .IsUnique();
+
+                    b.ToTable("play_time", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("player_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("FirstSeenTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("first_seen_time");
+
+                    b.Property<DateTime?>("LastReadRules")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_read_rules");
+
+                    b.Property<IPAddress>("LastSeenAddress")
+                        .IsRequired()
+                        .HasColumnType("inet")
+                        .HasColumnName("last_seen_address");
+
+                    b.Property<DateTime>("LastSeenTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_seen_time");
+
+                    b.Property<string>("LastSeenUserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("last_seen_user_name");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_player");
+
+                    b.HasAlternateKey("UserId")
+                        .HasName("ak_player_user_id");
+
+                    b.HasIndex("LastSeenUserName");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("player", null, t =>
+                        {
+                            t.HasCheckConstraint("LastSeenAddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= last_seen_address");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("preference_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("AdminOOCColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("admin_ooc_color");
+
+                    b.Property<int>("SelectedCharacterSlot")
+                        .HasColumnType("integer")
+                        .HasColumnName("selected_character_slot");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_preference");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("preference", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("Age")
+                        .HasColumnType("integer")
+                        .HasColumnName("age");
+
+                    b.Property<string>("CharacterName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("char_name");
+
+                    b.Property<string>("EyeColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("eye_color");
+
+                    b.Property<string>("FacialHairColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("facial_hair_color");
+
+                    b.Property<string>("FacialHairName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("facial_hair_name");
+
+                    b.Property<string>("FlavorText")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("flavor_text");
+
+                    b.Property<string>("Gender")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("gender");
+
+                    b.Property<string>("HairColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("hair_color");
+
+                    b.Property<string>("HairName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("hair_name");
+
+                    b.Property<JsonDocument>("Markings")
+                        .HasColumnType("jsonb")
+                        .HasColumnName("markings");
+
+                    b.Property<int>("PreferenceId")
+                        .HasColumnType("integer")
+                        .HasColumnName("preference_id");
+
+                    b.Property<int>("PreferenceUnavailable")
+                        .HasColumnType("integer")
+                        .HasColumnName("pref_unavailable");
+
+                    b.Property<string>("Sex")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("sex");
+
+                    b.Property<string>("SkinColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("skin_color");
+
+                    b.Property<int>("Slot")
+                        .HasColumnType("integer")
+                        .HasColumnName("slot");
+
+                    b.Property<int>("SpawnPriority")
+                        .HasColumnType("integer")
+                        .HasColumnName("spawn_priority");
+
+                    b.Property<string>("Species")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("species");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile");
+
+                    b.HasIndex("PreferenceId")
+                        .HasDatabaseName("IX_profile_preference_id");
+
+                    b.HasIndex("Slot", "PreferenceId")
+                        .IsUnique();
+
+                    b.ToTable("profile", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadout", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_loadout_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("LoadoutName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("loadout_name");
+
+                    b.Property<int>("ProfileLoadoutGroupId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_loadout_group_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_loadout");
+
+                    b.HasIndex("ProfileLoadoutGroupId");
+
+                    b.ToTable("profile_loadout", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_loadout_group_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("GroupName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("group_name");
+
+                    b.Property<int>("ProfileRoleLoadoutId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_role_loadout_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_loadout_group");
+
+                    b.HasIndex("ProfileRoleLoadoutId");
+
+                    b.ToTable("profile_loadout_group", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_role_loadout_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("RoleName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("role_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_role_loadout");
+
+                    b.HasIndex("ProfileId");
+
+                    b.ToTable("profile_role_loadout", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
+                {
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("text")
+                        .HasColumnName("role_id");
+
+                    b.HasKey("PlayerUserId", "RoleId")
+                        .HasName("PK_role_whitelists");
+
+                    b.ToTable("role_whitelists", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ServerId")
+                        .HasColumnType("integer")
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime?>("StartDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("start_date");
+
+                    b.HasKey("Id")
+                        .HasName("PK_round");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_round_server_id");
+
+                    b.HasIndex("StartDate");
+
+                    b.ToTable("round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server");
+
+                    b.ToTable("server", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_ban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<NpgsqlInet?>("Address")
+                        .HasColumnType("inet")
+                        .HasColumnName("address");
+
+                    b.Property<bool>("AutoDelete")
+                        .HasColumnType("boolean")
+                        .HasColumnName("auto_delete");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<int>("ExemptFlags")
+                        .HasColumnType("integer")
+                        .HasColumnName("exempt_flags");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("boolean")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("reason");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("integer")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_ban_round_id");
+
+                    b.ToTable("server_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
+
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanExemption", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<int>("Flags")
+                        .HasColumnType("integer")
+                        .HasColumnName("flags");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_server_ban_exemption");
+
+                    b.ToTable("server_ban_exemption", null, t =>
+                        {
+                            t.HasCheckConstraint("FlagsNotZero", "flags != 0");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_ban_hit_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.Property<int>("ConnectionId")
+                        .HasColumnType("integer")
+                        .HasColumnName("connection_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban_hit");
+
+                    b.HasIndex("BanId")
+                        .HasDatabaseName("IX_server_ban_hit_ban_id");
+
+                    b.HasIndex("ConnectionId")
+                        .HasDatabaseName("IX_server_ban_hit_connection_id");
+
+                    b.ToTable("server_ban_hit", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_role_ban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<NpgsqlInet?>("Address")
+                        .HasColumnType("inet")
+                        .HasColumnName("address");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("boolean")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("reason");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("role_id");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("integer")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_role_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_role_ban_round_id");
+
+                    b.ToTable("server_role_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
+
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("role_unban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_role_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("unban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("trait_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("TraitName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("trait_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_trait");
+
+                    b.HasIndex("ProfileId", "TraitName")
+                        .IsUnique();
+
+                    b.ToTable("trait", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.UploadedResourceLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("uploaded_resource_log_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<byte[]>("Data")
+                        .IsRequired()
+                        .HasColumnType("bytea")
+                        .HasColumnName("data");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_uploaded_resource_log");
+
+                    b.ToTable("uploaded_resource_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Whitelist", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_whitelist");
+
+                    b.ToTable("whitelist", (string)null);
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.Property<int>("PlayersId")
+                        .HasColumnType("integer")
+                        .HasColumnName("players_id");
+
+                    b.Property<int>("RoundsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("rounds_id");
+
+                    b.HasKey("PlayersId", "RoundsId")
+                        .HasName("PK_player_round");
+
+                    b.HasIndex("RoundsId")
+                        .HasDatabaseName("IX_player_round_rounds_id");
+
+                    b.ToTable("player_round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "AdminRank")
+                        .WithMany("Admins")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_admin_rank_admin_rank_id");
+
+                    b.Navigation("AdminRank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Admin", "Admin")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_flag_admin_admin_id");
+
+                    b.Navigation("Admin");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("RoundId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_round_round_id");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.AdminLog", "Log")
+                        .WithMany("Players")
+                        .HasForeignKey("RoundId", "LogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_admin_log_round_id_log_id");
+
+                    b.Navigation("Log");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminMessagesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminMessagesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminMessagesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminMessagesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_messages_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_messages_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminNotesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminNotesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminNotesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminNotesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_notes_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_notes_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "Rank")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_rank_flag_admin_rank_admin_rank_id");
+
+                    b.Navigation("Rank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminWatchlistsCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminWatchlistsDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminWatchlistsLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminWatchlistsReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_watchlists_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_watchlists_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Antags")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_antag_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("ConnectionLogs")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .IsRequired()
+                        .HasConstraintName("FK_connection_log_server_server_id");
+
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "HWId", b1 =>
+                        {
+                            b1.Property<int>("ConnectionLogId")
+                                .HasColumnType("integer")
+                                .HasColumnName("connection_log_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("bytea")
+                                .HasColumnName("hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("integer")
+                                .HasDefaultValue(0)
+                                .HasColumnName("hwid_type");
+
+                            b1.HasKey("ConnectionLogId");
+
+                            b1.ToTable("connection_log");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ConnectionLogId")
+                                .HasConstraintName("FK_connection_log_connection_log_connection_log_id");
+                        });
+
+                    b.Navigation("HWId");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Jobs")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_job_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "LastSeenHWId", b1 =>
+                        {
+                            b1.Property<int>("PlayerId")
+                                .HasColumnType("integer")
+                                .HasColumnName("player_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("bytea")
+                                .HasColumnName("last_seen_hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("integer")
+                                .HasDefaultValue(0)
+                                .HasColumnName("last_seen_hwid_type");
+
+                            b1.HasKey("PlayerId");
+
+                            b1.ToTable("player");
+
+                            b1.WithOwner()
+                                .HasForeignKey("PlayerId")
+                                .HasConstraintName("FK_player_player_player_id");
+                        });
+
+                    b.Navigation("LastSeenHWId");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.HasOne("Content.Server.Database.Preference", "Preference")
+                        .WithMany("Profiles")
+                        .HasForeignKey("PreferenceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_preference_preference_id");
+
+                    b.Navigation("Preference");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadout", b =>
+                {
+                    b.HasOne("Content.Server.Database.ProfileLoadoutGroup", "ProfileLoadoutGroup")
+                        .WithMany("Loadouts")
+                        .HasForeignKey("ProfileLoadoutGroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_loadout_profile_loadout_group_profile_loadout_group~");
+
+                    b.Navigation("ProfileLoadoutGroup");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.HasOne("Content.Server.Database.ProfileRoleLoadout", "ProfileRoleLoadout")
+                        .WithMany("Groups")
+                        .HasForeignKey("ProfileRoleLoadoutId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_loadout_group_profile_role_loadout_profile_role_loa~");
+
+                    b.Navigation("ProfileRoleLoadout");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Loadouts")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_role_loadout_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("JobWhitelists")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_role_whitelists_player_player_user_id");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("Rounds")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_round_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_ban_round_round_id");
+
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "HWId", b1 =>
+                        {
+                            b1.Property<int>("ServerBanId")
+                                .HasColumnType("integer")
+                                .HasColumnName("server_ban_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("bytea")
+                                .HasColumnName("hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("integer")
+                                .HasDefaultValue(0)
+                                .HasColumnName("hwid_type");
+
+                            b1.HasKey("ServerBanId");
+
+                            b1.ToTable("server_ban");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ServerBanId")
+                                .HasConstraintName("FK_server_ban_server_ban_server_ban_id");
+                        });
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("HWId");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithMany("BanHits")
+                        .HasForeignKey("BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_server_ban_ban_id");
+
+                    b.HasOne("Content.Server.Database.ConnectionLog", "Connection")
+                        .WithMany("BanHits")
+                        .HasForeignKey("ConnectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_connection_log_connection_id");
+
+                    b.Navigation("Ban");
+
+                    b.Navigation("Connection");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerRoleBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerRoleBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_role_ban_round_round_id");
+
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "HWId", b1 =>
+                        {
+                            b1.Property<int>("ServerRoleBanId")
+                                .HasColumnType("integer")
+                                .HasColumnName("server_role_ban_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("bytea")
+                                .HasColumnName("hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("integer")
+                                .HasDefaultValue(0)
+                                .HasColumnName("hwid_type");
+
+                            b1.HasKey("ServerRoleBanId");
+
+                            b1.ToTable("server_role_ban");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ServerRoleBanId")
+                                .HasConstraintName("FK_server_role_ban_server_role_ban_server_role_ban_id");
+                        });
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("HWId");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerRoleBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerRoleUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_role_unban_server_role_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_unban_server_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Traits")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_trait_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", null)
+                        .WithMany()
+                        .HasForeignKey("PlayersId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_player_players_id");
+
+                    b.HasOne("Content.Server.Database.Round", null)
+                        .WithMany()
+                        .HasForeignKey("RoundsId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_round_rounds_id");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Navigation("Players");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Navigation("Admins");
+
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Navigation("BanHits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Navigation("AdminLogs");
+
+                    b.Navigation("AdminMessagesCreated");
+
+                    b.Navigation("AdminMessagesDeleted");
+
+                    b.Navigation("AdminMessagesLastEdited");
+
+                    b.Navigation("AdminMessagesReceived");
+
+                    b.Navigation("AdminNotesCreated");
+
+                    b.Navigation("AdminNotesDeleted");
+
+                    b.Navigation("AdminNotesLastEdited");
+
+                    b.Navigation("AdminNotesReceived");
+
+                    b.Navigation("AdminServerBansCreated");
+
+                    b.Navigation("AdminServerBansLastEdited");
+
+                    b.Navigation("AdminServerRoleBansCreated");
+
+                    b.Navigation("AdminServerRoleBansLastEdited");
+
+                    b.Navigation("AdminWatchlistsCreated");
+
+                    b.Navigation("AdminWatchlistsDeleted");
+
+                    b.Navigation("AdminWatchlistsLastEdited");
+
+                    b.Navigation("AdminWatchlistsReceived");
+
+                    b.Navigation("JobWhitelists");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Navigation("Profiles");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Navigation("Antags");
+
+                    b.Navigation("Jobs");
+
+                    b.Navigation("Loadouts");
+
+                    b.Navigation("Traits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.Navigation("Loadouts");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.Navigation("Groups");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Navigation("AdminLogs");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Navigation("ConnectionLogs");
+
+                    b.Navigation("Rounds");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Navigation("BanHits");
+
+                    b.Navigation("Unban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Navigation("Unban");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Postgres/20241111193608_ConnectionTrust.cs b/Content.Server.Database/Migrations/Postgres/20241111193608_ConnectionTrust.cs
new file mode 100644
index 00000000000..debb36aaccb
--- /dev/null
+++ b/Content.Server.Database/Migrations/Postgres/20241111193608_ConnectionTrust.cs
@@ -0,0 +1,29 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Postgres
+{
+    /// <inheritdoc />
+    public partial class ConnectionTrust : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<float>(
+                name: "trust",
+                table: "connection_log",
+                type: "real",
+                nullable: false,
+                defaultValue: 0f);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "trust",
+                table: "connection_log");
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs b/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
index 1f64f6e51a5..75444386311 100644
--- a/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
+++ b/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
@@ -512,20 +512,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.ToTable("assigned_user_id", (string)null);
                 });
 
-            modelBuilder.Entity("Content.Server.Database.Blacklist",
-                b =>
-                {
-                    b.Property<Guid>("UserId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid")
-                        .HasColumnName("user_id");
-
-                    b.HasKey("UserId")
-                        .HasName("PK_blacklist");
-
-                    b.ToTable("blacklist", (string) null);
-                });
-
             modelBuilder.Entity("Content.Server.Database.BanTemplate", b =>
                 {
                     b.Property<int>("Id")
@@ -571,6 +557,19 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.ToTable("ban_template", (string)null);
                 });
 
+            modelBuilder.Entity("Content.Server.Database.Blacklist", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_blacklist");
+
+                    b.ToTable("blacklist", (string)null);
+                });
+
             modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
                 {
                     b.Property<int>("Id")
@@ -589,10 +588,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("smallint")
                         .HasColumnName("denied");
 
-                    b.Property<byte[]>("HWId")
-                        .HasColumnType("bytea")
-                        .HasColumnName("hwid");
-
                     b.Property<int>("ServerId")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("integer")
@@ -603,6 +598,10 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("time");
 
+                    b.Property<float>("Trust")
+                        .HasColumnType("real")
+                        .HasColumnName("trust");
+
                     b.Property<Guid>("UserId")
                         .HasColumnType("uuid")
                         .HasColumnName("user_id");
@@ -718,10 +717,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("inet")
                         .HasColumnName("last_seen_address");
 
-                    b.Property<byte[]>("LastSeenHWId")
-                        .HasColumnType("bytea")
-                        .HasColumnName("last_seen_hwid");
-
                     b.Property<DateTime>("LastSeenTime")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("last_seen_time");
@@ -1058,10 +1053,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("expiration_time");
 
-                    b.Property<byte[]>("HWId")
-                        .HasColumnType("bytea")
-                        .HasColumnName("hwid");
-
                     b.Property<bool>("Hidden")
                         .HasColumnType("boolean")
                         .HasColumnName("hidden");
@@ -1192,10 +1183,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("expiration_time");
 
-                    b.Property<byte[]>("HWId")
-                        .HasColumnType("bytea")
-                        .HasColumnName("hwid");
-
                     b.Property<bool>("Hidden")
                         .HasColumnType("boolean")
                         .HasColumnName("hidden");
@@ -1637,6 +1624,34 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .IsRequired()
                         .HasConstraintName("FK_connection_log_server_server_id");
 
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "HWId", b1 =>
+                        {
+                            b1.Property<int>("ConnectionLogId")
+                                .HasColumnType("integer")
+                                .HasColumnName("connection_log_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("bytea")
+                                .HasColumnName("hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("integer")
+                                .HasDefaultValue(0)
+                                .HasColumnName("hwid_type");
+
+                            b1.HasKey("ConnectionLogId");
+
+                            b1.ToTable("connection_log");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ConnectionLogId")
+                                .HasConstraintName("FK_connection_log_connection_log_connection_log_id");
+                        });
+
+                    b.Navigation("HWId");
+
                     b.Navigation("Server");
                 });
 
@@ -1652,6 +1667,37 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Navigation("Profile");
                 });
 
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "LastSeenHWId", b1 =>
+                        {
+                            b1.Property<int>("PlayerId")
+                                .HasColumnType("integer")
+                                .HasColumnName("player_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("bytea")
+                                .HasColumnName("last_seen_hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("integer")
+                                .HasDefaultValue(0)
+                                .HasColumnName("last_seen_hwid_type");
+
+                            b1.HasKey("PlayerId");
+
+                            b1.ToTable("player");
+
+                            b1.WithOwner()
+                                .HasForeignKey("PlayerId")
+                                .HasConstraintName("FK_player_player_player_id");
+                        });
+
+                    b.Navigation("LastSeenHWId");
+                });
+
             modelBuilder.Entity("Content.Server.Database.Profile", b =>
                 {
                     b.HasOne("Content.Server.Database.Preference", "Preference")
@@ -1746,8 +1792,36 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasForeignKey("RoundId")
                         .HasConstraintName("FK_server_ban_round_round_id");
 
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "HWId", b1 =>
+                        {
+                            b1.Property<int>("ServerBanId")
+                                .HasColumnType("integer")
+                                .HasColumnName("server_ban_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("bytea")
+                                .HasColumnName("hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("integer")
+                                .HasDefaultValue(0)
+                                .HasColumnName("hwid_type");
+
+                            b1.HasKey("ServerBanId");
+
+                            b1.ToTable("server_ban");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ServerBanId")
+                                .HasConstraintName("FK_server_ban_server_ban_server_ban_id");
+                        });
+
                     b.Navigation("CreatedBy");
 
+                    b.Navigation("HWId");
+
                     b.Navigation("LastEditedBy");
 
                     b.Navigation("Round");
@@ -1795,8 +1869,36 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasForeignKey("RoundId")
                         .HasConstraintName("FK_server_role_ban_round_round_id");
 
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "HWId", b1 =>
+                        {
+                            b1.Property<int>("ServerRoleBanId")
+                                .HasColumnType("integer")
+                                .HasColumnName("server_role_ban_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("bytea")
+                                .HasColumnName("hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("integer")
+                                .HasDefaultValue(0)
+                                .HasColumnName("hwid_type");
+
+                            b1.HasKey("ServerRoleBanId");
+
+                            b1.ToTable("server_role_ban");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ServerRoleBanId")
+                                .HasConstraintName("FK_server_role_ban_server_role_ban_server_role_ban_id");
+                        });
+
                     b.Navigation("CreatedBy");
 
+                    b.Navigation("HWId");
+
                     b.Navigation("LastEditedBy");
 
                     b.Navigation("Round");
diff --git a/Content.Server.Database/Migrations/Sqlite/20241111170107_ModernHwid.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20241111170107_ModernHwid.Designer.cs
new file mode 100644
index 00000000000..56a9fe0a059
--- /dev/null
+++ b/Content.Server.Database/Migrations/Sqlite/20241111170107_ModernHwid.Designer.cs
@@ -0,0 +1,1995 @@
+// <auto-generated />
+using System;
+using Content.Server.Database;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Sqlite
+{
+    [DbContext(typeof(SqliteServerDbContext))]
+    [Migration("20241111170107_ModernHwid")]
+    partial class ModernHwid
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "8.0.0");
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<int?>("AdminRankId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("title");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_admin");
+
+                    b.HasIndex("AdminRankId")
+                        .HasDatabaseName("IX_admin_admin_rank_id");
+
+                    b.ToTable("admin", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_flag_id");
+
+                    b.Property<Guid>("AdminId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("admin_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("flag");
+
+                    b.Property<bool>("Negative")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("negative");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_flag");
+
+                    b.HasIndex("AdminId")
+                        .HasDatabaseName("IX_admin_flag_admin_id");
+
+                    b.HasIndex("Flag", "AdminId")
+                        .IsUnique();
+
+                    b.ToTable("admin_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Id")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_log_id");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("date");
+
+                    b.Property<sbyte>("Impact")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("impact");
+
+                    b.Property<string>("Json")
+                        .IsRequired()
+                        .HasColumnType("jsonb")
+                        .HasColumnName("json");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("type");
+
+                    b.HasKey("RoundId", "Id")
+                        .HasName("PK_admin_log");
+
+                    b.HasIndex("Date");
+
+                    b.HasIndex("Type")
+                        .HasDatabaseName("IX_admin_log_type");
+
+                    b.ToTable("admin_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("LogId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("log_id");
+
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.HasKey("RoundId", "LogId", "PlayerUserId")
+                        .HasName("PK_admin_log_player");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_log_player_player_user_id");
+
+                    b.ToTable("admin_log_player", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_messages_id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<bool>("Dismissed")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("dismissed");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Seen")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("seen");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_messages");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_messages_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_messages_round_id");
+
+                    b.ToTable("admin_messages", null, t =>
+                        {
+                            t.HasCheckConstraint("NotDismissedAndSeen", "NOT dismissed OR seen");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_notes_id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Secret")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("secret");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_notes");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_notes_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_notes_round_id");
+
+                    b.ToTable("admin_notes", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank");
+
+                    b.ToTable("admin_rank", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_flag_id");
+
+                    b.Property<int>("AdminRankId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("flag");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank_flag");
+
+                    b.HasIndex("AdminRankId");
+
+                    b.HasIndex("Flag", "AdminRankId")
+                        .IsUnique();
+
+                    b.ToTable("admin_rank_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_watchlists_id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_watchlists");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_watchlists_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_watchlists_round_id");
+
+                    b.ToTable("admin_watchlists", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("antag_id");
+
+                    b.Property<string>("AntagName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("antag_name");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_antag");
+
+                    b.HasIndex("ProfileId", "AntagName")
+                        .IsUnique();
+
+                    b.ToTable("antag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AssignedUserId", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("assigned_user_id_id");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_assigned_user_id");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.HasIndex("UserName")
+                        .IsUnique();
+
+                    b.ToTable("assigned_user_id", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.BanTemplate", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_template_id");
+
+                    b.Property<bool>("AutoDelete")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("auto_delete");
+
+                    b.Property<int>("ExemptFlags")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("exempt_flags");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("hidden");
+
+                    b.Property<TimeSpan>("Length")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("length");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("reason");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("title");
+
+                    b.HasKey("Id")
+                        .HasName("PK_ban_template");
+
+                    b.ToTable("ban_template", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Blacklist", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_blacklist");
+
+                    b.ToTable("blacklist", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("connection_log_id");
+
+                    b.Property<string>("Address")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<byte?>("Denied")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("denied");
+
+                    b.Property<int>("ServerId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasDefaultValue(0)
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("time");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_connection_log");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_connection_log_server_id");
+
+                    b.HasIndex("Time");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("connection_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("job_id");
+
+                    b.Property<string>("JobName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("job_name");
+
+                    b.Property<int>("Priority")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("priority");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_job");
+
+                    b.HasIndex("ProfileId");
+
+                    b.HasIndex("ProfileId", "JobName")
+                        .IsUnique();
+
+                    b.HasIndex(new[] { "ProfileId" }, "IX_job_one_high_priority")
+                        .IsUnique()
+                        .HasFilter("priority = 3");
+
+                    b.ToTable("job", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.PlayTime", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("play_time_id");
+
+                    b.Property<Guid>("PlayerId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_id");
+
+                    b.Property<TimeSpan>("TimeSpent")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("time_spent");
+
+                    b.Property<string>("Tracker")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("tracker");
+
+                    b.HasKey("Id")
+                        .HasName("PK_play_time");
+
+                    b.HasIndex("PlayerId", "Tracker")
+                        .IsUnique();
+
+                    b.ToTable("play_time", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("player_id");
+
+                    b.Property<DateTime>("FirstSeenTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("first_seen_time");
+
+                    b.Property<DateTime?>("LastReadRules")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_read_rules");
+
+                    b.Property<string>("LastSeenAddress")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_seen_address");
+
+                    b.Property<DateTime>("LastSeenTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_seen_time");
+
+                    b.Property<string>("LastSeenUserName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_seen_user_name");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_player");
+
+                    b.HasAlternateKey("UserId")
+                        .HasName("ak_player_user_id");
+
+                    b.HasIndex("LastSeenUserName");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("player", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("preference_id");
+
+                    b.Property<string>("AdminOOCColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("admin_ooc_color");
+
+                    b.Property<int>("SelectedCharacterSlot")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("selected_character_slot");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_preference");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("preference", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.Property<int>("Age")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("age");
+
+                    b.Property<string>("CharacterName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("char_name");
+
+                    b.Property<string>("EyeColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("eye_color");
+
+                    b.Property<string>("FacialHairColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("facial_hair_color");
+
+                    b.Property<string>("FacialHairName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("facial_hair_name");
+
+                    b.Property<string>("FlavorText")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("flavor_text");
+
+                    b.Property<string>("Gender")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("gender");
+
+                    b.Property<string>("HairColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("hair_color");
+
+                    b.Property<string>("HairName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("hair_name");
+
+                    b.Property<byte[]>("Markings")
+                        .HasColumnType("jsonb")
+                        .HasColumnName("markings");
+
+                    b.Property<int>("PreferenceId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("preference_id");
+
+                    b.Property<int>("PreferenceUnavailable")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("pref_unavailable");
+
+                    b.Property<string>("Sex")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("sex");
+
+                    b.Property<string>("SkinColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("skin_color");
+
+                    b.Property<int>("Slot")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("slot");
+
+                    b.Property<int>("SpawnPriority")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("spawn_priority");
+
+                    b.Property<string>("Species")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("species");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile");
+
+                    b.HasIndex("PreferenceId")
+                        .HasDatabaseName("IX_profile_preference_id");
+
+                    b.HasIndex("Slot", "PreferenceId")
+                        .IsUnique();
+
+                    b.ToTable("profile", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadout", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_loadout_id");
+
+                    b.Property<string>("LoadoutName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("loadout_name");
+
+                    b.Property<int>("ProfileLoadoutGroupId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_loadout_group_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_loadout");
+
+                    b.HasIndex("ProfileLoadoutGroupId");
+
+                    b.ToTable("profile_loadout", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_loadout_group_id");
+
+                    b.Property<string>("GroupName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("group_name");
+
+                    b.Property<int>("ProfileRoleLoadoutId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_role_loadout_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_loadout_group");
+
+                    b.HasIndex("ProfileRoleLoadoutId");
+
+                    b.ToTable("profile_loadout_group", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_role_loadout_id");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("RoleName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("role_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_role_loadout");
+
+                    b.HasIndex("ProfileId");
+
+                    b.ToTable("profile_role_loadout", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
+                {
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("role_id");
+
+                    b.HasKey("PlayerUserId", "RoleId")
+                        .HasName("PK_role_whitelists");
+
+                    b.ToTable("role_whitelists", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("ServerId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime?>("StartDate")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("start_date");
+
+                    b.HasKey("Id")
+                        .HasName("PK_round");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_round_server_id");
+
+                    b.HasIndex("StartDate");
+
+                    b.ToTable("round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_id");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server");
+
+                    b.ToTable("server", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_ban_id");
+
+                    b.Property<string>("Address")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<bool>("AutoDelete")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("auto_delete");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<int>("ExemptFlags")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("exempt_flags");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("reason");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_ban_round_id");
+
+                    b.ToTable("server_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanExemption", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<int>("Flags")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("flags");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_server_ban_exemption");
+
+                    b.ToTable("server_ban_exemption", null, t =>
+                        {
+                            t.HasCheckConstraint("FlagsNotZero", "flags != 0");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_ban_hit_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<int>("ConnectionId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("connection_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban_hit");
+
+                    b.HasIndex("BanId")
+                        .HasDatabaseName("IX_server_ban_hit_ban_id");
+
+                    b.HasIndex("ConnectionId")
+                        .HasDatabaseName("IX_server_ban_hit_connection_id");
+
+                    b.ToTable("server_ban_hit", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_role_ban_id");
+
+                    b.Property<string>("Address")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("reason");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("role_id");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_role_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_role_ban_round_id");
+
+                    b.ToTable("server_role_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("role_unban_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_role_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("unban_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("trait_id");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("TraitName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("trait_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_trait");
+
+                    b.HasIndex("ProfileId", "TraitName")
+                        .IsUnique();
+
+                    b.ToTable("trait", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.UploadedResourceLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("uploaded_resource_log_id");
+
+                    b.Property<byte[]>("Data")
+                        .IsRequired()
+                        .HasColumnType("BLOB")
+                        .HasColumnName("data");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("date");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("path");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_uploaded_resource_log");
+
+                    b.ToTable("uploaded_resource_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Whitelist", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_whitelist");
+
+                    b.ToTable("whitelist", (string)null);
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.Property<int>("PlayersId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("players_id");
+
+                    b.Property<int>("RoundsId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("rounds_id");
+
+                    b.HasKey("PlayersId", "RoundsId")
+                        .HasName("PK_player_round");
+
+                    b.HasIndex("RoundsId")
+                        .HasDatabaseName("IX_player_round_rounds_id");
+
+                    b.ToTable("player_round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "AdminRank")
+                        .WithMany("Admins")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_admin_rank_admin_rank_id");
+
+                    b.Navigation("AdminRank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Admin", "Admin")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_flag_admin_admin_id");
+
+                    b.Navigation("Admin");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("RoundId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_round_round_id");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.AdminLog", "Log")
+                        .WithMany("Players")
+                        .HasForeignKey("RoundId", "LogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_admin_log_round_id_log_id");
+
+                    b.Navigation("Log");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminMessagesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminMessagesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminMessagesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminMessagesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_messages_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_messages_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminNotesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminNotesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminNotesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminNotesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_notes_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_notes_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "Rank")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_rank_flag_admin_rank_admin_rank_id");
+
+                    b.Navigation("Rank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminWatchlistsCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminWatchlistsDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminWatchlistsLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminWatchlistsReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_watchlists_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_watchlists_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Antags")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_antag_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("ConnectionLogs")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .IsRequired()
+                        .HasConstraintName("FK_connection_log_server_server_id");
+
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "HWId", b1 =>
+                        {
+                            b1.Property<int>("ConnectionLogId")
+                                .HasColumnType("INTEGER")
+                                .HasColumnName("connection_log_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("BLOB")
+                                .HasColumnName("hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("INTEGER")
+                                .HasDefaultValue(0)
+                                .HasColumnName("hwid_type");
+
+                            b1.HasKey("ConnectionLogId");
+
+                            b1.ToTable("connection_log");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ConnectionLogId")
+                                .HasConstraintName("FK_connection_log_connection_log_connection_log_id");
+                        });
+
+                    b.Navigation("HWId");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Jobs")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_job_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "LastSeenHWId", b1 =>
+                        {
+                            b1.Property<int>("PlayerId")
+                                .HasColumnType("INTEGER")
+                                .HasColumnName("player_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("BLOB")
+                                .HasColumnName("last_seen_hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("INTEGER")
+                                .HasDefaultValue(0)
+                                .HasColumnName("last_seen_hwid_type");
+
+                            b1.HasKey("PlayerId");
+
+                            b1.ToTable("player");
+
+                            b1.WithOwner()
+                                .HasForeignKey("PlayerId")
+                                .HasConstraintName("FK_player_player_player_id");
+                        });
+
+                    b.Navigation("LastSeenHWId");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.HasOne("Content.Server.Database.Preference", "Preference")
+                        .WithMany("Profiles")
+                        .HasForeignKey("PreferenceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_preference_preference_id");
+
+                    b.Navigation("Preference");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadout", b =>
+                {
+                    b.HasOne("Content.Server.Database.ProfileLoadoutGroup", "ProfileLoadoutGroup")
+                        .WithMany("Loadouts")
+                        .HasForeignKey("ProfileLoadoutGroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_loadout_profile_loadout_group_profile_loadout_group_id");
+
+                    b.Navigation("ProfileLoadoutGroup");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.HasOne("Content.Server.Database.ProfileRoleLoadout", "ProfileRoleLoadout")
+                        .WithMany("Groups")
+                        .HasForeignKey("ProfileRoleLoadoutId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_loadout_group_profile_role_loadout_profile_role_loadout_id");
+
+                    b.Navigation("ProfileRoleLoadout");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Loadouts")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_role_loadout_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("JobWhitelists")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_role_whitelists_player_player_user_id");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("Rounds")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_round_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_ban_round_round_id");
+
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "HWId", b1 =>
+                        {
+                            b1.Property<int>("ServerBanId")
+                                .HasColumnType("INTEGER")
+                                .HasColumnName("server_ban_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("BLOB")
+                                .HasColumnName("hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("INTEGER")
+                                .HasDefaultValue(0)
+                                .HasColumnName("hwid_type");
+
+                            b1.HasKey("ServerBanId");
+
+                            b1.ToTable("server_ban");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ServerBanId")
+                                .HasConstraintName("FK_server_ban_server_ban_server_ban_id");
+                        });
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("HWId");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithMany("BanHits")
+                        .HasForeignKey("BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_server_ban_ban_id");
+
+                    b.HasOne("Content.Server.Database.ConnectionLog", "Connection")
+                        .WithMany("BanHits")
+                        .HasForeignKey("ConnectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_connection_log_connection_id");
+
+                    b.Navigation("Ban");
+
+                    b.Navigation("Connection");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerRoleBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerRoleBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_role_ban_round_round_id");
+
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "HWId", b1 =>
+                        {
+                            b1.Property<int>("ServerRoleBanId")
+                                .HasColumnType("INTEGER")
+                                .HasColumnName("server_role_ban_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("BLOB")
+                                .HasColumnName("hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("INTEGER")
+                                .HasDefaultValue(0)
+                                .HasColumnName("hwid_type");
+
+                            b1.HasKey("ServerRoleBanId");
+
+                            b1.ToTable("server_role_ban");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ServerRoleBanId")
+                                .HasConstraintName("FK_server_role_ban_server_role_ban_server_role_ban_id");
+                        });
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("HWId");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerRoleBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerRoleUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_role_unban_server_role_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_unban_server_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Traits")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_trait_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", null)
+                        .WithMany()
+                        .HasForeignKey("PlayersId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_player_players_id");
+
+                    b.HasOne("Content.Server.Database.Round", null)
+                        .WithMany()
+                        .HasForeignKey("RoundsId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_round_rounds_id");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Navigation("Players");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Navigation("Admins");
+
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Navigation("BanHits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Navigation("AdminLogs");
+
+                    b.Navigation("AdminMessagesCreated");
+
+                    b.Navigation("AdminMessagesDeleted");
+
+                    b.Navigation("AdminMessagesLastEdited");
+
+                    b.Navigation("AdminMessagesReceived");
+
+                    b.Navigation("AdminNotesCreated");
+
+                    b.Navigation("AdminNotesDeleted");
+
+                    b.Navigation("AdminNotesLastEdited");
+
+                    b.Navigation("AdminNotesReceived");
+
+                    b.Navigation("AdminServerBansCreated");
+
+                    b.Navigation("AdminServerBansLastEdited");
+
+                    b.Navigation("AdminServerRoleBansCreated");
+
+                    b.Navigation("AdminServerRoleBansLastEdited");
+
+                    b.Navigation("AdminWatchlistsCreated");
+
+                    b.Navigation("AdminWatchlistsDeleted");
+
+                    b.Navigation("AdminWatchlistsLastEdited");
+
+                    b.Navigation("AdminWatchlistsReceived");
+
+                    b.Navigation("JobWhitelists");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Navigation("Profiles");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Navigation("Antags");
+
+                    b.Navigation("Jobs");
+
+                    b.Navigation("Loadouts");
+
+                    b.Navigation("Traits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.Navigation("Loadouts");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.Navigation("Groups");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Navigation("AdminLogs");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Navigation("ConnectionLogs");
+
+                    b.Navigation("Rounds");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Navigation("BanHits");
+
+                    b.Navigation("Unban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Navigation("Unban");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Sqlite/20241111170107_ModernHwid.cs b/Content.Server.Database/Migrations/Sqlite/20241111170107_ModernHwid.cs
new file mode 100644
index 00000000000..97b5dafd03f
--- /dev/null
+++ b/Content.Server.Database/Migrations/Sqlite/20241111170107_ModernHwid.cs
@@ -0,0 +1,62 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Sqlite
+{
+    /// <inheritdoc />
+    public partial class ModernHwid : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "hwid_type",
+                table: "server_role_ban",
+                type: "INTEGER",
+                nullable: true,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "hwid_type",
+                table: "server_ban",
+                type: "INTEGER",
+                nullable: true,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "last_seen_hwid_type",
+                table: "player",
+                type: "INTEGER",
+                nullable: true,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "hwid_type",
+                table: "connection_log",
+                type: "INTEGER",
+                nullable: true,
+                defaultValue: 0);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "hwid_type",
+                table: "server_role_ban");
+
+            migrationBuilder.DropColumn(
+                name: "hwid_type",
+                table: "server_ban");
+
+            migrationBuilder.DropColumn(
+                name: "last_seen_hwid_type",
+                table: "player");
+
+            migrationBuilder.DropColumn(
+                name: "hwid_type",
+                table: "connection_log");
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Sqlite/20241111193602_ConnectionTrust.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20241111193602_ConnectionTrust.Designer.cs
new file mode 100644
index 00000000000..bd4e20a464b
--- /dev/null
+++ b/Content.Server.Database/Migrations/Sqlite/20241111193602_ConnectionTrust.Designer.cs
@@ -0,0 +1,1999 @@
+// <auto-generated />
+using System;
+using Content.Server.Database;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Sqlite
+{
+    [DbContext(typeof(SqliteServerDbContext))]
+    [Migration("20241111193602_ConnectionTrust")]
+    partial class ConnectionTrust
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "8.0.0");
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<int?>("AdminRankId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("title");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_admin");
+
+                    b.HasIndex("AdminRankId")
+                        .HasDatabaseName("IX_admin_admin_rank_id");
+
+                    b.ToTable("admin", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_flag_id");
+
+                    b.Property<Guid>("AdminId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("admin_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("flag");
+
+                    b.Property<bool>("Negative")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("negative");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_flag");
+
+                    b.HasIndex("AdminId")
+                        .HasDatabaseName("IX_admin_flag_admin_id");
+
+                    b.HasIndex("Flag", "AdminId")
+                        .IsUnique();
+
+                    b.ToTable("admin_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Id")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_log_id");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("date");
+
+                    b.Property<sbyte>("Impact")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("impact");
+
+                    b.Property<string>("Json")
+                        .IsRequired()
+                        .HasColumnType("jsonb")
+                        .HasColumnName("json");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("type");
+
+                    b.HasKey("RoundId", "Id")
+                        .HasName("PK_admin_log");
+
+                    b.HasIndex("Date");
+
+                    b.HasIndex("Type")
+                        .HasDatabaseName("IX_admin_log_type");
+
+                    b.ToTable("admin_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("LogId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("log_id");
+
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.HasKey("RoundId", "LogId", "PlayerUserId")
+                        .HasName("PK_admin_log_player");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_log_player_player_user_id");
+
+                    b.ToTable("admin_log_player", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_messages_id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<bool>("Dismissed")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("dismissed");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Seen")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("seen");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_messages");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_messages_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_messages_round_id");
+
+                    b.ToTable("admin_messages", null, t =>
+                        {
+                            t.HasCheckConstraint("NotDismissedAndSeen", "NOT dismissed OR seen");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_notes_id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Secret")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("secret");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_notes");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_notes_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_notes_round_id");
+
+                    b.ToTable("admin_notes", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank");
+
+                    b.ToTable("admin_rank", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_flag_id");
+
+                    b.Property<int>("AdminRankId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("flag");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank_flag");
+
+                    b.HasIndex("AdminRankId");
+
+                    b.HasIndex("Flag", "AdminRankId")
+                        .IsUnique();
+
+                    b.ToTable("admin_rank_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_watchlists_id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_watchlists");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_watchlists_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_watchlists_round_id");
+
+                    b.ToTable("admin_watchlists", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("antag_id");
+
+                    b.Property<string>("AntagName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("antag_name");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_antag");
+
+                    b.HasIndex("ProfileId", "AntagName")
+                        .IsUnique();
+
+                    b.ToTable("antag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AssignedUserId", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("assigned_user_id_id");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_assigned_user_id");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.HasIndex("UserName")
+                        .IsUnique();
+
+                    b.ToTable("assigned_user_id", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.BanTemplate", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_template_id");
+
+                    b.Property<bool>("AutoDelete")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("auto_delete");
+
+                    b.Property<int>("ExemptFlags")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("exempt_flags");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("hidden");
+
+                    b.Property<TimeSpan>("Length")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("length");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("reason");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("title");
+
+                    b.HasKey("Id")
+                        .HasName("PK_ban_template");
+
+                    b.ToTable("ban_template", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Blacklist", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_blacklist");
+
+                    b.ToTable("blacklist", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("connection_log_id");
+
+                    b.Property<string>("Address")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<byte?>("Denied")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("denied");
+
+                    b.Property<int>("ServerId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasDefaultValue(0)
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("time");
+
+                    b.Property<float>("Trust")
+                        .HasColumnType("REAL")
+                        .HasColumnName("trust");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_connection_log");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_connection_log_server_id");
+
+                    b.HasIndex("Time");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("connection_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("job_id");
+
+                    b.Property<string>("JobName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("job_name");
+
+                    b.Property<int>("Priority")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("priority");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_job");
+
+                    b.HasIndex("ProfileId");
+
+                    b.HasIndex("ProfileId", "JobName")
+                        .IsUnique();
+
+                    b.HasIndex(new[] { "ProfileId" }, "IX_job_one_high_priority")
+                        .IsUnique()
+                        .HasFilter("priority = 3");
+
+                    b.ToTable("job", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.PlayTime", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("play_time_id");
+
+                    b.Property<Guid>("PlayerId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_id");
+
+                    b.Property<TimeSpan>("TimeSpent")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("time_spent");
+
+                    b.Property<string>("Tracker")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("tracker");
+
+                    b.HasKey("Id")
+                        .HasName("PK_play_time");
+
+                    b.HasIndex("PlayerId", "Tracker")
+                        .IsUnique();
+
+                    b.ToTable("play_time", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("player_id");
+
+                    b.Property<DateTime>("FirstSeenTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("first_seen_time");
+
+                    b.Property<DateTime?>("LastReadRules")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_read_rules");
+
+                    b.Property<string>("LastSeenAddress")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_seen_address");
+
+                    b.Property<DateTime>("LastSeenTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_seen_time");
+
+                    b.Property<string>("LastSeenUserName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_seen_user_name");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_player");
+
+                    b.HasAlternateKey("UserId")
+                        .HasName("ak_player_user_id");
+
+                    b.HasIndex("LastSeenUserName");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("player", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("preference_id");
+
+                    b.Property<string>("AdminOOCColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("admin_ooc_color");
+
+                    b.Property<int>("SelectedCharacterSlot")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("selected_character_slot");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_preference");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("preference", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.Property<int>("Age")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("age");
+
+                    b.Property<string>("CharacterName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("char_name");
+
+                    b.Property<string>("EyeColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("eye_color");
+
+                    b.Property<string>("FacialHairColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("facial_hair_color");
+
+                    b.Property<string>("FacialHairName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("facial_hair_name");
+
+                    b.Property<string>("FlavorText")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("flavor_text");
+
+                    b.Property<string>("Gender")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("gender");
+
+                    b.Property<string>("HairColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("hair_color");
+
+                    b.Property<string>("HairName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("hair_name");
+
+                    b.Property<byte[]>("Markings")
+                        .HasColumnType("jsonb")
+                        .HasColumnName("markings");
+
+                    b.Property<int>("PreferenceId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("preference_id");
+
+                    b.Property<int>("PreferenceUnavailable")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("pref_unavailable");
+
+                    b.Property<string>("Sex")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("sex");
+
+                    b.Property<string>("SkinColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("skin_color");
+
+                    b.Property<int>("Slot")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("slot");
+
+                    b.Property<int>("SpawnPriority")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("spawn_priority");
+
+                    b.Property<string>("Species")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("species");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile");
+
+                    b.HasIndex("PreferenceId")
+                        .HasDatabaseName("IX_profile_preference_id");
+
+                    b.HasIndex("Slot", "PreferenceId")
+                        .IsUnique();
+
+                    b.ToTable("profile", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadout", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_loadout_id");
+
+                    b.Property<string>("LoadoutName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("loadout_name");
+
+                    b.Property<int>("ProfileLoadoutGroupId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_loadout_group_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_loadout");
+
+                    b.HasIndex("ProfileLoadoutGroupId");
+
+                    b.ToTable("profile_loadout", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_loadout_group_id");
+
+                    b.Property<string>("GroupName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("group_name");
+
+                    b.Property<int>("ProfileRoleLoadoutId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_role_loadout_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_loadout_group");
+
+                    b.HasIndex("ProfileRoleLoadoutId");
+
+                    b.ToTable("profile_loadout_group", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_role_loadout_id");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("RoleName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("role_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_role_loadout");
+
+                    b.HasIndex("ProfileId");
+
+                    b.ToTable("profile_role_loadout", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
+                {
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("role_id");
+
+                    b.HasKey("PlayerUserId", "RoleId")
+                        .HasName("PK_role_whitelists");
+
+                    b.ToTable("role_whitelists", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("ServerId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime?>("StartDate")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("start_date");
+
+                    b.HasKey("Id")
+                        .HasName("PK_round");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_round_server_id");
+
+                    b.HasIndex("StartDate");
+
+                    b.ToTable("round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_id");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server");
+
+                    b.ToTable("server", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_ban_id");
+
+                    b.Property<string>("Address")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<bool>("AutoDelete")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("auto_delete");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<int>("ExemptFlags")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("exempt_flags");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("reason");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_ban_round_id");
+
+                    b.ToTable("server_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanExemption", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<int>("Flags")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("flags");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_server_ban_exemption");
+
+                    b.ToTable("server_ban_exemption", null, t =>
+                        {
+                            t.HasCheckConstraint("FlagsNotZero", "flags != 0");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_ban_hit_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<int>("ConnectionId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("connection_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban_hit");
+
+                    b.HasIndex("BanId")
+                        .HasDatabaseName("IX_server_ban_hit_ban_id");
+
+                    b.HasIndex("ConnectionId")
+                        .HasDatabaseName("IX_server_ban_hit_connection_id");
+
+                    b.ToTable("server_ban_hit", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_role_ban_id");
+
+                    b.Property<string>("Address")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("reason");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("role_id");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_role_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_role_ban_round_id");
+
+                    b.ToTable("server_role_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("role_unban_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_role_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("unban_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("trait_id");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("TraitName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("trait_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_trait");
+
+                    b.HasIndex("ProfileId", "TraitName")
+                        .IsUnique();
+
+                    b.ToTable("trait", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.UploadedResourceLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("uploaded_resource_log_id");
+
+                    b.Property<byte[]>("Data")
+                        .IsRequired()
+                        .HasColumnType("BLOB")
+                        .HasColumnName("data");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("date");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("path");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_uploaded_resource_log");
+
+                    b.ToTable("uploaded_resource_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Whitelist", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_whitelist");
+
+                    b.ToTable("whitelist", (string)null);
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.Property<int>("PlayersId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("players_id");
+
+                    b.Property<int>("RoundsId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("rounds_id");
+
+                    b.HasKey("PlayersId", "RoundsId")
+                        .HasName("PK_player_round");
+
+                    b.HasIndex("RoundsId")
+                        .HasDatabaseName("IX_player_round_rounds_id");
+
+                    b.ToTable("player_round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "AdminRank")
+                        .WithMany("Admins")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_admin_rank_admin_rank_id");
+
+                    b.Navigation("AdminRank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Admin", "Admin")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_flag_admin_admin_id");
+
+                    b.Navigation("Admin");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("RoundId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_round_round_id");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.AdminLog", "Log")
+                        .WithMany("Players")
+                        .HasForeignKey("RoundId", "LogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_admin_log_round_id_log_id");
+
+                    b.Navigation("Log");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminMessagesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminMessagesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminMessagesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminMessagesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_messages_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_messages_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminNotesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminNotesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminNotesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminNotesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_notes_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_notes_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "Rank")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_rank_flag_admin_rank_admin_rank_id");
+
+                    b.Navigation("Rank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminWatchlistsCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminWatchlistsDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminWatchlistsLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminWatchlistsReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_watchlists_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_watchlists_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Antags")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_antag_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("ConnectionLogs")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .IsRequired()
+                        .HasConstraintName("FK_connection_log_server_server_id");
+
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "HWId", b1 =>
+                        {
+                            b1.Property<int>("ConnectionLogId")
+                                .HasColumnType("INTEGER")
+                                .HasColumnName("connection_log_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("BLOB")
+                                .HasColumnName("hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("INTEGER")
+                                .HasDefaultValue(0)
+                                .HasColumnName("hwid_type");
+
+                            b1.HasKey("ConnectionLogId");
+
+                            b1.ToTable("connection_log");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ConnectionLogId")
+                                .HasConstraintName("FK_connection_log_connection_log_connection_log_id");
+                        });
+
+                    b.Navigation("HWId");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Jobs")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_job_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "LastSeenHWId", b1 =>
+                        {
+                            b1.Property<int>("PlayerId")
+                                .HasColumnType("INTEGER")
+                                .HasColumnName("player_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("BLOB")
+                                .HasColumnName("last_seen_hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("INTEGER")
+                                .HasDefaultValue(0)
+                                .HasColumnName("last_seen_hwid_type");
+
+                            b1.HasKey("PlayerId");
+
+                            b1.ToTable("player");
+
+                            b1.WithOwner()
+                                .HasForeignKey("PlayerId")
+                                .HasConstraintName("FK_player_player_player_id");
+                        });
+
+                    b.Navigation("LastSeenHWId");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.HasOne("Content.Server.Database.Preference", "Preference")
+                        .WithMany("Profiles")
+                        .HasForeignKey("PreferenceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_preference_preference_id");
+
+                    b.Navigation("Preference");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadout", b =>
+                {
+                    b.HasOne("Content.Server.Database.ProfileLoadoutGroup", "ProfileLoadoutGroup")
+                        .WithMany("Loadouts")
+                        .HasForeignKey("ProfileLoadoutGroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_loadout_profile_loadout_group_profile_loadout_group_id");
+
+                    b.Navigation("ProfileLoadoutGroup");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.HasOne("Content.Server.Database.ProfileRoleLoadout", "ProfileRoleLoadout")
+                        .WithMany("Groups")
+                        .HasForeignKey("ProfileRoleLoadoutId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_loadout_group_profile_role_loadout_profile_role_loadout_id");
+
+                    b.Navigation("ProfileRoleLoadout");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Loadouts")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_role_loadout_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("JobWhitelists")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_role_whitelists_player_player_user_id");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("Rounds")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_round_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_ban_round_round_id");
+
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "HWId", b1 =>
+                        {
+                            b1.Property<int>("ServerBanId")
+                                .HasColumnType("INTEGER")
+                                .HasColumnName("server_ban_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("BLOB")
+                                .HasColumnName("hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("INTEGER")
+                                .HasDefaultValue(0)
+                                .HasColumnName("hwid_type");
+
+                            b1.HasKey("ServerBanId");
+
+                            b1.ToTable("server_ban");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ServerBanId")
+                                .HasConstraintName("FK_server_ban_server_ban_server_ban_id");
+                        });
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("HWId");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithMany("BanHits")
+                        .HasForeignKey("BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_server_ban_ban_id");
+
+                    b.HasOne("Content.Server.Database.ConnectionLog", "Connection")
+                        .WithMany("BanHits")
+                        .HasForeignKey("ConnectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_connection_log_connection_id");
+
+                    b.Navigation("Ban");
+
+                    b.Navigation("Connection");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerRoleBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerRoleBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_role_ban_round_round_id");
+
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "HWId", b1 =>
+                        {
+                            b1.Property<int>("ServerRoleBanId")
+                                .HasColumnType("INTEGER")
+                                .HasColumnName("server_role_ban_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("BLOB")
+                                .HasColumnName("hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("INTEGER")
+                                .HasDefaultValue(0)
+                                .HasColumnName("hwid_type");
+
+                            b1.HasKey("ServerRoleBanId");
+
+                            b1.ToTable("server_role_ban");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ServerRoleBanId")
+                                .HasConstraintName("FK_server_role_ban_server_role_ban_server_role_ban_id");
+                        });
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("HWId");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerRoleBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerRoleUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_role_unban_server_role_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_unban_server_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Traits")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_trait_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", null)
+                        .WithMany()
+                        .HasForeignKey("PlayersId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_player_players_id");
+
+                    b.HasOne("Content.Server.Database.Round", null)
+                        .WithMany()
+                        .HasForeignKey("RoundsId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_round_rounds_id");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Navigation("Players");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Navigation("Admins");
+
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Navigation("BanHits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Navigation("AdminLogs");
+
+                    b.Navigation("AdminMessagesCreated");
+
+                    b.Navigation("AdminMessagesDeleted");
+
+                    b.Navigation("AdminMessagesLastEdited");
+
+                    b.Navigation("AdminMessagesReceived");
+
+                    b.Navigation("AdminNotesCreated");
+
+                    b.Navigation("AdminNotesDeleted");
+
+                    b.Navigation("AdminNotesLastEdited");
+
+                    b.Navigation("AdminNotesReceived");
+
+                    b.Navigation("AdminServerBansCreated");
+
+                    b.Navigation("AdminServerBansLastEdited");
+
+                    b.Navigation("AdminServerRoleBansCreated");
+
+                    b.Navigation("AdminServerRoleBansLastEdited");
+
+                    b.Navigation("AdminWatchlistsCreated");
+
+                    b.Navigation("AdminWatchlistsDeleted");
+
+                    b.Navigation("AdminWatchlistsLastEdited");
+
+                    b.Navigation("AdminWatchlistsReceived");
+
+                    b.Navigation("JobWhitelists");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Navigation("Profiles");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Navigation("Antags");
+
+                    b.Navigation("Jobs");
+
+                    b.Navigation("Loadouts");
+
+                    b.Navigation("Traits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.Navigation("Loadouts");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.Navigation("Groups");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Navigation("AdminLogs");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Navigation("ConnectionLogs");
+
+                    b.Navigation("Rounds");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Navigation("BanHits");
+
+                    b.Navigation("Unban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Navigation("Unban");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Sqlite/20241111193602_ConnectionTrust.cs b/Content.Server.Database/Migrations/Sqlite/20241111193602_ConnectionTrust.cs
new file mode 100644
index 00000000000..3a7fd784e16
--- /dev/null
+++ b/Content.Server.Database/Migrations/Sqlite/20241111193602_ConnectionTrust.cs
@@ -0,0 +1,29 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Sqlite
+{
+    /// <inheritdoc />
+    public partial class ConnectionTrust : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<float>(
+                name: "trust",
+                table: "connection_log",
+                type: "REAL",
+                nullable: false,
+                defaultValue: 0f);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "trust",
+                table: "connection_log");
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs b/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
index 02d44163027..c63127874cc 100644
--- a/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
+++ b/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
@@ -483,19 +483,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.ToTable("assigned_user_id", (string)null);
                 });
 
-            modelBuilder.Entity("Content.Server.Database.Blacklist",
-                b =>
-                {
-                    b.Property<Guid>("UserId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("TEXT")
-                        .HasColumnName("user_id");
-
-                    b.HasKey("UserId")
-                        .HasName("PK_blacklist");
-
-                    b.ToTable("blacklist", (string) null);
-                });
             modelBuilder.Entity("Content.Server.Database.BanTemplate", b =>
                 {
                     b.Property<int>("Id")
@@ -539,6 +526,19 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.ToTable("ban_template", (string)null);
                 });
 
+            modelBuilder.Entity("Content.Server.Database.Blacklist", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_blacklist");
+
+                    b.ToTable("blacklist", (string)null);
+                });
+
             modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
                 {
                     b.Property<int>("Id")
@@ -555,10 +555,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("INTEGER")
                         .HasColumnName("denied");
 
-                    b.Property<byte[]>("HWId")
-                        .HasColumnType("BLOB")
-                        .HasColumnName("hwid");
-
                     b.Property<int>("ServerId")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("INTEGER")
@@ -569,6 +565,10 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("TEXT")
                         .HasColumnName("time");
 
+                    b.Property<float>("Trust")
+                        .HasColumnType("REAL")
+                        .HasColumnName("trust");
+
                     b.Property<Guid>("UserId")
                         .HasColumnType("TEXT")
                         .HasColumnName("user_id");
@@ -675,10 +675,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("TEXT")
                         .HasColumnName("last_seen_address");
 
-                    b.Property<byte[]>("LastSeenHWId")
-                        .HasColumnType("BLOB")
-                        .HasColumnName("last_seen_hwid");
-
                     b.Property<DateTime>("LastSeenTime")
                         .HasColumnType("TEXT")
                         .HasColumnName("last_seen_time");
@@ -996,10 +992,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("TEXT")
                         .HasColumnName("expiration_time");
 
-                    b.Property<byte[]>("HWId")
-                        .HasColumnType("BLOB")
-                        .HasColumnName("hwid");
-
                     b.Property<bool>("Hidden")
                         .HasColumnType("INTEGER")
                         .HasColumnName("hidden");
@@ -1124,10 +1116,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("TEXT")
                         .HasColumnName("expiration_time");
 
-                    b.Property<byte[]>("HWId")
-                        .HasColumnType("BLOB")
-                        .HasColumnName("hwid");
-
                     b.Property<bool>("Hidden")
                         .HasColumnType("INTEGER")
                         .HasColumnName("hidden");
@@ -1559,6 +1547,34 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .IsRequired()
                         .HasConstraintName("FK_connection_log_server_server_id");
 
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "HWId", b1 =>
+                        {
+                            b1.Property<int>("ConnectionLogId")
+                                .HasColumnType("INTEGER")
+                                .HasColumnName("connection_log_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("BLOB")
+                                .HasColumnName("hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("INTEGER")
+                                .HasDefaultValue(0)
+                                .HasColumnName("hwid_type");
+
+                            b1.HasKey("ConnectionLogId");
+
+                            b1.ToTable("connection_log");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ConnectionLogId")
+                                .HasConstraintName("FK_connection_log_connection_log_connection_log_id");
+                        });
+
+                    b.Navigation("HWId");
+
                     b.Navigation("Server");
                 });
 
@@ -1574,6 +1590,37 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Navigation("Profile");
                 });
 
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "LastSeenHWId", b1 =>
+                        {
+                            b1.Property<int>("PlayerId")
+                                .HasColumnType("INTEGER")
+                                .HasColumnName("player_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("BLOB")
+                                .HasColumnName("last_seen_hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("INTEGER")
+                                .HasDefaultValue(0)
+                                .HasColumnName("last_seen_hwid_type");
+
+                            b1.HasKey("PlayerId");
+
+                            b1.ToTable("player");
+
+                            b1.WithOwner()
+                                .HasForeignKey("PlayerId")
+                                .HasConstraintName("FK_player_player_player_id");
+                        });
+
+                    b.Navigation("LastSeenHWId");
+                });
+
             modelBuilder.Entity("Content.Server.Database.Profile", b =>
                 {
                     b.HasOne("Content.Server.Database.Preference", "Preference")
@@ -1668,8 +1715,36 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasForeignKey("RoundId")
                         .HasConstraintName("FK_server_ban_round_round_id");
 
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "HWId", b1 =>
+                        {
+                            b1.Property<int>("ServerBanId")
+                                .HasColumnType("INTEGER")
+                                .HasColumnName("server_ban_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("BLOB")
+                                .HasColumnName("hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("INTEGER")
+                                .HasDefaultValue(0)
+                                .HasColumnName("hwid_type");
+
+                            b1.HasKey("ServerBanId");
+
+                            b1.ToTable("server_ban");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ServerBanId")
+                                .HasConstraintName("FK_server_ban_server_ban_server_ban_id");
+                        });
+
                     b.Navigation("CreatedBy");
 
+                    b.Navigation("HWId");
+
                     b.Navigation("LastEditedBy");
 
                     b.Navigation("Round");
@@ -1717,8 +1792,36 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasForeignKey("RoundId")
                         .HasConstraintName("FK_server_role_ban_round_round_id");
 
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "HWId", b1 =>
+                        {
+                            b1.Property<int>("ServerRoleBanId")
+                                .HasColumnType("INTEGER")
+                                .HasColumnName("server_role_ban_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("BLOB")
+                                .HasColumnName("hwid");
+
+                            b1.Property<int>("Type")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("INTEGER")
+                                .HasDefaultValue(0)
+                                .HasColumnName("hwid_type");
+
+                            b1.HasKey("ServerRoleBanId");
+
+                            b1.ToTable("server_role_ban");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ServerRoleBanId")
+                                .HasConstraintName("FK_server_role_ban_server_role_ban_server_role_ban_id");
+                        });
+
                     b.Navigation("CreatedBy");
 
+                    b.Navigation("HWId");
+
                     b.Navigation("LastEditedBy");
 
                     b.Navigation("Round");
diff --git a/Content.Server.Database/Model.cs b/Content.Server.Database/Model.cs
index 00b3cfea032..9190475b153 100644
--- a/Content.Server.Database/Model.cs
+++ b/Content.Server.Database/Model.cs
@@ -1,7 +1,9 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Net;
 using System.Text.Json;
@@ -327,6 +329,47 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 .HasForeignKey(w => w.PlayerUserId)
                 .HasPrincipalKey(p => p.UserId)
                 .OnDelete(DeleteBehavior.Cascade);
+
+            // Changes for modern HWID integration
+            modelBuilder.Entity<Player>()
+                .OwnsOne(p => p.LastSeenHWId)
+                .Property(p => p.Hwid)
+                .HasColumnName("last_seen_hwid");
+
+            modelBuilder.Entity<Player>()
+                .OwnsOne(p => p.LastSeenHWId)
+                .Property(p => p.Type)
+                .HasDefaultValue(HwidType.Legacy);
+
+            modelBuilder.Entity<ServerBan>()
+                .OwnsOne(p => p.HWId)
+                .Property(p => p.Hwid)
+                .HasColumnName("hwid");
+
+            modelBuilder.Entity<ServerBan>()
+                .OwnsOne(p => p.HWId)
+                .Property(p => p.Type)
+                .HasDefaultValue(HwidType.Legacy);
+
+            modelBuilder.Entity<ServerRoleBan>()
+                .OwnsOne(p => p.HWId)
+                .Property(p => p.Hwid)
+                .HasColumnName("hwid");
+
+            modelBuilder.Entity<ServerRoleBan>()
+                .OwnsOne(p => p.HWId)
+                .Property(p => p.Type)
+                .HasDefaultValue(HwidType.Legacy);
+
+            modelBuilder.Entity<ConnectionLog>()
+                .OwnsOne(p => p.HWId)
+                .Property(p => p.Hwid)
+                .HasColumnName("hwid");
+
+            modelBuilder.Entity<ConnectionLog>()
+                .OwnsOne(p => p.HWId)
+                .Property(p => p.Type)
+                .HasDefaultValue(HwidType.Legacy);
         }
 
         public virtual IQueryable<AdminLog> SearchLogs(IQueryable<AdminLog> query, string searchText)
@@ -519,7 +562,7 @@ public class Player
         public string LastSeenUserName { get; set; } = null!;
         public DateTime LastSeenTime { get; set; }
         public IPAddress LastSeenAddress { get; set; } = null!;
-        public byte[]? LastSeenHWId { get; set; }
+        public TypedHwid? LastSeenHWId { get; set; }
 
         // Data that changes with each round
         public List<Round> Rounds { get; set; } = null!;
@@ -668,7 +711,7 @@ public interface IBanCommon<TUnban> where TUnban : IUnbanCommon
         int Id { get; set; }
         Guid? PlayerUserId { get; set; }
         NpgsqlInet? Address { get; set; }
-        byte[]? HWId { get; set; }
+        TypedHwid? HWId { get; set; }
         DateTime BanTime { get; set; }
         DateTime? ExpirationTime { get; set; }
         string Reason { get; set; }
@@ -753,7 +796,7 @@ public class ServerBan : IBanCommon<ServerUnban>
         /// <summary>
         /// Hardware ID of the banned player.
         /// </summary>
-        public byte[]? HWId { get; set; }
+        public TypedHwid? HWId { get; set; }
 
         /// <summary>
         /// The time when the ban was applied by an administrator.
@@ -891,7 +934,7 @@ public class ConnectionLog
         public DateTime Time { get; set; }
 
         public IPAddress Address { get; set; } = null!;
-        public byte[]? HWId { get; set; }
+        public TypedHwid? HWId { get; set; }
 
         public ConnectionDenyReason? Denied { get; set; }
 
@@ -908,6 +951,8 @@ public class ConnectionLog
 
         public List<ServerBanHit> BanHits { get; set; } = null!;
         public Server Server { get; set; } = null!;
+
+        public float Trust { get; set; }
     }
 
     public enum ConnectionDenyReason : byte
@@ -945,7 +990,7 @@ public sealed class ServerRoleBan : IBanCommon<ServerRoleUnban>
         public Guid? PlayerUserId { get; set; }
         [Required] public TimeSpan PlaytimeAtNote { get; set; }
         public NpgsqlInet? Address { get; set; }
-        public byte[]? HWId { get; set; }
+        public TypedHwid? HWId { get; set; }
 
         public DateTime BanTime { get; set; }
 
@@ -1206,4 +1251,37 @@ public sealed class BanTemplate
         /// <seealso cref="ServerBan.Hidden"/>
         public bool Hidden { get; set; }
     }
+
+    /// <summary>
+    /// A hardware ID value together with its <see cref="HwidType"/>.
+    /// </summary>
+    /// <seealso cref="ImmutableTypedHwid"/>
+    [Owned]
+    public sealed class TypedHwid
+    {
+        public byte[] Hwid { get; set; } = default!;
+        public HwidType Type { get; set; }
+
+        [return: NotNullIfNotNull(nameof(immutable))]
+        public static implicit operator TypedHwid?(ImmutableTypedHwid? immutable)
+        {
+            if (immutable == null)
+                return null;
+
+            return new TypedHwid
+            {
+                Hwid = immutable.Hwid.ToArray(),
+                Type = immutable.Type,
+            };
+        }
+
+        [return: NotNullIfNotNull(nameof(hwid))]
+        public static implicit operator ImmutableTypedHwid?(TypedHwid? hwid)
+        {
+            if (hwid == null)
+                return null;
+
+            return new ImmutableTypedHwid(hwid.Hwid.ToImmutableArray(), hwid.Type);
+        }
+    }
 }
diff --git a/Content.Server.Database/SnakeCaseNaming.cs b/Content.Server.Database/SnakeCaseNaming.cs
index 27ce392cd50..3a67ffb9cd1 100644
--- a/Content.Server.Database/SnakeCaseNaming.cs
+++ b/Content.Server.Database/SnakeCaseNaming.cs
@@ -82,7 +82,7 @@ public ConventionSet ModifyConventions(ConventionSet conventionSet)
         }
     }
 
-    public class SnakeCaseConvention :
+    public partial class SnakeCaseConvention :
         IEntityTypeAddedConvention,
         IEntityTypeAnnotationChangedConvention,
         IPropertyAddedConvention,
@@ -99,22 +99,27 @@ public SnakeCaseConvention() {}
 
         public static string RewriteName(string name)
         {
-            var regex = new Regex("[A-Z]+",  RegexOptions.Compiled);
-            return regex.Replace(
-                name,
-                (Match match) => {
-                    if (match.Index == 0 && (match.Value == "FK" || match.Value == "PK" ||  match.Value == "IX")) {
-                        return match.Value;
+            return UpperCaseLocator()
+                .Replace(
+                    name,
+                    (Match match) => {
+                        if (match.Index == 0 && (match.Value == "FK" || match.Value == "PK" ||  match.Value == "IX")) {
+                            return match.Value;
+                        }
+                        if (match.Value == "HWI")
+                            return (match.Index == 0 ? "" : "_") + "hwi";
+                        if (match.Index == 0)
+                            return match.Value.ToLower();
+                        if (match.Length > 1)
+                            return $"_{match.Value[..^1].ToLower()}_{match.Value[^1..^0].ToLower()}";
+
+                        // Do not add a _ if there is already one before this. This happens with owned entities.
+                        if (name[match.Index - 1] == '_')
+                            return match.Value.ToLower();
+
+                        return "_" + match.Value.ToLower();
                     }
-                    if (match.Value == "HWI")
-                        return (match.Index == 0 ? "" : "_") + "hwi";
-                    if (match.Index == 0)
-                        return match.Value.ToLower();
-                    if (match.Length > 1)
-                        return $"_{match.Value[..^1].ToLower()}_{match.Value[^1..^0].ToLower()}";
-                    return "_" + match.Value.ToLower();
-                }
-            );
+                );
         }
 
         public virtual void ProcessEntityTypeAdded(
@@ -332,5 +337,8 @@ private static void RewriteColumnName(IConventionPropertyBuilder propertyBuilder
                 }
             }
         }
+
+        [GeneratedRegex("[A-Z]+", RegexOptions.Compiled)]
+        private static partial Regex UpperCaseLocator();
     }
 }
diff --git a/Content.Server/Abilities/Mime/MimePowersSystem.cs b/Content.Server/Abilities/Mime/MimePowersSystem.cs
index 2839952e165..9467b72fcab 100644
--- a/Content.Server/Abilities/Mime/MimePowersSystem.cs
+++ b/Content.Server/Abilities/Mime/MimePowersSystem.cs
@@ -165,8 +165,8 @@ public void RetakeVow(EntityUid uid, MimePowersComponent? mimePowers = null)
             mimePowers.ReadyToRepent = false;
             mimePowers.VowBroken = false;
             AddComp<MutedComponent>(uid);
-            _alertsSystem.ClearAlert(uid, mimePowers.VowAlert);
-            _alertsSystem.ShowAlert(uid, mimePowers.VowBrokenAlert);
+            _alertsSystem.ClearAlert(uid, mimePowers.VowBrokenAlert);
+            _alertsSystem.ShowAlert(uid, mimePowers.VowAlert);
             _actionsSystem.AddAction(uid, ref mimePowers.InvisibleWallActionEntity, mimePowers.InvisibleWallAction, uid);
         }
     }
diff --git a/Content.Server/Administration/BanList/BanListEui.cs b/Content.Server/Administration/BanList/BanListEui.cs
index 8ddc7459d7b..2ca126bf164 100644
--- a/Content.Server/Administration/BanList/BanListEui.cs
+++ b/Content.Server/Administration/BanList/BanListEui.cs
@@ -54,7 +54,7 @@ private void OnPermsChanged(AdminPermsChangedEventArgs args)
 
     private async Task LoadBans(NetUserId userId)
     {
-        foreach (var ban in await _db.GetServerBansAsync(null, userId, null))
+        foreach (var ban in await _db.GetServerBansAsync(null, userId, null, null))
         {
             SharedServerUnban? unban = null;
             if (ban.Unban is { } unbanDef)
@@ -74,7 +74,7 @@ private async Task LoadBans(NetUserId userId)
                     ? (address.address.ToString(), address.cidrMask)
                     : null;
 
-                hwid = ban.HWId == null ? null : Convert.ToBase64String(ban.HWId.Value.AsSpan());
+                hwid = ban.HWId?.ToString();
             }
 
             Bans.Add(new SharedServerBan(
@@ -95,7 +95,7 @@ private async Task LoadBans(NetUserId userId)
 
     private async Task LoadRoleBans(NetUserId userId)
     {
-        foreach (var ban in await _db.GetServerRoleBansAsync(null, userId, null))
+        foreach (var ban in await _db.GetServerRoleBansAsync(null, userId, null, null))
         {
             SharedServerUnban? unban = null;
             if (ban.Unban is { } unbanDef)
@@ -115,7 +115,7 @@ private async Task LoadRoleBans(NetUserId userId)
                     ? (address.address.ToString(), address.cidrMask)
                     : null;
 
-                hwid = ban.HWId == null ? null : Convert.ToBase64String(ban.HWId.Value.AsSpan());
+                hwid = ban.HWId?.ToString();
             }
             RoleBans.Add(new SharedServerRoleBan(
                 ban.Id,
diff --git a/Content.Server/Administration/BanPanelEui.cs b/Content.Server/Administration/BanPanelEui.cs
index e746e9c725f..3eedad3ed50 100644
--- a/Content.Server/Administration/BanPanelEui.cs
+++ b/Content.Server/Administration/BanPanelEui.cs
@@ -1,4 +1,3 @@
-using System.Collections.Immutable;
 using System.Net;
 using System.Net.Sockets;
 using Content.Server.Administration.Managers;
@@ -8,7 +7,6 @@
 using Content.Shared.Administration;
 using Content.Shared.Database;
 using Content.Shared.Eui;
-using Robust.Server.Player;
 using Robust.Shared.Network;
 
 namespace Content.Server.Administration;
@@ -27,7 +25,7 @@ public sealed class BanPanelEui : BaseEui
     private NetUserId? PlayerId { get; set; }
     private string PlayerName { get; set; } = string.Empty;
     private IPAddress? LastAddress { get; set; }
-    private ImmutableArray<byte>? LastHwid { get; set; }
+    private ImmutableTypedHwid? LastHwid { get; set; }
     private const int Ipv4_CIDR = 32;
     private const int Ipv6_CIDR = 64;
 
@@ -51,7 +49,7 @@ public override void HandleMessage(EuiMessageBase msg)
         switch (msg)
         {
             case BanPanelEuiStateMsg.CreateBanRequest r:
-                BanPlayer(r.Player, r.IpAddress, r.UseLastIp, r.Hwid?.ToImmutableArray(), r.UseLastHwid, r.Minutes, r.Severity, r.Reason, r.Roles, r.Erase);
+                BanPlayer(r.Player, r.IpAddress, r.UseLastIp, r.Hwid, r.UseLastHwid, r.Minutes, r.Severity, r.Reason, r.Roles, r.Erase);
                 break;
             case BanPanelEuiStateMsg.GetPlayerInfoRequest r:
                 ChangePlayer(r.PlayerUsername);
@@ -59,7 +57,7 @@ public override void HandleMessage(EuiMessageBase msg)
         }
     }
 
-    private async void BanPlayer(string? target, string? ipAddressString, bool useLastIp, ImmutableArray<byte>? hwid, bool useLastHwid, uint minutes, NoteSeverity severity, string reason, IReadOnlyCollection<string>? roles, bool erase)
+    private async void BanPlayer(string? target, string? ipAddressString, bool useLastIp, ImmutableTypedHwid? hwid, bool useLastHwid, uint minutes, NoteSeverity severity, string reason, IReadOnlyCollection<string>? roles, bool erase)
     {
         if (!_admins.HasAdminFlag(Player, AdminFlags.Ban))
         {
@@ -155,7 +153,7 @@ public async void ChangePlayer(string playerNameOrId)
         ChangePlayer(located?.UserId, located?.Username ?? string.Empty, located?.LastAddress, located?.LastHWId);
     }
 
-    public void ChangePlayer(NetUserId? playerId, string playerName, IPAddress? lastAddress, ImmutableArray<byte>? lastHwid)
+    public void ChangePlayer(NetUserId? playerId, string playerName, IPAddress? lastAddress, ImmutableTypedHwid? lastHwid)
     {
         PlayerId = playerId;
         PlayerName = playerName;
diff --git a/Content.Server/Administration/Commands/BanListCommand.cs b/Content.Server/Administration/Commands/BanListCommand.cs
index a5bc97dce3e..2f7093ae1d8 100644
--- a/Content.Server/Administration/Commands/BanListCommand.cs
+++ b/Content.Server/Administration/Commands/BanListCommand.cs
@@ -38,7 +38,7 @@ public override async void Execute(IConsoleShell shell, string argStr, string[]
 
         if (shell.Player is not { } player)
         {
-            var bans = await _dbManager.GetServerBansAsync(data.LastAddress, data.UserId, data.LastHWId, false);
+            var bans = await _dbManager.GetServerBansAsync(data.LastAddress, data.UserId, data.LastLegacyHWId, data.LastModernHWIds, false);
 
             if (bans.Count == 0)
             {
diff --git a/Content.Server/Administration/Commands/RoleBanListCommand.cs b/Content.Server/Administration/Commands/RoleBanListCommand.cs
index a5904723390..8244ded3b20 100644
--- a/Content.Server/Administration/Commands/RoleBanListCommand.cs
+++ b/Content.Server/Administration/Commands/RoleBanListCommand.cs
@@ -1,5 +1,7 @@
 using System.Linq;
 using System.Text;
+using Content.Server.Administration.BanList;
+using Content.Server.EUI;
 using Content.Server.Database;
 using Content.Shared.Administration;
 using Robust.Server.Player;
@@ -10,6 +12,12 @@ namespace Content.Server.Administration.Commands;
 [AdminCommand(AdminFlags.Ban)]
 public sealed class RoleBanListCommand : IConsoleCommand
 {
+    [Dependency] private readonly IServerDbManager _dbManager = default!;
+
+    [Dependency] private readonly EuiManager _eui = default!;
+
+    [Dependency] private readonly IPlayerLocator _locator = default!;
+
     public string Command => "rolebanlist";
     public string Description => Loc.GetString("cmd-rolebanlist-desc");
     public string Help => Loc.GetString("cmd-rolebanlist-help");
@@ -29,66 +37,37 @@ public async void Execute(IConsoleShell shell, string argStr, string[] args)
             return;
         }
 
-        var dbMan = IoCManager.Resolve<IServerDbManager>();
-
-        var target = args[0];
+        var data = await _locator.LookupIdByNameOrIdAsync(args[0]);
 
-        var locator = IoCManager.Resolve<IPlayerLocator>();
-        var located = await locator.LookupIdByNameOrIdAsync(target);
-        if (located == null)
+        if (data == null)
         {
             shell.WriteError("Unable to find a player with that name or id.");
             return;
         }
 
-        var targetUid = located.UserId;
-        var targetHWid = located.LastHWId;
-        var targetAddress = located.LastAddress;
-
-        var bans = await dbMan.GetServerRoleBansAsync(targetAddress, targetUid, targetHWid, includeUnbanned);
-
-        if (bans.Count == 0)
+        if (shell.Player is not { } player)
         {
-            shell.WriteLine("That user has no bans in their record.");
-            return;
-        }
 
-        var bansString = new StringBuilder("Bans in record:\n");
+            var bans = await _dbManager.GetServerRoleBansAsync(data.LastAddress, data.UserId, data.LastLegacyHWId, data.LastModernHWIds, includeUnbanned);
 
-        var first = true;
-        foreach (var ban in bans)
-        {
-            if (!first)
-                bansString.Append("\n\n");
-            else
-                first = false;
-
-            bansString
-                .Append("Ban ID: ")
-                .Append(ban.Id)
-                .Append('\n')
-                .Append("Role: ")
-                .Append(ban.Role)
-                .Append('\n')
-                .Append("Banned on ")
-                .Append(ban.BanTime);
-
-            if (ban.ExpirationTime != null)
+            if (bans.Count == 0)
             {
-                bansString
-                    .Append(" until ")
-                    .Append(ban.ExpirationTime.Value);
+                shell.WriteLine("That user has no bans in their record.");
+                return;
             }
 
-            bansString
-                .Append('\n');
-
-            bansString
-                .Append("Reason: ")
-                .Append(ban.Reason);
+            foreach (var ban in bans)
+            {
+                var msg = $"ID: {ban.Id}: Role: {ban.Role} Reason: {ban.Reason}";
+                shell.WriteLine(msg);
+            }
+            return;
         }
 
-        shell.WriteLine(bansString.ToString());
+        var ui = new BanListEui();
+        _eui.OpenEui(ui, player);
+        await ui.ChangeBanListPlayer(data.UserId);
+
     }
 
     public CompletionResult GetCompletion(IConsoleShell shell, string[] args)
diff --git a/Content.Server/Administration/Managers/BanManager.cs b/Content.Server/Administration/Managers/BanManager.cs
index 1cdfb822242..2e21710e51d 100644
--- a/Content.Server/Administration/Managers/BanManager.cs
+++ b/Content.Server/Administration/Managers/BanManager.cs
@@ -65,7 +65,8 @@ private async Task CachePlayerData(ICommonSession player, CancellationToken canc
 
         var netChannel = player.Channel;
         ImmutableArray<byte>? hwId = netChannel.UserData.HWId.Length == 0 ? null : netChannel.UserData.HWId;
-        var roleBans = await _db.GetServerRoleBansAsync(netChannel.RemoteEndPoint.Address, player.UserId, hwId, false);
+        var modernHwids = netChannel.UserData.ModernHWIds;
+        var roleBans = await _db.GetServerRoleBansAsync(netChannel.RemoteEndPoint.Address, player.UserId, hwId, modernHwids, false);
 
         var userRoleBans = new List<ServerRoleBanDef>();
         foreach (var ban in roleBans)
@@ -132,7 +133,7 @@ public void Restart()
     }
 
     #region Server Bans
-    public async void CreateServerBan(NetUserId? target, string? targetUsername, NetUserId? banningAdmin, (IPAddress, int)? addressRange, ImmutableArray<byte>? hwid, uint? minutes, NoteSeverity severity, string reason)
+    public async void CreateServerBan(NetUserId? target, string? targetUsername, NetUserId? banningAdmin, (IPAddress, int)? addressRange, ImmutableTypedHwid? hwid, uint? minutes, NoteSeverity severity, string reason)
     {
         DateTimeOffset? expires = null;
         if (minutes > 0)
@@ -166,9 +167,7 @@ public async void CreateServerBan(NetUserId? target, string? targetUsername, Net
         var addressRangeString = addressRange != null
             ? $"{addressRange.Value.Item1}/{addressRange.Value.Item2}"
             : "null";
-        var hwidString = hwid != null
-            ? string.Concat(hwid.Value.Select(x => x.ToString("x2")))
-            : "null";
+        var hwidString = hwid?.ToString() ?? "null";
         var expiresString = expires == null ? Loc.GetString("server-ban-string-never") : $"{expires}";
 
         var key = _cfg.GetCVar(CCVars.AdminShowPIIOnBan) ? "server-ban-string" : "server-ban-string-no-pii";
@@ -208,6 +207,7 @@ private bool BanMatchesPlayer(ICommonSession player, ServerBanDef ban)
             UserId = player.UserId,
             Address = player.Channel.RemoteEndPoint.Address,
             HWId = player.Channel.UserData.HWId,
+            ModernHWIds = player.Channel.UserData.ModernHWIds,
             // It's possible for the player to not have cached data loading yet due to coincidental timing.
             // If this is the case, we assume they have all flags to avoid false-positives.
             ExemptFlags = _cachedBanExemptions.GetValueOrDefault(player, ServerBanExemptFlags.All),
@@ -228,7 +228,7 @@ private void KickForBanDef(ICommonSession player, ServerBanDef def)
     #region Job Bans
     // If you are trying to remove timeOfBan, please don't. It's there because the note system groups role bans by time, reason and banning admin.
     // Removing it will clutter the note list. Please also make sure that department bans are applied to roles with the same DateTimeOffset.
-    public async void CreateRoleBan(NetUserId? target, string? targetUsername, NetUserId? banningAdmin, (IPAddress, int)? addressRange, ImmutableArray<byte>? hwid, string role, uint? minutes, NoteSeverity severity, string reason, DateTimeOffset timeOfBan)
+    public async void CreateRoleBan(NetUserId? target, string? targetUsername, NetUserId? banningAdmin, (IPAddress, int)? addressRange, ImmutableTypedHwid? hwid, string role, uint? minutes, NoteSeverity severity, string reason, DateTimeOffset timeOfBan)
     {
         if (!_prototypeManager.TryIndex(role, out JobPrototype? _))
         {
diff --git a/Content.Server/Administration/Managers/IBanManager.cs b/Content.Server/Administration/Managers/IBanManager.cs
index c11e310a825..fc192cc3066 100644
--- a/Content.Server/Administration/Managers/IBanManager.cs
+++ b/Content.Server/Administration/Managers/IBanManager.cs
@@ -24,7 +24,7 @@ public interface IBanManager
     /// <param name="minutes">Number of minutes to ban for. 0 and null mean permanent</param>
     /// <param name="severity">Severity of the resulting ban note</param>
     /// <param name="reason">Reason for the ban</param>
-    public void CreateServerBan(NetUserId? target, string? targetUsername, NetUserId? banningAdmin, (IPAddress, int)? addressRange, ImmutableArray<byte>? hwid, uint? minutes, NoteSeverity severity, string reason);
+    public void CreateServerBan(NetUserId? target, string? targetUsername, NetUserId? banningAdmin, (IPAddress, int)? addressRange, ImmutableTypedHwid? hwid, uint? minutes, NoteSeverity severity, string reason);
     public HashSet<string>? GetRoleBans(NetUserId playerUserId);
     public HashSet<ProtoId<JobPrototype>>? GetJobBans(NetUserId playerUserId);
 
@@ -37,7 +37,7 @@ public interface IBanManager
     /// <param name="reason">Reason for the ban</param>
     /// <param name="minutes">Number of minutes to ban for. 0 and null mean permanent</param>
     /// <param name="timeOfBan">Time when the ban was applied, used for grouping role bans</param>
-    public void CreateRoleBan(NetUserId? target, string? targetUsername, NetUserId? banningAdmin, (IPAddress, int)? addressRange, ImmutableArray<byte>? hwid, string role, uint? minutes, NoteSeverity severity, string reason, DateTimeOffset timeOfBan);
+    public void CreateRoleBan(NetUserId? target, string? targetUsername, NetUserId? banningAdmin, (IPAddress, int)? addressRange, ImmutableTypedHwid? hwid, string role, uint? minutes, NoteSeverity severity, string reason, DateTimeOffset timeOfBan);
 
     /// <summary>
     /// Pardons a role ban for the specified target, username or GUID
diff --git a/Content.Server/Administration/PlayerLocator.cs b/Content.Server/Administration/PlayerLocator.cs
index 64a85f19ad0..25cc7714686 100644
--- a/Content.Server/Administration/PlayerLocator.cs
+++ b/Content.Server/Administration/PlayerLocator.cs
@@ -5,16 +5,42 @@
 using System.Net.Http.Json;
 using System.Threading;
 using System.Threading.Tasks;
+using Content.Server.Connection;
 using Content.Server.Database;
+using Content.Shared.Database;
 using JetBrains.Annotations;
 using Robust.Server.Player;
 using Robust.Shared;
 using Robust.Shared.Configuration;
 using Robust.Shared.Network;
+using Robust.Shared.Player;
 
 namespace Content.Server.Administration
 {
-    public sealed record LocatedPlayerData(NetUserId UserId, IPAddress? LastAddress, ImmutableArray<byte>? LastHWId, string Username);
+    /// <summary>
+    /// Contains data resolved via <see cref="IPlayerLocator"/>.
+    /// </summary>
+    /// <param name="UserId">The ID of the located user.</param>
+    /// <param name="LastAddress">The last known IP address that the user connected with.</param>
+    /// <param name="LastHWId">
+    /// The last known HWID that the user connected with.
+    /// This should be used for placing new records involving HWIDs, such as bans.
+    /// For looking up data based on HWID, use combined <see cref="LastLegacyHWId"/> and <see cref="LastModernHWIds"/>.
+    /// </param>
+    /// <param name="Username">The last known username for the user connected with.</param>
+    /// <param name="LastLegacyHWId">
+    /// The last known legacy HWID value this user connected with. Only use for old lookups!
+    /// </param>
+    /// <param name="LastModernHWIds">
+    /// The set of last known modern HWIDs the user connected with.
+    /// </param>
+    public sealed record LocatedPlayerData(
+        NetUserId UserId,
+        IPAddress? LastAddress,
+        ImmutableTypedHwid? LastHWId,
+        string Username,
+        ImmutableArray<byte>? LastLegacyHWId,
+        ImmutableArray<ImmutableArray<byte>> LastModernHWIds);
 
     /// <summary>
     ///     Utilities for finding user IDs that extend to more than the server database.
@@ -67,63 +93,42 @@ public PlayerLocator()
         {
             // Check people currently on the server, the easiest case.
             if (_playerManager.TryGetSessionByUsername(playerName, out var session))
-            {
-                var userId = session.UserId;
-                var address = session.Channel.RemoteEndPoint.Address;
-                var hwId = session.Channel.UserData.HWId;
-                return new LocatedPlayerData(userId, address, hwId, session.Name);
-            }
+                return ReturnForSession(session);
 
             // Check database for past players.
             var record = await _db.GetPlayerRecordByUserName(playerName, cancel);
             if (record != null)
-                return new LocatedPlayerData(record.UserId, record.LastSeenAddress, record.HWId, record.LastSeenUserName);
+                return ReturnForPlayerRecord(record);
 
             // If all else fails, ask the auth server.
             var authServer = _configurationManager.GetCVar(CVars.AuthServer);
             var requestUri = $"{authServer}api/query/name?name={WebUtility.UrlEncode(playerName)}";
             using var resp = await _httpClient.GetAsync(requestUri, cancel);
 
-            if (resp.StatusCode == HttpStatusCode.NotFound)
-                return null;
-
-            if (!resp.IsSuccessStatusCode)
-            {
-                _sawmill.Error("Auth server returned bad response {StatusCode}!", resp.StatusCode);
-                return null;
-            }
-
-            var responseData = await resp.Content.ReadFromJsonAsync<UserDataResponse>(cancellationToken: cancel);
-
-            if (responseData == null)
-            {
-                _sawmill.Error("Auth server returned null response!");
-                return null;
-            }
-
-            return new LocatedPlayerData(new NetUserId(responseData.UserId), null, null, responseData.UserName);
+            return await HandleAuthServerResponse(resp, cancel);
         }
 
         public async Task<LocatedPlayerData?> LookupIdAsync(NetUserId userId, CancellationToken cancel = default)
         {
             // Check people currently on the server, the easiest case.
             if (_playerManager.TryGetSessionById(userId, out var session))
-            {
-                var address = session.Channel.RemoteEndPoint.Address;
-                var hwId = session.Channel.UserData.HWId;
-                return new LocatedPlayerData(userId, address, hwId, session.Name);
-            }
+                return ReturnForSession(session);
 
             // Check database for past players.
             var record = await _db.GetPlayerRecordByUserId(userId, cancel);
             if (record != null)
-                return new LocatedPlayerData(record.UserId, record.LastSeenAddress, record.HWId, record.LastSeenUserName);
+                return ReturnForPlayerRecord(record);
 
             // If all else fails, ask the auth server.
             var authServer = _configurationManager.GetCVar(CVars.AuthServer);
             var requestUri = $"{authServer}api/query/userid?userid={WebUtility.UrlEncode(userId.UserId.ToString())}";
             using var resp = await _httpClient.GetAsync(requestUri, cancel);
 
+            return await HandleAuthServerResponse(resp, cancel);
+        }
+
+        private async Task<LocatedPlayerData?> HandleAuthServerResponse(HttpResponseMessage resp, CancellationToken cancel)
+        {
             if (resp.StatusCode == HttpStatusCode.NotFound)
                 return null;
 
@@ -134,14 +139,40 @@ public PlayerLocator()
             }
 
             var responseData = await resp.Content.ReadFromJsonAsync<UserDataResponse>(cancellationToken: cancel);
-
             if (responseData == null)
             {
                 _sawmill.Error("Auth server returned null response!");
                 return null;
             }
 
-            return new LocatedPlayerData(new NetUserId(responseData.UserId), null, null, responseData.UserName);
+            return new LocatedPlayerData(new NetUserId(responseData.UserId), null, null, responseData.UserName, null, []);
+        }
+
+        private static LocatedPlayerData ReturnForSession(ICommonSession session)
+        {
+            var userId = session.UserId;
+            var address = session.Channel.RemoteEndPoint.Address;
+            var hwId = session.Channel.UserData.GetModernHwid();
+            return new LocatedPlayerData(
+                userId,
+                address,
+                hwId,
+                session.Name,
+                session.Channel.UserData.HWId,
+                session.Channel.UserData.ModernHWIds);
+        }
+
+        private static LocatedPlayerData ReturnForPlayerRecord(PlayerRecord record)
+        {
+            var hwid = record.HWId;
+
+            return new LocatedPlayerData(
+                record.UserId,
+                record.LastSeenAddress,
+                hwid,
+                record.LastSeenUserName,
+                hwid is { Type: HwidType.Legacy } ? hwid.Hwid : null,
+                hwid is { Type: HwidType.Modern } ? [hwid.Hwid] : []);
         }
 
         public async Task<LocatedPlayerData?> LookupIdByNameOrIdAsync(string playerName, CancellationToken cancel = default)
diff --git a/Content.Server/Administration/PlayerPanelEui.cs b/Content.Server/Administration/PlayerPanelEui.cs
index 4c0df806012..6c304888866 100644
--- a/Content.Server/Administration/PlayerPanelEui.cs
+++ b/Content.Server/Administration/PlayerPanelEui.cs
@@ -173,11 +173,11 @@ public async void SetPlayerState()
         {
             _whitelisted = await _db.GetWhitelistStatusAsync(_targetPlayer.UserId);
             // This won't get associated ip or hwid bans but they were not placed on this account anyways
-            _bans = (await _db.GetServerBansAsync(null, _targetPlayer.UserId, null)).Count;
+            _bans = (await _db.GetServerBansAsync(null, _targetPlayer.UserId, null, null)).Count;
             // Unfortunately role bans for departments and stuff are issued individually. This means that a single role ban can have many individual role bans internally
             // The only way to distinguish whether a role ban is the same is to compare the ban time.
             // This is horrible and I would love to just erase the database and start from scratch instead but that's what I can do for now.
-            _roleBans = (await _db.GetServerRoleBansAsync(null, _targetPlayer.UserId, null)).DistinctBy(rb => rb.BanTime).Count();
+            _roleBans = (await _db.GetServerRoleBansAsync(null, _targetPlayer.UserId, null, null)).DistinctBy(rb => rb.BanTime).Count();
         }
         else
         {
diff --git a/Content.Server/Administration/Systems/BwoinkSystem.cs b/Content.Server/Administration/Systems/BwoinkSystem.cs
index 7a47755db9d..4358b7e3876 100644
--- a/Content.Server/Administration/Systems/BwoinkSystem.cs
+++ b/Content.Server/Administration/Systems/BwoinkSystem.cs
@@ -172,7 +172,7 @@ private async void OnPlayerStatusChanged(object? sender, SessionStatusEventArgs
                 }
 
                 // Check if the user has been banned
-                var ban = await _dbManager.GetServerBanAsync(null, e.Session.UserId, null);
+                var ban = await _dbManager.GetServerBanAsync(null, e.Session.UserId, null, null);
                 if (ban != null)
                 {
                     var banMessage = Loc.GetString("bwoink-system-player-banned", ("banReason", ban.Reason));
diff --git a/Content.Server/Administration/Toolshed/TagCommand.cs b/Content.Server/Administration/Toolshed/TagCommand.cs
index e1cf53e1b1a..4c6f790e493 100644
--- a/Content.Server/Administration/Toolshed/TagCommand.cs
+++ b/Content.Server/Administration/Toolshed/TagCommand.cs
@@ -25,6 +25,16 @@ public IEnumerable<ProtoId<TagPrototype>> List([PipedArgument] IEnumerable<Entit
         });
     }
 
+    [CommandImplementation("with")]
+    public IEnumerable<EntityUid> With(
+        [CommandInvocationContext] IInvocationContext ctx,
+        [PipedArgument] IEnumerable<EntityUid> entities,
+        [CommandArgument] ValueRef<string, Prototype<TagPrototype>> tag)
+    {
+        _tag ??= GetSys<TagSystem>();
+        return entities.Where(e => _tag.HasTag(e, tag.Evaluate(ctx)!));
+    }
+
     [CommandImplementation("add")]
     public EntityUid Add(
             [CommandInvocationContext] IInvocationContext ctx,
diff --git a/Content.Server/Alert/ServerAlertsSystem.cs b/Content.Server/Alert/ServerAlertsSystem.cs
index b7b80f73210..5af2b062188 100644
--- a/Content.Server/Alert/ServerAlertsSystem.cs
+++ b/Content.Server/Alert/ServerAlertsSystem.cs
@@ -1,7 +1,19 @@
 using Content.Shared.Alert;
+using Robust.Shared.GameStates;
 
 namespace Content.Server.Alert;
 
 internal sealed class ServerAlertsSystem : AlertsSystem
 {
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<AlertsComponent, ComponentGetState>(OnGetState);
+    }
+
+    private void OnGetState(Entity<AlertsComponent> alerts, ref ComponentGetState args)
+    {
+        args.State = new AlertComponentState(alerts.Comp.Alerts);
+    }
 }
diff --git a/Content.Server/Antag/AntagSelectionSystem.cs b/Content.Server/Antag/AntagSelectionSystem.cs
index 224629ff2e5..610c0ad182a 100644
--- a/Content.Server/Antag/AntagSelectionSystem.cs
+++ b/Content.Server/Antag/AntagSelectionSystem.cs
@@ -55,6 +55,8 @@ public override void Initialize()
     {
         base.Initialize();
 
+        Log.Level = LogLevel.Debug;
+
         SubscribeLocalEvent<GhostRoleAntagSpawnerComponent, TakeGhostRoleEvent>(OnTakeGhostRole);
 
         SubscribeLocalEvent<AntagSelectionComponent, ObjectivesTextGetInfoEvent>(OnObjectivesTextGetInfo);
@@ -360,6 +362,8 @@ public void MakeAntag(Entity<AntagSelectionComponent> ent, ICommonSession? sessi
             _role.MindAddRoles(curMind.Value, def.MindRoles, null, true);
             ent.Comp.SelectedMinds.Add((curMind.Value, Name(player)));
             SendBriefing(session, def.Briefing);
+
+            Log.Debug($"Selected {ToPrettyString(curMind)} as antagonist: {ToPrettyString(ent)}");
         }
 
         var afterEv = new AfterAntagEntitySelectedEvent(session, player, ent, def);
diff --git a/Content.Server/Botany/Systems/PlantHolderSystem.cs b/Content.Server/Botany/Systems/PlantHolderSystem.cs
index 34d6a75bf25..271acb606a4 100644
--- a/Content.Server/Botany/Systems/PlantHolderSystem.cs
+++ b/Content.Server/Botany/Systems/PlantHolderSystem.cs
@@ -680,7 +680,10 @@ public bool DoHarvest(EntityUid plantholder, EntityUid user, PlantHolderComponen
             if (TryComp<HandsComponent>(user, out var hands))
             {
                 if (!_botany.CanHarvest(component.Seed, hands.ActiveHandEntity))
+                {
+                    _popup.PopupCursor(Loc.GetString("plant-holder-component-ligneous-cant-harvest-message"), user);
                     return false;
+                }
             }
             else if (!_botany.CanHarvest(component.Seed))
             {
diff --git a/Content.Server/CartridgeLoader/CartridgeLoaderSystem.cs b/Content.Server/CartridgeLoader/CartridgeLoaderSystem.cs
index cd422328c3e..81f60d41faf 100644
--- a/Content.Server/CartridgeLoader/CartridgeLoaderSystem.cs
+++ b/Content.Server/CartridgeLoader/CartridgeLoaderSystem.cs
@@ -422,6 +422,7 @@ private void OnUiMessage(EntityUid uid, CartridgeLoaderComponent component, Cart
     {
         var cartridgeEvent = args.MessageEvent;
         cartridgeEvent.LoaderUid = GetNetEntity(uid);
+        cartridgeEvent.Actor = args.Actor;
 
         RelayEvent(component, cartridgeEvent, true);
     }
diff --git a/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs b/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
index c5c45daa5bd..eb2039604af 100644
--- a/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
@@ -13,6 +13,7 @@
 using Content.Shared.Interaction;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Stacks;
+using Content.Shared.Nutrition.EntitySystems;
 
 namespace Content.Server.Chemistry.EntitySystems;
 
@@ -20,6 +21,7 @@ public sealed class InjectorSystem : SharedInjectorSystem
 {
     [Dependency] private readonly BloodstreamSystem _blood = default!;
     [Dependency] private readonly ReactiveSystem _reactiveSystem = default!;
+    [Dependency] private readonly OpenableSystem _openable = default!;
 
     public override void Initialize()
     {
@@ -31,13 +33,14 @@ public override void Initialize()
 
     private bool TryUseInjector(Entity<InjectorComponent> injector, EntityUid target, EntityUid user)
     {
+        var isOpenOrIgnored = injector.Comp.IgnoreClosed || !_openable.IsClosed(target);
         // Handle injecting/drawing for solutions
         if (injector.Comp.ToggleState == InjectorToggleMode.Inject)
         {
-            if (SolutionContainers.TryGetInjectableSolution(target, out var injectableSolution, out _))
+            if (isOpenOrIgnored && SolutionContainers.TryGetInjectableSolution(target, out var injectableSolution, out _))
                 return TryInject(injector, target, injectableSolution.Value, user, false);
 
-            if (SolutionContainers.TryGetRefillableSolution(target, out var refillableSolution, out _))
+            if (isOpenOrIgnored && SolutionContainers.TryGetRefillableSolution(target, out var refillableSolution, out _))
                 return TryInject(injector, target, refillableSolution.Value, user, true);
 
             if (TryComp<BloodstreamComponent>(target, out var bloodstream))
@@ -58,7 +61,7 @@ private bool TryUseInjector(Entity<InjectorComponent> injector, EntityUid target
             }
 
             // Draw from an object (food, beaker, etc)
-            if (SolutionContainers.TryGetDrawableSolution(target, out var drawableSolution, out _))
+            if (isOpenOrIgnored && SolutionContainers.TryGetDrawableSolution(target, out var drawableSolution, out _))
                 return TryDraw(injector, target, drawableSolution.Value, user);
 
             Popup.PopupEntity(Loc.GetString("injector-component-cannot-draw-message",
diff --git a/Content.Server/Clothing/Systems/CursedMaskSystem.cs b/Content.Server/Clothing/Systems/CursedMaskSystem.cs
index 825e85e2c60..86d4e801a8b 100644
--- a/Content.Server/Clothing/Systems/CursedMaskSystem.cs
+++ b/Content.Server/Clothing/Systems/CursedMaskSystem.cs
@@ -51,7 +51,8 @@ protected override void TryTakeover(Entity<CursedMaskComponent> ent, EntityUid w
         }
 
         var npcFaction = EnsureComp<NpcFactionMemberComponent>(wearer);
-        ent.Comp.OldFactions = npcFaction.Factions;
+        ent.Comp.OldFactions.Clear();
+        ent.Comp.OldFactions.UnionWith(npcFaction.Factions);
         _npcFaction.ClearFactions((wearer, npcFaction), false);
         _npcFaction.AddFaction((wearer, npcFaction), ent.Comp.CursedMaskFaction);
 
diff --git a/Content.Server/Connection/ConnectionManager.cs b/Content.Server/Connection/ConnectionManager.cs
index 12d00021793..e0fe3b395ff 100644
--- a/Content.Server/Connection/ConnectionManager.cs
+++ b/Content.Server/Connection/ConnectionManager.cs
@@ -115,11 +115,14 @@ private async Task NetMgrOnConnecting(NetConnectingArgs e)
 
             var serverId = (await _serverDbEntry.ServerEntity).Id;
 
+            var hwid = e.UserData.GetModernHwid();
+            var trust = e.UserData.Trust;
+
             if (deny != null)
             {
                 var (reason, msg, banHits) = deny.Value;
 
-                var id = await _db.AddConnectionLogAsync(userId, e.UserName, addr, e.UserData.HWId, reason, serverId);
+                var id = await _db.AddConnectionLogAsync(userId, e.UserName, addr, hwid, trust, reason, serverId);
                 if (banHits is { Count: > 0 })
                     await _db.AddServerBanHitsAsync(id, banHits);
 
@@ -131,12 +134,12 @@ private async Task NetMgrOnConnecting(NetConnectingArgs e)
             }
             else
             {
-                await _db.AddConnectionLogAsync(userId, e.UserName, addr, e.UserData.HWId, null, serverId);
+                await _db.AddConnectionLogAsync(userId, e.UserName, addr, hwid, trust, null, serverId);
 
                 if (!ServerPreferencesManager.ShouldStorePrefs(e.AuthType))
                     return;
 
-                await _db.UpdatePlayerRecordAsync(userId, e.UserName, addr, e.UserData.HWId);
+                await _db.UpdatePlayerRecordAsync(userId, e.UserName, addr, hwid);
             }
         }
 
@@ -194,7 +197,9 @@ session.Status is SessionStatus.Connected or SessionStatus.InGame
                 hwId = null;
             }
 
-            var bans = await _db.GetServerBansAsync(addr, userId, hwId, includeUnbanned: false);
+            var modernHwid = e.UserData.ModernHWIds;
+
+            var bans = await _db.GetServerBansAsync(addr, userId, hwId, modernHwid, includeUnbanned: false);
             if (bans.Count > 0)
             {
                 var firstBan = bans[0];
diff --git a/Content.Server/Connection/UserDataExt.cs b/Content.Server/Connection/UserDataExt.cs
new file mode 100644
index 00000000000..a409f79a75d
--- /dev/null
+++ b/Content.Server/Connection/UserDataExt.cs
@@ -0,0 +1,24 @@
+using Content.Shared.Database;
+using Robust.Shared.Network;
+
+namespace Content.Server.Connection;
+
+/// <summary>
+/// Helper functions for working with <see cref="NetUserData"/>.
+/// </summary>
+public static class UserDataExt
+{
+    /// <summary>
+    /// Get the preferred HWID that should be used for new records related to a player.
+    /// </summary>
+    /// <remarks>
+    /// Players can have zero or more HWIDs, but for logging things like connection logs we generally
+    /// only want a single one. This method returns a nullable method.
+    /// </remarks>
+    public static ImmutableTypedHwid? GetModernHwid(this NetUserData userData)
+    {
+        return userData.ModernHWIds.Length == 0
+            ? null
+            : new ImmutableTypedHwid(userData.ModernHWIds[0], HwidType.Modern);
+    }
+}
diff --git a/Content.Server/Database/BanMatcher.cs b/Content.Server/Database/BanMatcher.cs
index e58e5b0b5f6..f477ccd822a 100644
--- a/Content.Server/Database/BanMatcher.cs
+++ b/Content.Server/Database/BanMatcher.cs
@@ -1,6 +1,7 @@
 using System.Collections.Immutable;
 using System.Net;
 using Content.Server.IP;
+using Content.Shared.Database;
 using Robust.Shared.Network;
 
 namespace Content.Server.Database;
@@ -52,9 +53,28 @@ public static bool BanMatches(ServerBanDef ban, in PlayerInfo player)
             return true;
         }
 
-        return player.HWId is { Length: > 0 } hwIdVar
-               && ban.HWId != null
-               && hwIdVar.AsSpan().SequenceEqual(ban.HWId.Value.AsSpan());
+        switch (ban.HWId?.Type)
+        {
+            case HwidType.Legacy:
+                if (player.HWId is { Length: > 0 } hwIdVar
+                    && hwIdVar.AsSpan().SequenceEqual(ban.HWId.Hwid.AsSpan()))
+                {
+                    return true;
+                }
+                break;
+            case HwidType.Modern:
+                if (player.ModernHWIds is { Length: > 0 } modernHwIdVar)
+                {
+                    foreach (var hwid in modernHwIdVar)
+                    {
+                        if (hwid.AsSpan().SequenceEqual(ban.HWId.Hwid.AsSpan()))
+                            return true;
+                    }
+                }
+                break;
+        }
+
+        return false;
     }
 
     /// <summary>
@@ -73,10 +93,15 @@ public struct PlayerInfo
         public IPAddress? Address;
 
         /// <summary>
-        /// The hardware ID of the player.
+        /// The LEGACY hardware ID of the player. Corresponds with <see cref="NetUserData.HWId"/>.
         /// </summary>
         public ImmutableArray<byte>? HWId;
 
+        /// <summary>
+        /// The modern hardware IDs of the player. Corresponds with <see cref="NetUserData.ModernHWIds"/>.
+        /// </summary>
+        public ImmutableArray<ImmutableArray<byte>>? ModernHWIds;
+
         /// <summary>
         /// Exemption flags the player has been granted.
         /// </summary>
diff --git a/Content.Server/Database/DatabaseRecords.cs b/Content.Server/Database/DatabaseRecords.cs
index c0d81147bb4..30fba3434b8 100644
--- a/Content.Server/Database/DatabaseRecords.cs
+++ b/Content.Server/Database/DatabaseRecords.cs
@@ -1,4 +1,3 @@
-using System.Collections.Immutable;
 using System.Net;
 using Content.Shared.Database;
 using Robust.Shared.Network;
@@ -121,7 +120,7 @@ public sealed record PlayerRecord(
     string LastSeenUserName,
     DateTimeOffset LastSeenTime,
     IPAddress LastSeenAddress,
-    ImmutableArray<byte>? HWId);
+    ImmutableTypedHwid? HWId);
 
 public sealed record RoundRecord(int Id, DateTimeOffset? StartDate, ServerRecord Server);
 
diff --git a/Content.Server/Database/ServerBanDef.cs b/Content.Server/Database/ServerBanDef.cs
index 09a960e9a6c..a09f9e959c6 100644
--- a/Content.Server/Database/ServerBanDef.cs
+++ b/Content.Server/Database/ServerBanDef.cs
@@ -1,4 +1,3 @@
-using System.Collections.Immutable;
 using System.Net;
 using Content.Shared.CCVar;
 using Content.Shared.Database;
@@ -13,7 +12,7 @@ public sealed class ServerBanDef
         public int? Id { get; }
         public NetUserId? UserId { get; }
         public (IPAddress address, int cidrMask)? Address { get; }
-        public ImmutableArray<byte>? HWId { get; }
+        public ImmutableTypedHwid? HWId { get; }
 
         public DateTimeOffset BanTime { get; }
         public DateTimeOffset? ExpirationTime { get; }
@@ -28,7 +27,7 @@ public sealed class ServerBanDef
         public ServerBanDef(int? id,
             NetUserId? userId,
             (IPAddress, int)? address,
-            ImmutableArray<byte>? hwId,
+            TypedHwid? hwId,
             DateTimeOffset banTime,
             DateTimeOffset? expirationTime,
             int? roundId,
diff --git a/Content.Server/Database/ServerDbBase.cs b/Content.Server/Database/ServerDbBase.cs
index c85b774e381..9e1ad12a205 100644
--- a/Content.Server/Database/ServerDbBase.cs
+++ b/Content.Server/Database/ServerDbBase.cs
@@ -388,12 +388,14 @@ public async Task AssignUserIdAsync(string name, NetUserId netUserId)
         /// </summary>
         /// <param name="address">The ip address of the user.</param>
         /// <param name="userId">The id of the user.</param>
-        /// <param name="hwId">The HWId of the user.</param>
+        /// <param name="hwId">The legacy HWId of the user.</param>
+        /// <param name="modernHWIds">The modern HWIDs of the user.</param>
         /// <returns>The user's latest received un-pardoned ban, or null if none exist.</returns>
         public abstract Task<ServerBanDef?> GetServerBanAsync(
             IPAddress? address,
             NetUserId? userId,
-            ImmutableArray<byte>? hwId);
+            ImmutableArray<byte>? hwId,
+            ImmutableArray<ImmutableArray<byte>>? modernHWIds);
 
         /// <summary>
         ///     Looks up an user's ban history.
@@ -402,13 +404,15 @@ public async Task AssignUserIdAsync(string name, NetUserId netUserId)
         /// </summary>
         /// <param name="address">The ip address of the user.</param>
         /// <param name="userId">The id of the user.</param>
-        /// <param name="hwId">The HWId of the user.</param>
+        /// <param name="hwId">The legacy HWId of the user.</param>
+        /// <param name="modernHWIds">The modern HWIDs of the user.</param>
         /// <param name="includeUnbanned">Include pardoned and expired bans.</param>
         /// <returns>The user's ban history.</returns>
         public abstract Task<List<ServerBanDef>> GetServerBansAsync(
             IPAddress? address,
             NetUserId? userId,
             ImmutableArray<byte>? hwId,
+            ImmutableArray<ImmutableArray<byte>>? modernHWIds,
             bool includeUnbanned);
 
         public abstract Task AddServerBanAsync(ServerBanDef serverBan);
@@ -499,11 +503,13 @@ public async Task<ServerBanExemptFlags> GetBanExemption(NetUserId userId, Cancel
         /// <param name="address">The IP address of the user.</param>
         /// <param name="userId">The NetUserId of the user.</param>
         /// <param name="hwId">The Hardware Id of the user.</param>
+        /// <param name="modernHWIds">The modern HWIDs of the user.</param>
         /// <param name="includeUnbanned">Whether expired and pardoned bans are included.</param>
         /// <returns>The user's role ban history.</returns>
         public abstract Task<List<ServerRoleBanDef>> GetServerRoleBansAsync(IPAddress? address,
             NetUserId? userId,
             ImmutableArray<byte>? hwId,
+            ImmutableArray<ImmutableArray<byte>>? modernHWIds,
             bool includeUnbanned);
 
         public abstract Task<ServerRoleBanDef> AddServerRoleBanAsync(ServerRoleBanDef serverRoleBan);
@@ -512,16 +518,23 @@ public abstract Task<List<ServerRoleBanDef>> GetServerRoleBansAsync(IPAddress? a
         public async Task EditServerRoleBan(int id, string reason, NoteSeverity severity, DateTimeOffset? expiration, Guid editedBy, DateTimeOffset editedAt)
         {
             await using var db = await GetDb();
+            var roleBanDetails = await db.DbContext.RoleBan
+                .Where(b => b.Id == id)
+                .Select(b => new { b.BanTime, b.PlayerUserId })
+                .SingleOrDefaultAsync();
 
-            var ban = await db.DbContext.RoleBan.SingleOrDefaultAsync(b => b.Id == id);
-            if (ban is null)
+            if (roleBanDetails == default)
                 return;
-            ban.Severity = severity;
-            ban.Reason = reason;
-            ban.ExpirationTime = expiration?.UtcDateTime;
-            ban.LastEditedById = editedBy;
-            ban.LastEditedAt = editedAt.UtcDateTime;
-            await db.DbContext.SaveChangesAsync();
+
+            await db.DbContext.RoleBan
+                .Where(b => b.BanTime == roleBanDetails.BanTime && b.PlayerUserId == roleBanDetails.PlayerUserId)
+                .ExecuteUpdateAsync(setters => setters
+                    .SetProperty(b => b.Severity, severity)
+                    .SetProperty(b => b.Reason, reason)
+                    .SetProperty(b => b.ExpirationTime, expiration.HasValue ? expiration.Value.UtcDateTime : (DateTime?)null)
+                    .SetProperty(b => b.LastEditedById, editedBy)
+                    .SetProperty(b => b.LastEditedAt, editedAt.UtcDateTime)
+                );
         }
         #endregion
 
@@ -586,7 +599,7 @@ public async Task UpdatePlayerRecord(
             NetUserId userId,
             string userName,
             IPAddress address,
-            ImmutableArray<byte> hwId)
+            ImmutableTypedHwid? hwId)
         {
             await using var db = await GetDb();
 
@@ -603,7 +616,7 @@ public async Task UpdatePlayerRecord(
             record.LastSeenTime = DateTime.UtcNow;
             record.LastSeenAddress = address;
             record.LastSeenUserName = userName;
-            record.LastSeenHWId = hwId.ToArray();
+            record.LastSeenHWId = hwId;
 
             await db.DbContext.SaveChangesAsync();
         }
@@ -649,7 +662,7 @@ protected async Task<bool> PlayerRecordExists(DbGuard db, NetUserId userId)
                 player.LastSeenUserName,
                 new DateTimeOffset(NormalizeDatabaseTime(player.LastSeenTime)),
                 player.LastSeenAddress,
-                player.LastSeenHWId?.ToImmutableArray());
+                player.LastSeenHWId);
         }
 
         #endregion
@@ -658,11 +671,11 @@ protected async Task<bool> PlayerRecordExists(DbGuard db, NetUserId userId)
         /*
          * CONNECTION LOG
          */
-        public abstract Task<int> AddConnectionLogAsync(
-            NetUserId userId,
+        public abstract Task<int> AddConnectionLogAsync(NetUserId userId,
             string userName,
             IPAddress address,
-            ImmutableArray<byte> hwId,
+            ImmutableTypedHwid? hwId,
+            float trust,
             ConnectionDenyReason? denied,
             int serverId);
 
diff --git a/Content.Server/Database/ServerDbManager.cs b/Content.Server/Database/ServerDbManager.cs
index 216b1ec1596..be32b43595d 100644
--- a/Content.Server/Database/ServerDbManager.cs
+++ b/Content.Server/Database/ServerDbManager.cs
@@ -69,12 +69,14 @@ Task<PlayerPreferences> InitPrefsAsync(
         /// </summary>
         /// <param name="address">The ip address of the user.</param>
         /// <param name="userId">The id of the user.</param>
-        /// <param name="hwId">The hardware ID of the user.</param>
+        /// <param name="hwId">The legacy HWID of the user.</param>
+        /// <param name="modernHWIds">The modern HWIDs of the user.</param>
         /// <returns>The user's latest received un-pardoned ban, or null if none exist.</returns>
         Task<ServerBanDef?> GetServerBanAsync(
             IPAddress? address,
             NetUserId? userId,
-            ImmutableArray<byte>? hwId);
+            ImmutableArray<byte>? hwId,
+            ImmutableArray<ImmutableArray<byte>>? modernHWIds);
 
         /// <summary>
         ///     Looks up an user's ban history.
@@ -82,13 +84,15 @@ Task<PlayerPreferences> InitPrefsAsync(
         /// </summary>
         /// <param name="address">The ip address of the user.</param>
         /// <param name="userId">The id of the user.</param>
-        /// <param name="hwId">The HWId of the user.</param>
+        /// <param name="hwId">The legacy HWId of the user.</param>
+        /// <param name="modernHWIds">The modern HWIDs of the user.</param>
         /// <param name="includeUnbanned">If true, bans that have been expired or pardoned are also included.</param>
         /// <returns>The user's ban history.</returns>
         Task<List<ServerBanDef>> GetServerBansAsync(
             IPAddress? address,
             NetUserId? userId,
             ImmutableArray<byte>? hwId,
+            ImmutableArray<ImmutableArray<byte>>? modernHWIds,
             bool includeUnbanned=true);
 
         Task AddServerBanAsync(ServerBanDef serverBan);
@@ -137,12 +141,14 @@ public Task EditServerBan(
         /// <param name="address">The IP address of the user.</param>
         /// <param name="userId">The NetUserId of the user.</param>
         /// <param name="hwId">The Hardware Id of the user.</param>
+        /// <param name="modernHWIds">The modern HWIDs of the user.</param>
         /// <param name="includeUnbanned">Whether expired and pardoned bans are included.</param>
         /// <returns>The user's role ban history.</returns>
         Task<List<ServerRoleBanDef>> GetServerRoleBansAsync(
             IPAddress? address,
             NetUserId? userId,
             ImmutableArray<byte>? hwId,
+            ImmutableArray<ImmutableArray<byte>>? modernHWIds,
             bool includeUnbanned = true);
 
         Task<ServerRoleBanDef> AddServerRoleBanAsync(ServerRoleBanDef serverBan);
@@ -180,7 +186,7 @@ Task UpdatePlayerRecordAsync(
             NetUserId userId,
             string userName,
             IPAddress address,
-            ImmutableArray<byte> hwId);
+            ImmutableTypedHwid? hwId);
         Task<PlayerRecord?> GetPlayerRecordByUserName(string userName, CancellationToken cancel = default);
         Task<PlayerRecord?> GetPlayerRecordByUserId(NetUserId userId, CancellationToken cancel = default);
         #endregion
@@ -191,7 +197,8 @@ Task<int> AddConnectionLogAsync(
             NetUserId userId,
             string userName,
             IPAddress address,
-            ImmutableArray<byte> hwId,
+            ImmutableTypedHwid? hwId,
+            float trust,
             ConnectionDenyReason? denied,
             int serverId);
 
@@ -480,20 +487,22 @@ public Task AssignUserIdAsync(string name, NetUserId userId)
         public Task<ServerBanDef?> GetServerBanAsync(
             IPAddress? address,
             NetUserId? userId,
-            ImmutableArray<byte>? hwId)
+            ImmutableArray<byte>? hwId,
+            ImmutableArray<ImmutableArray<byte>>? modernHWIds)
         {
             DbReadOpsMetric.Inc();
-            return RunDbCommand(() => _db.GetServerBanAsync(address, userId, hwId));
+            return RunDbCommand(() => _db.GetServerBanAsync(address, userId, hwId, modernHWIds));
         }
 
         public Task<List<ServerBanDef>> GetServerBansAsync(
             IPAddress? address,
             NetUserId? userId,
             ImmutableArray<byte>? hwId,
+            ImmutableArray<ImmutableArray<byte>>? modernHWIds,
             bool includeUnbanned=true)
         {
             DbReadOpsMetric.Inc();
-            return RunDbCommand(() => _db.GetServerBansAsync(address, userId, hwId, includeUnbanned));
+            return RunDbCommand(() => _db.GetServerBansAsync(address, userId, hwId, modernHWIds, includeUnbanned));
         }
 
         public Task AddServerBanAsync(ServerBanDef serverBan)
@@ -537,10 +546,11 @@ public Task<List<ServerRoleBanDef>> GetServerRoleBansAsync(
             IPAddress? address,
             NetUserId? userId,
             ImmutableArray<byte>? hwId,
+            ImmutableArray<ImmutableArray<byte>>? modernHWIds,
             bool includeUnbanned = true)
         {
             DbReadOpsMetric.Inc();
-            return RunDbCommand(() => _db.GetServerRoleBansAsync(address, userId, hwId, includeUnbanned));
+            return RunDbCommand(() => _db.GetServerRoleBansAsync(address, userId, hwId, modernHWIds, includeUnbanned));
         }
 
         public Task<ServerRoleBanDef> AddServerRoleBanAsync(ServerRoleBanDef serverRoleBan)
@@ -582,7 +592,7 @@ public Task UpdatePlayerRecordAsync(
             NetUserId userId,
             string userName,
             IPAddress address,
-            ImmutableArray<byte> hwId)
+            ImmutableTypedHwid? hwId)
         {
             DbWriteOpsMetric.Inc();
             return RunDbCommand(() => _db.UpdatePlayerRecord(userId, userName, address, hwId));
@@ -604,12 +614,13 @@ public Task<int> AddConnectionLogAsync(
             NetUserId userId,
             string userName,
             IPAddress address,
-            ImmutableArray<byte> hwId,
+            ImmutableTypedHwid? hwId,
+            float trust,
             ConnectionDenyReason? denied,
             int serverId)
         {
             DbWriteOpsMetric.Inc();
-            return RunDbCommand(() => _db.AddConnectionLogAsync(userId, userName, address, hwId, denied, serverId));
+            return RunDbCommand(() => _db.AddConnectionLogAsync(userId, userName, address, hwId, trust, denied, serverId));
         }
 
         public Task AddServerBanHitsAsync(int connection, IEnumerable<ServerBanDef> bans)
diff --git a/Content.Server/Database/ServerDbPostgres.cs b/Content.Server/Database/ServerDbPostgres.cs
index 7d131f70dc3..c0346708377 100644
--- a/Content.Server/Database/ServerDbPostgres.cs
+++ b/Content.Server/Database/ServerDbPostgres.cs
@@ -9,6 +9,7 @@
 using Content.Server.Administration.Logs;
 using Content.Server.IP;
 using Content.Shared.CCVar;
+using Content.Shared.Database;
 using Microsoft.EntityFrameworkCore;
 using Robust.Shared.Configuration;
 using Robust.Shared.Network;
@@ -73,7 +74,8 @@ public ServerDbPostgres(DbContextOptions<PostgresServerDbContext> options,
         public override async Task<ServerBanDef?> GetServerBanAsync(
             IPAddress? address,
             NetUserId? userId,
-            ImmutableArray<byte>? hwId)
+            ImmutableArray<byte>? hwId,
+            ImmutableArray<ImmutableArray<byte>>? modernHWIds)
         {
             if (address == null && userId == null && hwId == null)
             {
@@ -84,7 +86,7 @@ public ServerDbPostgres(DbContextOptions<PostgresServerDbContext> options,
 
             var exempt = await GetBanExemptionCore(db, userId);
             var newPlayer = userId == null || !await PlayerRecordExists(db, userId.Value);
-            var query = MakeBanLookupQuery(address, userId, hwId, db, includeUnbanned: false, exempt, newPlayer)
+            var query = MakeBanLookupQuery(address, userId, hwId, modernHWIds, db, includeUnbanned: false, exempt, newPlayer)
                 .OrderByDescending(b => b.BanTime);
 
             var ban = await query.FirstOrDefaultAsync();
@@ -94,7 +96,9 @@ public ServerDbPostgres(DbContextOptions<PostgresServerDbContext> options,
 
         public override async Task<List<ServerBanDef>> GetServerBansAsync(IPAddress? address,
             NetUserId? userId,
-            ImmutableArray<byte>? hwId, bool includeUnbanned)
+            ImmutableArray<byte>? hwId,
+            ImmutableArray<ImmutableArray<byte>>? modernHWIds,
+            bool includeUnbanned)
         {
             if (address == null && userId == null && hwId == null)
             {
@@ -105,7 +109,7 @@ public override async Task<List<ServerBanDef>> GetServerBansAsync(IPAddress? add
 
             var exempt = await GetBanExemptionCore(db, userId);
             var newPlayer = !await db.PgDbContext.Player.AnyAsync(p => p.UserId == userId);
-            var query = MakeBanLookupQuery(address, userId, hwId, db, includeUnbanned, exempt, newPlayer);
+            var query = MakeBanLookupQuery(address, userId, hwId, modernHWIds, db, includeUnbanned, exempt, newPlayer);
 
             var queryBans = await query.ToArrayAsync();
             var bans = new List<ServerBanDef>(queryBans.Length);
@@ -127,6 +131,7 @@ private static IQueryable<ServerBan> MakeBanLookupQuery(
             IPAddress? address,
             NetUserId? userId,
             ImmutableArray<byte>? hwId,
+            ImmutableArray<ImmutableArray<byte>>? modernHWIds,
             DbGuardImpl db,
             bool includeUnbanned,
             ServerBanExemptFlags? exemptFlags,
@@ -134,16 +139,11 @@ private static IQueryable<ServerBan> MakeBanLookupQuery(
         {
             DebugTools.Assert(!(address == null && userId == null && hwId == null));
 
-            IQueryable<ServerBan>? query = null;
-
-            if (userId is { } uid)
-            {
-                var newQ = db.PgDbContext.Ban
-                    .Include(p => p.Unban)
-                    .Where(b => b.PlayerUserId == uid.UserId);
-
-                query = query == null ? newQ : query.Union(newQ);
-            }
+            var query = MakeBanLookupQualityShared<ServerBan, ServerUnban>(
+                userId,
+                hwId,
+                modernHWIds,
+                db.PgDbContext.Ban);
 
             if (address != null && !exemptFlags.GetValueOrDefault(ServerBanExemptFlags.None).HasFlag(ServerBanExemptFlags.IP))
             {
@@ -156,15 +156,6 @@ private static IQueryable<ServerBan> MakeBanLookupQuery(
                 query = query == null ? newQ : query.Union(newQ);
             }
 
-            if (hwId != null && hwId.Value.Length > 0)
-            {
-                var newQ = db.PgDbContext.Ban
-                    .Include(p => p.Unban)
-                    .Where(b => b.HWId!.SequenceEqual(hwId.Value.ToArray()));
-
-                query = query == null ? newQ : query.Union(newQ);
-            }
-
             DebugTools.Assert(
                 query != null,
                 "At least one filter item (IP/UserID/HWID) must have been given to make query not null.");
@@ -186,6 +177,49 @@ private static IQueryable<ServerBan> MakeBanLookupQuery(
             return query.Distinct();
         }
 
+        private static IQueryable<TBan>? MakeBanLookupQualityShared<TBan, TUnban>(
+            NetUserId? userId,
+            ImmutableArray<byte>? hwId,
+            ImmutableArray<ImmutableArray<byte>>? modernHWIds,
+            DbSet<TBan> set)
+            where TBan : class, IBanCommon<TUnban>
+            where TUnban : class, IUnbanCommon
+        {
+            IQueryable<TBan>? query = null;
+
+            if (userId is { } uid)
+            {
+                var newQ = set
+                    .Include(p => p.Unban)
+                    .Where(b => b.PlayerUserId == uid.UserId);
+
+                query = query == null ? newQ : query.Union(newQ);
+            }
+
+            if (hwId != null && hwId.Value.Length > 0)
+            {
+                var newQ = set
+                    .Include(p => p.Unban)
+                    .Where(b => b.HWId!.Type == HwidType.Legacy && b.HWId!.Hwid.SequenceEqual(hwId.Value.ToArray()));
+
+                query = query == null ? newQ : query.Union(newQ);
+            }
+
+            if (modernHWIds != null)
+            {
+                foreach (var modernHwid in modernHWIds)
+                {
+                    var newQ = set
+                        .Include(p => p.Unban)
+                        .Where(b => b.HWId!.Type == HwidType.Modern && b.HWId!.Hwid.SequenceEqual(modernHwid.ToArray()));
+
+                    query = query == null ? newQ : query.Union(newQ);
+                }
+            }
+
+            return query;
+        }
+
         private static ServerBanDef? ConvertBan(ServerBan? ban)
         {
             if (ban == null)
@@ -211,7 +245,7 @@ private static IQueryable<ServerBan> MakeBanLookupQuery(
                 ban.Id,
                 uid,
                 ban.Address.ToTuple(),
-                ban.HWId == null ? null : ImmutableArray.Create(ban.HWId),
+                ban.HWId,
                 ban.BanTime,
                 ban.ExpirationTime,
                 ban.RoundId,
@@ -249,7 +283,7 @@ public override async Task AddServerBanAsync(ServerBanDef serverBan)
             db.PgDbContext.Ban.Add(new ServerBan
             {
                 Address = serverBan.Address.ToNpgsqlInet(),
-                HWId = serverBan.HWId?.ToArray(),
+                HWId = serverBan.HWId,
                 Reason = serverBan.Reason,
                 Severity = serverBan.Severity,
                 BanningAdmin = serverBan.BanningAdmin?.UserId,
@@ -297,6 +331,7 @@ public override async Task AddServerUnbanAsync(ServerUnbanDef serverUnban)
         public override async Task<List<ServerRoleBanDef>> GetServerRoleBansAsync(IPAddress? address,
             NetUserId? userId,
             ImmutableArray<byte>? hwId,
+            ImmutableArray<ImmutableArray<byte>>? modernHWIds,
             bool includeUnbanned)
         {
             if (address == null && userId == null && hwId == null)
@@ -306,7 +341,7 @@ public override async Task<List<ServerRoleBanDef>> GetServerRoleBansAsync(IPAddr
 
             await using var db = await GetDbImpl();
 
-            var query = MakeRoleBanLookupQuery(address, userId, hwId, db, includeUnbanned)
+            var query = MakeRoleBanLookupQuery(address, userId, hwId, modernHWIds, db, includeUnbanned)
                 .OrderByDescending(b => b.BanTime);
 
             return await QueryRoleBans(query);
@@ -334,19 +369,15 @@ private static IQueryable<ServerRoleBan> MakeRoleBanLookupQuery(
             IPAddress? address,
             NetUserId? userId,
             ImmutableArray<byte>? hwId,
+            ImmutableArray<ImmutableArray<byte>>? modernHWIds,
             DbGuardImpl db,
             bool includeUnbanned)
         {
-            IQueryable<ServerRoleBan>? query = null;
-
-            if (userId is { } uid)
-            {
-                var newQ = db.PgDbContext.RoleBan
-                    .Include(p => p.Unban)
-                    .Where(b => b.PlayerUserId == uid.UserId);
-
-                query = query == null ? newQ : query.Union(newQ);
-            }
+            var query = MakeBanLookupQualityShared<ServerRoleBan, ServerRoleUnban>(
+                userId,
+                hwId,
+                modernHWIds,
+                db.PgDbContext.RoleBan);
 
             if (address != null)
             {
@@ -357,15 +388,6 @@ private static IQueryable<ServerRoleBan> MakeRoleBanLookupQuery(
                 query = query == null ? newQ : query.Union(newQ);
             }
 
-            if (hwId != null && hwId.Value.Length > 0)
-            {
-                var newQ = db.PgDbContext.RoleBan
-                    .Include(p => p.Unban)
-                    .Where(b => b.HWId!.SequenceEqual(hwId.Value.ToArray()));
-
-                query = query == null ? newQ : query.Union(newQ);
-            }
-
             if (!includeUnbanned)
             {
                 query = query?.Where(p =>
@@ -402,7 +424,7 @@ private static IQueryable<ServerRoleBan> MakeRoleBanLookupQuery(
                 ban.Id,
                 uid,
                 ban.Address.ToTuple(),
-                ban.HWId == null ? null : ImmutableArray.Create(ban.HWId),
+                ban.HWId,
                 ban.BanTime,
                 ban.ExpirationTime,
                 ban.RoundId,
@@ -440,7 +462,7 @@ public override async Task<ServerRoleBanDef> AddServerRoleBanAsync(ServerRoleBan
             var ban = new ServerRoleBan
             {
                 Address = serverRoleBan.Address.ToNpgsqlInet(),
-                HWId = serverRoleBan.HWId?.ToArray(),
+                HWId = serverRoleBan.HWId,
                 Reason = serverRoleBan.Reason,
                 Severity = serverRoleBan.Severity,
                 BanningAdmin = serverRoleBan.BanningAdmin?.UserId,
@@ -476,7 +498,8 @@ public override async Task<int> AddConnectionLogAsync(
             NetUserId userId,
             string userName,
             IPAddress address,
-            ImmutableArray<byte> hwId,
+            ImmutableTypedHwid? hwId,
+            float trust,
             ConnectionDenyReason? denied,
             int serverId)
         {
@@ -488,9 +511,10 @@ public override async Task<int> AddConnectionLogAsync(
                 Time = DateTime.UtcNow,
                 UserId = userId.UserId,
                 UserName = userName,
-                HWId = hwId.ToArray(),
+                HWId = hwId,
                 Denied = denied,
-                ServerId = serverId
+                ServerId = serverId,
+                Trust = trust,
             };
 
             db.PgDbContext.ConnectionLog.Add(connectionLog);
diff --git a/Content.Server/Database/ServerDbSqlite.cs b/Content.Server/Database/ServerDbSqlite.cs
index af4bc2cf8de..6ec90c3332f 100644
--- a/Content.Server/Database/ServerDbSqlite.cs
+++ b/Content.Server/Database/ServerDbSqlite.cs
@@ -9,6 +9,7 @@
 using Content.Server.IP;
 using Content.Server.Preferences.Managers;
 using Content.Shared.CCVar;
+using Content.Shared.Database;
 using Microsoft.EntityFrameworkCore;
 using Robust.Shared.Configuration;
 using Robust.Shared.Network;
@@ -80,22 +81,24 @@ public ServerDbSqlite(
         public override async Task<ServerBanDef?> GetServerBanAsync(
             IPAddress? address,
             NetUserId? userId,
-            ImmutableArray<byte>? hwId)
+            ImmutableArray<byte>? hwId,
+            ImmutableArray<ImmutableArray<byte>>? modernHWIds)
         {
             await using var db = await GetDbImpl();
 
-            return (await GetServerBanQueryAsync(db, address, userId, hwId, includeUnbanned: false)).FirstOrDefault();
+            return (await GetServerBanQueryAsync(db, address, userId, hwId, modernHWIds, includeUnbanned: false)).FirstOrDefault();
         }
 
         public override async Task<List<ServerBanDef>> GetServerBansAsync(
             IPAddress? address,
             NetUserId? userId,
             ImmutableArray<byte>? hwId,
+            ImmutableArray<ImmutableArray<byte>>? modernHWIds,
             bool includeUnbanned)
         {
             await using var db = await GetDbImpl();
 
-            return (await GetServerBanQueryAsync(db, address, userId, hwId, includeUnbanned)).ToList();
+            return (await GetServerBanQueryAsync(db, address, userId, hwId, modernHWIds, includeUnbanned)).ToList();
         }
 
         private async Task<IEnumerable<ServerBanDef>> GetServerBanQueryAsync(
@@ -103,6 +106,7 @@ private async Task<IEnumerable<ServerBanDef>> GetServerBanQueryAsync(
             IPAddress? address,
             NetUserId? userId,
             ImmutableArray<byte>? hwId,
+            ImmutableArray<ImmutableArray<byte>>? modernHWIds,
             bool includeUnbanned)
         {
             var exempt = await GetBanExemptionCore(db, userId);
@@ -119,6 +123,7 @@ private async Task<IEnumerable<ServerBanDef>> GetServerBanQueryAsync(
                 UserId = userId,
                 ExemptFlags = exempt ?? default,
                 HWId = hwId,
+                ModernHWIds = modernHWIds,
                 IsNewPlayer = newPlayer,
             };
 
@@ -161,7 +166,7 @@ public override async Task AddServerBanAsync(ServerBanDef serverBan)
                 Reason = serverBan.Reason,
                 Severity = serverBan.Severity,
                 BanningAdmin = serverBan.BanningAdmin?.UserId,
-                HWId = serverBan.HWId?.ToArray(),
+                HWId = serverBan.HWId,
                 BanTime = serverBan.BanTime.UtcDateTime,
                 ExpirationTime = serverBan.ExpirationTime?.UtcDateTime,
                 RoundId = serverBan.RoundId,
@@ -205,6 +210,7 @@ public override async Task<List<ServerRoleBanDef>> GetServerRoleBansAsync(
             IPAddress? address,
             NetUserId? userId,
             ImmutableArray<byte>? hwId,
+            ImmutableArray<ImmutableArray<byte>>? modernHWIds,
             bool includeUnbanned)
         {
             await using var db = await GetDbImpl();
@@ -214,7 +220,7 @@ public override async Task<List<ServerRoleBanDef>> GetServerRoleBansAsync(
             var queryBans = await GetAllRoleBans(db.SqliteDbContext, includeUnbanned);
 
             return queryBans
-                .Where(b => RoleBanMatches(b, address, userId, hwId))
+                .Where(b => RoleBanMatches(b, address, userId, hwId, modernHWIds))
                 .Select(ConvertRoleBan)
                 .ToList()!;
         }
@@ -237,7 +243,8 @@ private static bool RoleBanMatches(
             ServerRoleBan ban,
             IPAddress? address,
             NetUserId? userId,
-            ImmutableArray<byte>? hwId)
+            ImmutableArray<byte>? hwId,
+            ImmutableArray<ImmutableArray<byte>>? modernHWIds)
         {
             if (address != null && ban.Address is not null && address.IsInSubnet(ban.Address.ToTuple().Value))
             {
@@ -249,7 +256,27 @@ private static bool RoleBanMatches(
                 return true;
             }
 
-            return hwId is { Length: > 0 } hwIdVar && hwIdVar.AsSpan().SequenceEqual(ban.HWId);
+            switch (ban.HWId?.Type)
+            {
+                case HwidType.Legacy:
+                    if (hwId is { Length: > 0 } hwIdVar && hwIdVar.AsSpan().SequenceEqual(ban.HWId.Hwid))
+                        return true;
+                    break;
+
+                case HwidType.Modern:
+                    if (modernHWIds != null)
+                    {
+                        foreach (var modernHWId in modernHWIds)
+                        {
+                            if (modernHWId.AsSpan().SequenceEqual(ban.HWId.Hwid))
+                                return true;
+                        }
+                    }
+
+                    break;
+            }
+
+            return false;
         }
 
         public override async Task<ServerRoleBanDef> AddServerRoleBanAsync(ServerRoleBanDef serverBan)
@@ -262,7 +289,7 @@ public override async Task<ServerRoleBanDef> AddServerRoleBanAsync(ServerRoleBan
                 Reason = serverBan.Reason,
                 Severity = serverBan.Severity,
                 BanningAdmin = serverBan.BanningAdmin?.UserId,
-                HWId = serverBan.HWId?.ToArray(),
+                HWId = serverBan.HWId,
                 BanTime = serverBan.BanTime.UtcDateTime,
                 ExpirationTime = serverBan.ExpirationTime?.UtcDateTime,
                 RoundId = serverBan.RoundId,
@@ -316,7 +343,7 @@ public override async Task AddServerRoleUnbanAsync(ServerRoleUnbanDef serverUnba
                 ban.Id,
                 uid,
                 ban.Address.ToTuple(),
-                ban.HWId == null ? null : ImmutableArray.Create(ban.HWId),
+                ban.HWId,
                 // SQLite apparently always reads DateTime as unspecified, but we always write as UTC.
                 DateTime.SpecifyKind(ban.BanTime, DateTimeKind.Utc),
                 ban.ExpirationTime == null ? null : DateTime.SpecifyKind(ban.ExpirationTime.Value, DateTimeKind.Utc),
@@ -376,7 +403,7 @@ public override async Task AddServerRoleUnbanAsync(ServerRoleUnbanDef serverUnba
                 ban.Id,
                 uid,
                 ban.Address.ToTuple(),
-                ban.HWId == null ? null : ImmutableArray.Create(ban.HWId),
+                ban.HWId,
                 // SQLite apparently always reads DateTime as unspecified, but we always write as UTC.
                 DateTime.SpecifyKind(ban.BanTime, DateTimeKind.Utc),
                 ban.ExpirationTime == null ? null : DateTime.SpecifyKind(ban.ExpirationTime.Value, DateTimeKind.Utc),
@@ -412,7 +439,8 @@ public override async Task<int> AddConnectionLogAsync(
             NetUserId userId,
             string userName,
             IPAddress address,
-            ImmutableArray<byte> hwId,
+            ImmutableTypedHwid? hwId,
+            float trust,
             ConnectionDenyReason? denied,
             int serverId)
         {
@@ -424,9 +452,10 @@ public override async Task<int> AddConnectionLogAsync(
                 Time = DateTime.UtcNow,
                 UserId = userId.UserId,
                 UserName = userName,
-                HWId = hwId.ToArray(),
+                HWId = hwId,
                 Denied = denied,
-                ServerId = serverId
+                ServerId = serverId,
+                Trust = trust,
             };
 
             db.SqliteDbContext.ConnectionLog.Add(connectionLog);
diff --git a/Content.Server/Database/ServerRoleBanDef.cs b/Content.Server/Database/ServerRoleBanDef.cs
index f615d5da4d1..dda3a822378 100644
--- a/Content.Server/Database/ServerRoleBanDef.cs
+++ b/Content.Server/Database/ServerRoleBanDef.cs
@@ -1,4 +1,3 @@
-using System.Collections.Immutable;
 using System.Net;
 using Content.Shared.Database;
 using Robust.Shared.Network;
@@ -10,7 +9,7 @@ public sealed class ServerRoleBanDef
     public int? Id { get; }
     public NetUserId? UserId { get; }
     public (IPAddress address, int cidrMask)? Address { get; }
-    public ImmutableArray<byte>? HWId { get; }
+    public ImmutableTypedHwid? HWId { get; }
 
     public DateTimeOffset BanTime { get; }
     public DateTimeOffset? ExpirationTime { get; }
@@ -26,7 +25,7 @@ public ServerRoleBanDef(
         int? id,
         NetUserId? userId,
         (IPAddress, int)? address,
-        ImmutableArray<byte>? hwId,
+        ImmutableTypedHwid? hwId,
         DateTimeOffset banTime,
         DateTimeOffset? expirationTime,
         int? roundId,
diff --git a/Content.Server/DeltaV/GameTicking/Rules/Components/DelayedRuleComponent.cs b/Content.Server/DeltaV/GameTicking/Rules/Components/DelayedRuleComponent.cs
new file mode 100644
index 00000000000..64f90f135e0
--- /dev/null
+++ b/Content.Server/DeltaV/GameTicking/Rules/Components/DelayedRuleComponent.cs
@@ -0,0 +1,46 @@
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Server.DeltaV.GameTicking.Rules.Components;
+
+/// <summary>
+/// Delays adding components to the antags of a gamerule until some time has passed.
+/// </summary>
+/// <remarks>
+/// This is used for the zombies gamemode so that new players don't hit the funny button immediately and ruin anyone else's plans.
+/// </remarks>
+[RegisterComponent, Access(typeof(DelayedRuleSystem))]
+[AutoGenerateComponentPause]
+public sealed partial class DelayedRuleComponent : Component
+{
+    /// <summary>
+    /// The players must wait this length of time before <see cref="DelayedComponents"/> gets added.
+    /// If they are somehow found out and get gibbed/cremated/etc before this delay is up they will not turn.
+    /// </summary>
+    [DataField(required: true)]
+    public TimeSpan Delay;
+
+    /// <summary>
+    /// Whether to skip the delay if there is only 1 antag selected.
+    /// </summary>
+    [DataField]
+    public bool IgnoreSolo;
+
+    /// <summary>
+    /// When the <see cref="Delay"/> will end.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoPausedField]
+    public TimeSpan DelayEnds;
+
+    /// <summary>
+    /// The components to add to each player's mob once the delay ends.
+    /// </summary>
+    [DataField(required: true)]
+    public ComponentRegistry DelayedComponents = new();
+
+    /// <summary>
+    /// Popup to show when the delay ends.
+    /// </summary>
+    [DataField(required: true)]
+    public LocId EndedPopup;
+}
diff --git a/Content.Server/DeltaV/GameTicking/Rules/DelayedRuleSystem.cs b/Content.Server/DeltaV/GameTicking/Rules/DelayedRuleSystem.cs
new file mode 100644
index 00000000000..ca64ebf45e0
--- /dev/null
+++ b/Content.Server/DeltaV/GameTicking/Rules/DelayedRuleSystem.cs
@@ -0,0 +1,58 @@
+using Content.Server.Antag.Components;
+using Content.Server.GameTicking.Rules;
+using Content.Server.DeltaV.GameTicking.Rules.Components;
+using Content.Shared.GameTicking.Components;
+using Content.Shared.Mind;
+using Content.Shared.Popups;
+
+namespace Content.Server.DeltaV.GameTicking.Rules;
+
+public sealed class DelayedRuleSystem : GameRuleSystem<DelayedRuleComponent>
+{
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+
+    protected override void Started(EntityUid uid, DelayedRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
+    {
+        base.Started(uid, component, gameRule, args);
+
+        component.DelayEnds = Timing.CurTime + component.Delay;
+    }
+
+    protected override void ActiveTick(EntityUid uid, DelayedRuleComponent component, GameRuleComponent gameRule, float frameTime)
+    {
+        base.ActiveTick(uid, component, gameRule, frameTime);
+
+        CheckDelay((uid, component));
+    }
+
+    /// <summary>
+    /// Checks if the delay has ended.
+    /// </summary>
+    private void CheckDelay(Entity<DelayedRuleComponent> ent)
+    {
+        if (!TryComp<AntagSelectionComponent>(ent, out var selection))
+            return;
+
+        // skip the delay if it's just 1 player, theres no plan to ruin if you are the only one
+        var ends = ent.Comp.DelayEnds;
+        if (ent.Comp.IgnoreSolo && selection.SelectedMinds.Count < 2)
+            ends = Timing.CurTime;
+
+        if (Timing.CurTime < ends)
+            return;
+
+        var comps = ent.Comp.DelayedComponents;
+        foreach (var (mindId, _) in selection.SelectedMinds)
+        {
+            // using OriginalOwnedEntity as the player might have ghosted to try become an evil ghost antag
+            if (!TryComp<MindComponent>(mindId, out var mind) || !TryGetEntity(mind.OriginalOwnedEntity, out var mob))
+                continue;
+
+            var uid = mob.Value;
+            _popup.PopupEntity(Loc.GetString(ent.Comp.EndedPopup), uid, uid, PopupType.LargeCaution);
+            EntityManager.AddComponents(uid, comps);
+        }
+
+        RemCompDeferred<DelayedRuleComponent>(ent);
+    }
+}
diff --git a/Content.Server/DeltaV/Silicons/Borgs/BorgSwitchableTypeSystem.Lawset.cs b/Content.Server/DeltaV/Silicons/Borgs/BorgSwitchableTypeSystem.Lawset.cs
new file mode 100644
index 00000000000..03b7c54ad01
--- /dev/null
+++ b/Content.Server/DeltaV/Silicons/Borgs/BorgSwitchableTypeSystem.Lawset.cs
@@ -0,0 +1,33 @@
+using Content.Server.Silicons.Laws;
+using Content.Shared.Emag.Components;
+using Content.Shared.Emag.Systems;
+using Content.Shared.Silicons.Laws;
+using Content.Shared.Silicons.Laws.Components;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Silicons.Borgs;
+
+/// <summary>
+/// Handles lawset patching when switching type.
+/// If a borg is made emagged it needs its emag laws carried over.
+/// </summary>
+public sealed partial class BorgSwitchableTypeSystem
+{
+    [Dependency] private readonly SiliconLawSystem _law = default!;
+
+    private void ConfigureLawset(EntityUid uid, ProtoId<SiliconLawsetPrototype> id)
+    {
+        var laws = _law.GetLawset(id);
+        _law.SetLaws(laws.Laws, uid);
+
+        // re-add law 0 and final law based on new lawset
+        if (CompOrNull<EmagSiliconLawComponent>(uid)?.OwnerName != null)
+        {
+            // raising the event manually to bypass re-emagging checks
+            var ev = new GotEmaggedEvent(uid); // user wont be used since OwnerName isnt null, safe to pass itself
+            RaiseLocalEvent(uid, ref ev);
+        }
+
+        // ion storms don't get mirrored because thats basically impossible to track
+    }
+}
diff --git a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
index 1987613763b..950795fc05e 100644
--- a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
@@ -41,6 +41,8 @@ public override void Initialize()
     {
         base.Initialize();
 
+        Log.Level = LogLevel.Debug;
+
         SubscribeLocalEvent<TraitorRuleComponent, AfterAntagEntitySelectedEvent>(AfterEntitySelected);
         SubscribeLocalEvent<TraitorRuleComponent, ObjectivesTextPrependEvent>(OnObjectivesTextPrepend);
     }
@@ -53,6 +55,7 @@ protected override void Added(EntityUid uid, TraitorRuleComponent component, Gam
 
     private void AfterEntitySelected(Entity<TraitorRuleComponent> ent, ref AfterAntagEntitySelectedEvent args)
     {
+        Log.Debug($"AfterAntagEntitySelected {ToPrettyString(ent)}");
         MakeTraitor(args.EntityUid, ent);
     }
 
@@ -78,14 +81,22 @@ public string[] GenerateTraitorCodewords(TraitorRuleComponent component)
 
     public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component)
     {
+        Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - start");
+
         //Grab the mind if it wasn't provided
         if (!_mindSystem.TryGetMind(traitor, out var mindId, out var mind))
+        {
+            Log.Debug($"MakeTraitor {ToPrettyString(traitor)}  - failed, no Mind found");
             return false;
+        }
 
         var briefing = "";
 
         if (component.GiveCodewords)
+        {
+            Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - added codewords flufftext to briefing");
             briefing = Loc.GetString("traitor-role-codewords-short", ("codewords", string.Join(", ", component.Codewords)));
+        }
 
         var issuer = _random.Pick(_prototypeManager.Index(component.ObjectiveIssuers).Values);
 
@@ -94,6 +105,7 @@ public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component)
 
         if (component.GiveUplink)
         {
+            Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Uplink start");
             // Calculate the amount of currency on the uplink.
             var startingBalance = component.StartingBalance;
             if (_jobs.MindTryGetJob(mindId, out var prototype))
@@ -105,18 +117,27 @@ public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component)
             }
 
             // Choose and generate an Uplink, and return the uplink code if applicable
+            Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Uplink request start");
             var uplinkParams = RequestUplink(traitor, startingBalance, briefing);
             code = uplinkParams.Item1;
             briefing = uplinkParams.Item2;
+            Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Uplink request completed");
         }
 
         string[]? codewords = null;
         if (component.GiveCodewords)
+        {
+            Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - set codewords from component");
             codewords = component.Codewords;
+        }
 
         if (component.GiveBriefing)
+        {
             _antag.SendBriefing(traitor, GenerateBriefing(codewords, code, issuer), null, component.GreetSoundNotification);
+            Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Sent the Briefing");
+        }
 
+        Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Adding TraitorMind");
         component.TraitorMinds.Add(mindId);
 
         // Assign briefing
@@ -126,9 +147,14 @@ public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component)
         _roleSystem.MindHasRole<TraitorRoleComponent>(mindId, out var traitorRole);
         if (traitorRole is not null)
         {
+            Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Add traitor briefing components");
             AddComp<RoleBriefingComponent>(traitorRole.Value.Owner);
             Comp<RoleBriefingComponent>(traitorRole.Value.Owner).Briefing = briefing;
         }
+        else
+        {
+            Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - did not get traitor briefing");
+        }
 
         // Send codewords to only the traitor client
         var color = TraitorCodewordColor; // Fall back to a dark red Syndicate color if a prototype is not found
@@ -137,9 +163,11 @@ public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component)
         _roleCodewordSystem.SetRoleCodewords(codewordComp, "traitor", component.Codewords.ToList(), color);
 
         // Change the faction
+        Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Change faction");
         _npcFaction.RemoveFaction(traitor, component.NanoTrasenFaction, false);
         _npcFaction.AddFaction(traitor, component.SyndicateFaction);
 
+        Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Finished");
         return true;
     }
 
@@ -148,10 +176,12 @@ public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component)
         var pda = _uplink.FindUplinkTarget(traitor);
         Note[]? code = null;
 
+        Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Uplink add");
         var uplinked = _uplink.AddUplink(traitor, startingBalance, pda, true);
 
         if (pda is not null && uplinked)
         {
+            Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Uplink is PDA");
             // Codes are only generated if the uplink is a PDA
             code = EnsureComp<RingerUplinkComponent>(pda.Value).Code;
 
@@ -163,6 +193,7 @@ public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component)
         }
         else if (pda is null && uplinked)
         {
+            Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Uplink is implant");
             briefing += "\n" + Loc.GetString("traitor-role-uplink-implant-short");
         }
 
@@ -172,7 +203,8 @@ public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component)
     // TODO: AntagCodewordsComponent
     private void OnObjectivesTextPrepend(EntityUid uid, TraitorRuleComponent comp, ref ObjectivesTextPrependEvent args)
     {
-        args.Text += "\n" + Loc.GetString("traitor-round-end-codewords", ("codewords", string.Join(", ", comp.Codewords)));
+        if(comp.GiveCodewords)
+            args.Text += "\n" + Loc.GetString("traitor-round-end-codewords", ("codewords", string.Join(", ", comp.Codewords)));
     }
 
     // TODO: figure out how to handle this? add priority to briefing event?
diff --git a/Content.Server/Nutrition/EntitySystems/SmokingSystem.Vape.cs b/Content.Server/Nutrition/EntitySystems/SmokingSystem.Vape.cs
index c3d41cead6d..26fa5ca3cc8 100644
--- a/Content.Server/Nutrition/EntitySystems/SmokingSystem.Vape.cs
+++ b/Content.Server/Nutrition/EntitySystems/SmokingSystem.Vape.cs
@@ -122,8 +122,7 @@ private void OnVapeInteraction(Entity<VapeComponent> entity, ref AfterInteractEv
 
         private void OnVapeDoAfter(Entity<VapeComponent> entity, ref VapeDoAfterEvent args)
         {
-            if (args.Handled
-            || args.Args.Target == null)
+            if (args.Cancelled || args.Handled || args.Args.Target == null)
                 return;
 
             var environment = _atmos.GetContainingMixture(args.Args.Target.Value, true, true);
diff --git a/Content.Server/Nyanotrasen/Psionics/Glimmer/PassiveGlimmerReductionSystem.cs b/Content.Server/Nyanotrasen/Psionics/Glimmer/PassiveGlimmerReductionSystem.cs
index f0da85ce453..27769721ffd 100644
--- a/Content.Server/Nyanotrasen/Psionics/Glimmer/PassiveGlimmerReductionSystem.cs
+++ b/Content.Server/Nyanotrasen/Psionics/Glimmer/PassiveGlimmerReductionSystem.cs
@@ -1,7 +1,7 @@
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 using Robust.Shared.Configuration;
-using Content.Shared.CCVar;
+using Content.Shared.DeltaV.CCVars;
 using Content.Shared.Psionics.Glimmer;
 using Content.Shared.GameTicking;
 using Content.Server.CartridgeLoader.Cartridges;
@@ -34,7 +34,7 @@ public override void Initialize()
         {
             base.Initialize();
             SubscribeLocalEvent<RoundRestartCleanupEvent>(OnRoundRestartCleanup);
-            _cfg.OnValueChanged(CCVars.GlimmerLostPerSecond, UpdatePassiveGlimmer, true);
+            _cfg.OnValueChanged(DCCVars.GlimmerLostPerSecond, UpdatePassiveGlimmer, true);
         }
 
         private void OnRoundRestartCleanup(RoundRestartCleanupEvent args)
diff --git a/Content.Server/Nyanotrasen/Psionics/PsionicsSystem.cs b/Content.Server/Nyanotrasen/Psionics/PsionicsSystem.cs
index 6519d519aa9..fa078159741 100644
--- a/Content.Server/Nyanotrasen/Psionics/PsionicsSystem.cs
+++ b/Content.Server/Nyanotrasen/Psionics/PsionicsSystem.cs
@@ -4,8 +4,8 @@
 using Content.Shared.Psionics.Glimmer;
 using Content.Shared.Weapons.Melee.Events;
 using Content.Shared.Damage.Events;
+using Content.Shared.DeltaV.CCVars;
 using Content.Shared.IdentityManagement;
-using Content.Shared.CCVar;
 using Content.Server.Abilities.Psionics;
 using Content.Server.Chat.Systems;
 using Content.Server.Electrocution;
@@ -137,7 +137,7 @@ public bool TryMakePsionic(Entity<PotentialPsionicComponent> ent)
             if (HasComp<PsionicComponent>(ent))
                 return false;
 
-            if (!_cfg.GetCVar(CCVars.PsionicRollsEnabled))
+            if (!_cfg.GetCVar(DCCVars.PsionicRollsEnabled))
                 return false;
 
             var warn = CompOrNull<PsionicBonusChanceComponent>(ent)?.Warn ?? true;
diff --git a/Content.Server/Objectives/Systems/KillPersonConditionSystem.cs b/Content.Server/Objectives/Systems/KillPersonConditionSystem.cs
index d61310908c3..80a3b405a84 100644
--- a/Content.Server/Objectives/Systems/KillPersonConditionSystem.cs
+++ b/Content.Server/Objectives/Systems/KillPersonConditionSystem.cs
@@ -38,14 +38,17 @@ private void OnGetProgress(EntityUid uid, KillPersonConditionComponent comp, ref
         args.Progress = GetProgress(target.Value, comp.RequireDead);
     }
 
-    private void OnPersonAssigned(EntityUid uid, PickRandomPersonComponent comp, ref ObjectiveAssignedEvent args)
+    private void OnPersonAssigned(Entity<PickRandomPersonComponent> ent, ref ObjectiveAssignedEvent args)
     {
-        AssignRandomTarget(uid, args, _ => true);
+        AssignRandomTarget(ent, args, _ => true);
     }
 
-    private void OnHeadAssigned(EntityUid uid, PickRandomHeadComponent comp, ref ObjectiveAssignedEvent args)
+    private void OnHeadAssigned(Entity<PickRandomHeadComponent> ent, ref ObjectiveAssignedEvent args)
     {
-        AssignRandomTarget(uid, args, mind => HasComp<CommandStaffComponent>(uid));
+        AssignRandomTarget(ent, args, mindId =>
+            TryComp<MindComponent>(mindId, out var mind) &&
+            mind.OwnedEntity is { } ownedEnt &&
+            HasComp<CommandStaffComponent>(ownedEnt));
     }
 
     private void AssignRandomTarget(EntityUid uid, ObjectiveAssignedEvent args, Predicate<EntityUid> filter, bool fallbackToAny = true)
diff --git a/Content.Server/Polymorph/Systems/PolymorphSystem.cs b/Content.Server/Polymorph/Systems/PolymorphSystem.cs
index daff200982d..c9a71c53584 100644
--- a/Content.Server/Polymorph/Systems/PolymorphSystem.cs
+++ b/Content.Server/Polymorph/Systems/PolymorphSystem.cs
@@ -199,6 +199,9 @@ private void OnDestruction(Entity<PolymorphedEntityComponent> ent, ref Destructi
 
         var targetTransformComp = Transform(uid);
 
+        if (configuration.PolymorphSound != null)
+            _audio.PlayPvs(configuration.PolymorphSound, targetTransformComp.Coordinates);
+
         var child = Spawn(configuration.Entity, _transform.GetMapCoordinates(uid, targetTransformComp), rotation: _transform.GetWorldRotation(uid));
 
         MakeSentientCommand.MakeSentient(child, EntityManager);
@@ -288,6 +291,9 @@ private void OnDestruction(Entity<PolymorphedEntityComponent> ent, ref Destructi
         var uidXform = Transform(uid);
         var parentXform = Transform(parent);
 
+        if (component.Configuration.ExitPolymorphSound != null)
+            _audio.PlayPvs(component.Configuration.ExitPolymorphSound, uidXform.Coordinates);
+
         _transform.SetParent(parent, parentXform, uidXform.ParentUid);
         _transform.SetCoordinates(parent, parentXform, uidXform.Coordinates, uidXform.LocalRotation);
 
diff --git a/Content.Server/Power/Components/ChargerComponent.cs b/Content.Server/Power/Components/ChargerComponent.cs
index af4498f01ba..e45ded071cf 100644
--- a/Content.Server/Power/Components/ChargerComponent.cs
+++ b/Content.Server/Power/Components/ChargerComponent.cs
@@ -1,5 +1,10 @@
 using Content.Shared.Power;
 using Content.Shared.Whitelist;
+using Content.Shared.Power;
+using Content.Shared.Whitelist;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Serialization.Manager.Attributes;
+using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Power.Components
 {
@@ -26,5 +31,12 @@ public sealed partial class ChargerComponent : Component
         /// </summary>
         [DataField("whitelist")]
         public EntityWhitelist? Whitelist;
+
+        /// <summary>
+        /// Indicates whether the charger is portable and thus subject to EMP effects
+        /// and bypasses checks for transform, anchored, and ApcPowerReceiverComponent.
+        /// </summary>
+        [DataField]
+        public bool Portable = false;
     }
 }
diff --git a/Content.Server/Power/EntitySystems/ChargerSystem.cs b/Content.Server/Power/EntitySystems/ChargerSystem.cs
index afd063fa6f6..5afce8076f3 100644
--- a/Content.Server/Power/EntitySystems/ChargerSystem.cs
+++ b/Content.Server/Power/EntitySystems/ChargerSystem.cs
@@ -1,8 +1,10 @@
 using Content.Server.Power.Components;
+using Content.Server.Emp;
 using Content.Server.PowerCell;
 using Content.Shared.Examine;
 using Content.Shared.Power;
 using Content.Shared.PowerCell.Components;
+using Content.Shared.Emp;
 using JetBrains.Annotations;
 using Robust.Shared.Containers;
 using System.Diagnostics.CodeAnalysis;
@@ -30,6 +32,8 @@ public override void Initialize()
         SubscribeLocalEvent<ChargerComponent, ContainerIsInsertingAttemptEvent>(OnInsertAttempt);
         SubscribeLocalEvent<ChargerComponent, InsertIntoEntityStorageAttemptEvent>(OnEntityStorageInsertAttempt);
         SubscribeLocalEvent<ChargerComponent, ExaminedEvent>(OnChargerExamine);
+
+        SubscribeLocalEvent<ChargerComponent, EmpPulseEvent>(OnEmpPulse);
     }
 
     private void OnStartup(EntityUid uid, ChargerComponent component, ComponentStartup args)
@@ -190,18 +194,27 @@ private void UpdateStatus(EntityUid uid, ChargerComponent component)
         }
     }
 
+    private void OnEmpPulse(EntityUid uid, ChargerComponent component, ref EmpPulseEvent args)
+    {
+        args.Affected = true;
+        args.Disabled = true;
+    }
+
     private CellChargerStatus GetStatus(EntityUid uid, ChargerComponent component)
     {
-        if (!TryComp(uid, out TransformComponent? transformComponent))
-            return CellChargerStatus.Off;
+        if (!component.Portable)
+        {
+            if (!TryComp(uid, out TransformComponent? transformComponent) || !transformComponent.Anchored)
+                return CellChargerStatus.Off;
+        }
 
-        if (!transformComponent.Anchored)
+        if (!TryComp(uid, out ApcPowerReceiverComponent? apcPowerReceiverComponent))
             return CellChargerStatus.Off;
 
-        if (!TryComp(uid, out ApcPowerReceiverComponent? apcPowerReceiverComponent))
+        if (!component.Portable && !apcPowerReceiverComponent.Powered)
             return CellChargerStatus.Off;
 
-        if (!apcPowerReceiverComponent.Powered)
+        if (HasComp<EmpDisabledComponent>(uid))
             return CellChargerStatus.Off;
 
         if (!_container.TryGetContainer(uid, component.SlotId, out var container))
@@ -218,7 +231,7 @@ private CellChargerStatus GetStatus(EntityUid uid, ChargerComponent component)
 
         return CellChargerStatus.Charging;
     }
-
+    
     private void TransferPower(EntityUid uid, EntityUid targetEntity, ChargerComponent component, float frameTime)
     {
         if (!TryComp(uid, out ApcPowerReceiverComponent? receiverComponent))
diff --git a/Content.Server/Research/Disk/ResearchDiskSystem.cs b/Content.Server/Research/Disk/ResearchDiskSystem.cs
index d32c49ce6fe..4d65c19f6e2 100644
--- a/Content.Server/Research/Disk/ResearchDiskSystem.cs
+++ b/Content.Server/Research/Disk/ResearchDiskSystem.cs
@@ -31,6 +31,7 @@ private void OnAfterInteract(EntityUid uid, ResearchDiskComponent component, Aft
             _research.ModifyServerPoints(args.Target.Value, component.Points, server);
             _popupSystem.PopupEntity(Loc.GetString("research-disk-inserted", ("points", component.Points)), args.Target.Value, args.User);
             EntityManager.QueueDeleteEntity(uid);
+            args.Handled = true;
         }
 
         private void OnMapInit(EntityUid uid, ResearchDiskComponent component, MapInitEvent args)
diff --git a/Content.Server/Silicons/Borgs/BorgSwitchableTypeSystem.cs b/Content.Server/Silicons/Borgs/BorgSwitchableTypeSystem.cs
new file mode 100644
index 00000000000..518652c2297
--- /dev/null
+++ b/Content.Server/Silicons/Borgs/BorgSwitchableTypeSystem.cs
@@ -0,0 +1,87 @@
+using Content.Server.Inventory;
+using Content.Server.Radio.Components;
+using Content.Shared.Inventory;
+using Content.Shared.Silicons.Borgs;
+using Content.Shared.Silicons.Borgs.Components;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
+
+namespace Content.Server.Silicons.Borgs;
+
+/// <summary>
+/// Server-side logic for borg type switching. Handles more heavyweight and server-specific switching logic.
+/// </summary>
+public sealed partial class BorgSwitchableTypeSystem : SharedBorgSwitchableTypeSystem // DeltaV: Made partial
+{
+    [Dependency] private readonly BorgSystem _borgSystem = default!;
+    [Dependency] private readonly ServerInventorySystem _inventorySystem = default!;
+
+    protected override void SelectBorgModule(Entity<BorgSwitchableTypeComponent> ent, ProtoId<BorgTypePrototype> borgType)
+    {
+        var prototype = Prototypes.Index(borgType);
+
+        // Assign radio channels
+        string[] radioChannels = [.. ent.Comp.InherentRadioChannels, .. prototype.RadioChannels];
+        if (TryComp(ent, out IntrinsicRadioTransmitterComponent? transmitter))
+            transmitter.Channels = [.. radioChannels];
+
+        if (TryComp(ent, out ActiveRadioComponent? activeRadio))
+            activeRadio.Channels = [.. radioChannels];
+
+        // Borg transponder for the robotics console
+        if (TryComp(ent, out BorgTransponderComponent? transponder))
+        {
+            _borgSystem.SetTransponderSprite(
+                (ent.Owner, transponder),
+                new SpriteSpecifier.Rsi(new ResPath("Mobs/Silicon/chassis.rsi"), prototype.SpriteBodyState));
+
+            _borgSystem.SetTransponderName(
+                (ent.Owner, transponder),
+                Loc.GetString($"borg-type-{borgType}-transponder"));
+        }
+
+        // Configure modules
+        if (TryComp(ent, out BorgChassisComponent? chassis))
+        {
+            var chassisEnt = (ent.Owner, chassis);
+            _borgSystem.SetMaxModules(
+                chassisEnt,
+                prototype.ExtraModuleCount + prototype.DefaultModules.Length);
+
+            _borgSystem.SetModuleWhitelist(chassisEnt, prototype.ModuleWhitelist);
+
+            foreach (var module in prototype.DefaultModules)
+            {
+                var moduleEntity = Spawn(module);
+                var borgModule = Comp<BorgModuleComponent>(moduleEntity);
+                _borgSystem.SetBorgModuleDefault((moduleEntity, borgModule), true);
+                _borgSystem.InsertModule(chassisEnt, moduleEntity);
+            }
+        }
+
+        // Begin DeltaV Code: Custom lawset patching
+        if (prototype.Lawset is {} lawset)
+            ConfigureLawset(ent, lawset);
+        // End DeltaV Code
+
+        // Configure special components
+        if (Prototypes.TryIndex(ent.Comp.SelectedBorgType, out var previousPrototype))
+        {
+            if (previousPrototype.AddComponents is { } removeComponents)
+                EntityManager.RemoveComponents(ent, removeComponents);
+        }
+
+        if (prototype.AddComponents is { } addComponents)
+        {
+            EntityManager.AddComponents(ent, addComponents);
+        }
+
+        // Configure inventory template (used for hat spacing)
+        if (TryComp(ent, out InventoryComponent? inventory))
+        {
+            _inventorySystem.SetTemplateId((ent.Owner, inventory), prototype.InventoryTemplateId);
+        }
+
+        base.SelectBorgModule(ent, borgType);
+    }
+}
diff --git a/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs b/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs
index d5a429db030..f95a5807360 100644
--- a/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs
+++ b/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Hands.Components;
 using Content.Shared.Interaction.Components;
 using Content.Shared.Silicons.Borgs.Components;
+using Content.Shared.Whitelist;
 using Robust.Shared.Containers;
 
 namespace Content.Server.Silicons.Borgs;
@@ -300,6 +301,24 @@ public bool CanInsertModule(EntityUid uid, EntityUid module, BorgChassisComponen
         return true;
     }
 
+    /// <summary>
+    /// Check if a module can be removed from a borg.
+    /// </summary>
+    /// <param name="borg">The borg that the module is being removed from.</param>
+    /// <param name="module">The module to remove from the borg.</param>
+    /// <param name="user">The user attempting to remove the module.</param>
+    /// <returns>True if the module can be removed.</returns>
+    public bool CanRemoveModule(
+        Entity<BorgChassisComponent> borg,
+        Entity<BorgModuleComponent> module,
+        EntityUid? user = null)
+    {
+        if (module.Comp.DefaultModule)
+            return false;
+
+        return true;
+    }
+
     /// <summary>
     /// Installs and activates all modules currently inside the borg's module container
     /// </summary>
@@ -369,4 +388,24 @@ public void UninstallModule(EntityUid uid, EntityUid module, BorgChassisComponen
         var ev = new BorgModuleUninstalledEvent(uid);
         RaiseLocalEvent(module, ref ev);
     }
+
+    /// <summary>
+    /// Sets <see cref="BorgChassisComponent.MaxModules"/>.
+    /// </summary>
+    /// <param name="ent">The borg to modify.</param>
+    /// <param name="maxModules">The new max module count.</param>
+    public void SetMaxModules(Entity<BorgChassisComponent> ent, int maxModules)
+    {
+        ent.Comp.MaxModules = maxModules;
+    }
+
+    /// <summary>
+    /// Sets <see cref="BorgChassisComponent.ModuleWhitelist"/>.
+    /// </summary>
+    /// <param name="ent">The borg to modify.</param>
+    /// <param name="whitelist">The new module whitelist.</param>
+    public void SetModuleWhitelist(Entity<BorgChassisComponent> ent, EntityWhitelist? whitelist)
+    {
+        ent.Comp.ModuleWhitelist = whitelist;
+    }
 }
diff --git a/Content.Server/Silicons/Borgs/BorgSystem.Transponder.cs b/Content.Server/Silicons/Borgs/BorgSystem.Transponder.cs
index 781f847be35..b4ba1400441 100644
--- a/Content.Server/Silicons/Borgs/BorgSystem.Transponder.cs
+++ b/Content.Server/Silicons/Borgs/BorgSystem.Transponder.cs
@@ -8,6 +8,7 @@
 using Content.Server.DeviceNetwork.Components;
 using Content.Server.DeviceNetwork.Systems;
 using Content.Server.Explosion.Components;
+using Robust.Shared.Utility;
 
 namespace Content.Server.Silicons.Borgs;
 
@@ -134,4 +135,20 @@ private bool CheckEmagged(EntityUid uid, string name)
 
         return false;
     }
+
+    /// <summary>
+    /// Sets <see cref="BorgTransponderComponent.Sprite"/>.
+    /// </summary>
+    public void SetTransponderSprite(Entity<BorgTransponderComponent> ent, SpriteSpecifier sprite)
+    {
+        ent.Comp.Sprite = sprite;
+    }
+
+    /// <summary>
+    /// Sets <see cref="BorgTransponderComponent.Name"/>.
+    /// </summary>
+    public void SetTransponderName(Entity<BorgTransponderComponent> ent, string name)
+    {
+        ent.Comp.Name = name;
+    }
 }
diff --git a/Content.Server/Silicons/Borgs/BorgSystem.Ui.cs b/Content.Server/Silicons/Borgs/BorgSystem.Ui.cs
index d0e9f80e364..40c2c3bf332 100644
--- a/Content.Server/Silicons/Borgs/BorgSystem.Ui.cs
+++ b/Content.Server/Silicons/Borgs/BorgSystem.Ui.cs
@@ -82,6 +82,9 @@ private void OnRemoveModuleBuiMessage(EntityUid uid, BorgChassisComponent compon
         if (!component.ModuleContainer.Contains(module))
             return;
 
+        if (!CanRemoveModule((uid, component), (module, Comp<BorgModuleComponent>(module)), args.Actor))
+            return;
+
         _adminLog.Add(LogType.Action, LogImpact.Medium,
             $"{ToPrettyString(args.Actor):player} removed module {ToPrettyString(module)} from borg {ToPrettyString(uid)}");
         _container.Remove(module, component.ModuleContainer);
diff --git a/Content.Server/Silicons/Borgs/BorgSystem.cs b/Content.Server/Silicons/Borgs/BorgSystem.cs
index bd85282a0f5..ff204bfa8ce 100644
--- a/Content.Server/Silicons/Borgs/BorgSystem.cs
+++ b/Content.Server/Silicons/Borgs/BorgSystem.cs
@@ -129,7 +129,7 @@ private void OnChassisInteractUsing(EntityUid uid, BorgChassisComponent componen
 
         if (module != null && CanInsertModule(uid, used, component, module, args.User))
         {
-            _container.Insert(used, component.ModuleContainer);
+            InsertModule((uid, component), used);
             _adminLog.Add(LogType.Action, LogImpact.Low,
                 $"{ToPrettyString(args.User):player} installed module {ToPrettyString(used)} into borg {ToPrettyString(uid)}");
             args.Handled = true;
@@ -137,6 +137,19 @@ private void OnChassisInteractUsing(EntityUid uid, BorgChassisComponent componen
         }
     }
 
+    /// <summary>
+    /// Inserts a new module into a borg, the same as if a player inserted it manually.
+    /// </summary>
+    /// <para>
+    /// This does not run checks to see if the borg is actually allowed to be inserted, such as whitelists.
+    /// </para>
+    /// <param name="ent">The borg to insert into.</param>
+    /// <param name="module">The module to insert.</param>
+    public void InsertModule(Entity<BorgChassisComponent> ent, EntityUid module)
+    {
+        _container.Insert(module, ent.Comp.ModuleContainer);
+    }
+
     // todo: consider transferring over the ghost role? managing that might suck.
     protected override void OnInserted(EntityUid uid, BorgChassisComponent component, EntInsertedIntoContainerMessage args)
     {
diff --git a/Content.Server/Silicons/Laws/SiliconLawEui.cs b/Content.Server/Silicons/Laws/SiliconLawEui.cs
index d5a5c4f4091..9fd639e9b3d 100644
--- a/Content.Server/Silicons/Laws/SiliconLawEui.cs
+++ b/Content.Server/Silicons/Laws/SiliconLawEui.cs
@@ -1,4 +1,4 @@
-using Content.Server.Administration.Managers;
+using Content.Server.Administration.Managers;
 using Content.Server.EUI;
 using Content.Shared.Administration;
 using Content.Shared.Eui;
@@ -52,8 +52,8 @@ public override void HandleMessage(EuiMessageBase msg)
             return;
 
         var player = _entityManager.GetEntity(message.Target);
-
-        _siliconLawSystem.SetLaws(message.Laws, player);
+        if (_entityManager.TryGetComponent<SiliconLawProviderComponent>(player, out var playerProviderComp))
+            _siliconLawSystem.SetLaws(message.Laws, player, playerProviderComp.LawUploadSound);
     }
 
     private bool IsAllowed()
diff --git a/Content.Server/Silicons/Laws/SiliconLawSystem.cs b/Content.Server/Silicons/Laws/SiliconLawSystem.cs
index 0070beb6ef9..2cce871fb24 100644
--- a/Content.Server/Silicons/Laws/SiliconLawSystem.cs
+++ b/Content.Server/Silicons/Laws/SiliconLawSystem.cs
@@ -21,6 +21,8 @@
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Toolshed;
+using Robust.Shared.Audio;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.Silicons.Laws;
 
@@ -113,7 +115,7 @@ private void OnIonStormLaws(EntityUid uid, SiliconLawProviderComponent component
             component.Lawset = args.Lawset;
 
             // gotta tell player to check their laws
-            NotifyLawsChanged(uid);
+            NotifyLawsChanged(uid, component.LawUploadSound);
 
             // new laws may allow antagonist behaviour so make it clear for admins
             if (TryComp<EmagSiliconLawComponent>(uid, out var emag))
@@ -129,9 +131,10 @@ private void OnEmagLawsAdded(EntityUid uid, SiliconLawProviderComponent componen
             component.Lawset = GetLawset(component.Laws);
 
         // Add the first emag law before the others
+        var name = CompOrNull<EmagSiliconLawComponent>(uid)?.OwnerName ?? Name(args.UserUid); // DeltaV: Reuse emagger name if possible
         component.Lawset?.Laws.Insert(0, new SiliconLaw
         {
-            LawString = Loc.GetString("law-emag-custom", ("name", Name(args.UserUid)), ("title", Loc.GetString(component.Lawset.ObeysTo))),
+            LawString = Loc.GetString("law-emag-custom", ("name", name), ("title", Loc.GetString(component.Lawset.ObeysTo))), // DeltaV: pass name from variable
             Order = 0
         });
 
@@ -149,14 +152,11 @@ protected override void OnGotEmagged(EntityUid uid, EmagSiliconLawComponent comp
             return;
 
         base.OnGotEmagged(uid, component, ref args);
-        NotifyLawsChanged(uid);
+        NotifyLawsChanged(uid, component.EmaggedSound);
         EnsureEmaggedRole(uid, component);
 
         _stunSystem.TryParalyze(uid, component.StunTime, true);
 
-        if (!_mind.TryGetMind(uid, out var mindId, out _))
-            return;
-        _roles.MindPlaySound(mindId, component.EmaggedSound);
     }
 
     private void OnEmagMindAdded(EntityUid uid, EmagSiliconLawComponent component, MindAddedMessage args)
@@ -237,7 +237,7 @@ public SiliconLawset GetLaws(EntityUid uid, SiliconLawBoundComponent? component
         return ev.Laws;
     }
 
-    public void NotifyLawsChanged(EntityUid uid)
+    public void NotifyLawsChanged(EntityUid uid, SoundSpecifier? cue = null)
     {
         if (!TryComp<ActorComponent>(uid, out var actor))
             return;
@@ -245,6 +245,9 @@ public void NotifyLawsChanged(EntityUid uid)
         var msg = Loc.GetString("laws-update-notify");
         var wrappedMessage = Loc.GetString("chat-manager-server-wrap-message", ("message", msg));
         _chatManager.ChatMessageToOne(ChatChannel.Server, msg, wrappedMessage, default, false, actor.PlayerSession.Channel, colorOverride: Color.Red);
+
+        if (cue != null && _mind.TryGetMind(uid, out var mindId, out _))
+            _roles.MindPlaySound(mindId, cue);
     }
 
     /// <summary>
@@ -269,7 +272,7 @@ public SiliconLawset GetLawset(ProtoId<SiliconLawsetPrototype> lawset)
     /// <summary>
     /// Set the laws of a silicon entity while notifying the player.
     /// </summary>
-    public void SetLaws(List<SiliconLaw> newLaws, EntityUid target)
+    public void SetLaws(List<SiliconLaw> newLaws, EntityUid target, SoundSpecifier? cue = null)
     {
         if (!TryComp<SiliconLawProviderComponent>(target, out var component))
             return;
@@ -278,7 +281,7 @@ public void SetLaws(List<SiliconLaw> newLaws, EntityUid target)
             component.Lawset = new SiliconLawset();
 
         component.Lawset.Laws = newLaws;
-        NotifyLawsChanged(target);
+        NotifyLawsChanged(target, cue);
     }
 
     protected override void OnUpdaterInsert(Entity<SiliconLawUpdaterComponent> ent, ref EntInsertedIntoContainerMessage args)
@@ -292,9 +295,7 @@ protected override void OnUpdaterInsert(Entity<SiliconLawUpdaterComponent> ent,
 
         while (query.MoveNext(out var update))
         {
-            SetLaws(lawset, update);
-            if (provider.LawUploadSound != null && _mind.TryGetMind(update, out var mindId, out _))
-                _roles.MindPlaySound(mindId, provider.LawUploadSound);
+            SetLaws(lawset, update, provider.LawUploadSound);
         }
     }
 }
diff --git a/Content.Server/Silicons/StationAi/StationAiSystem.cs b/Content.Server/Silicons/StationAi/StationAiSystem.cs
index 846497387d2..a10833dc63b 100644
--- a/Content.Server/Silicons/StationAi/StationAiSystem.cs
+++ b/Content.Server/Silicons/StationAi/StationAiSystem.cs
@@ -1,10 +1,11 @@
 using System.Linq;
 using Content.Server.Chat.Managers;
-using Content.Server.Chat.Systems;
 using Content.Shared.Chat;
+using Content.Shared.Mind;
+using Content.Shared.Roles;
 using Content.Shared.Silicons.StationAi;
 using Content.Shared.StationAi;
-using Robust.Shared.Audio.Systems;
+using Robust.Shared.Audio;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Player;
 
@@ -14,6 +15,8 @@ public sealed class StationAiSystem : SharedStationAiSystem
 {
     [Dependency] private readonly IChatManager _chats = default!;
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
+    [Dependency] private readonly SharedMindSystem _mind = default!;
+    [Dependency] private readonly SharedRoleSystem _roles = default!;
 
     private readonly HashSet<Entity<StationAiCoreComponent>> _ais = new();
 
@@ -43,6 +46,19 @@ public override bool SetWhitelistEnabled(Entity<StationAiWhitelistComponent> ent
         return true;
     }
 
+    public override void AnnounceIntellicardUsage(EntityUid uid, SoundSpecifier? cue = null)
+    {
+        if (!TryComp<ActorComponent>(uid, out var actor))
+            return;
+
+        var msg = Loc.GetString("ai-consciousness-download-warning");
+        var wrappedMessage = Loc.GetString("chat-manager-server-wrap-message", ("message", msg));
+        _chats.ChatMessageToOne(ChatChannel.Server, msg, wrappedMessage, default, false, actor.PlayerSession.Channel, colorOverride: Color.Red);
+
+        if (cue != null && _mind.TryGetMind(uid, out var mindId, out _))
+            _roles.MindPlaySound(mindId, cue);
+    }
+
     private void AnnounceSnip(EntityUid entity)
     {
         var xform = Transform(entity);
diff --git a/Content.Server/Singularity/EntitySystems/EmitterSystem.cs b/Content.Server/Singularity/EntitySystems/EmitterSystem.cs
index 1ada60e1d64..f828139ed6f 100644
--- a/Content.Server/Singularity/EntitySystems/EmitterSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/EmitterSystem.cs
@@ -196,7 +196,8 @@ public void SwitchOn(EntityUid uid, EmitterComponent component)
             if (TryComp<ApcPowerReceiverComponent>(uid, out var apcReceiver))
             {
                 apcReceiver.Load = component.PowerUseActive;
-                PowerOn(uid, component);
+                if (apcReceiver.Powered)
+                    PowerOn(uid, component);
             }
             // Do not directly PowerOn().
             // OnReceivedPowerChanged will get fired due to DrawRate change which will turn it on.
diff --git a/Content.Server/StationEvents/EventManagerSystem.cs b/Content.Server/StationEvents/EventManagerSystem.cs
index cde25d2762b..49059deeefe 100644
--- a/Content.Server/StationEvents/EventManagerSystem.cs
+++ b/Content.Server/StationEvents/EventManagerSystem.cs
@@ -3,6 +3,7 @@
 using Content.Server.RoundEnd;
 using Content.Server.StationEvents.Components;
 using Content.Shared.CCVar;
+using Content.Shared.DeltaV.CCVars; // DeltaV
 using Robust.Server.Player;
 using Robust.Shared.Configuration;
 using Robust.Shared.Prototypes;
@@ -272,7 +273,7 @@ private bool CanRun(EntityPrototype prototype, StationEventComponent stationEven
 
         // Nyano - Summary: - Begin modified code block: check for glimmer events.
         // This could not be cleanly done anywhere else.
-        if (_configurationManager.GetCVar(CCVars.GlimmerEnabled) &&
+        if (_configurationManager.GetCVar(DCCVars.GlimmerEnabled) &&
             prototype.TryGetComponent<GlimmerEventComponent>(out var glimmerEvent) &&
             (_glimmer.Glimmer < glimmerEvent.MinimumGlimmer ||
             _glimmer.Glimmer > glimmerEvent.MaximumGlimmer))
diff --git a/Content.Server/Thief/Systems/ThiefBeaconSystem.cs b/Content.Server/Thief/Systems/ThiefBeaconSystem.cs
index de1c3d2e6d1..4c65ba5c449 100644
--- a/Content.Server/Thief/Systems/ThiefBeaconSystem.cs
+++ b/Content.Server/Thief/Systems/ThiefBeaconSystem.cs
@@ -20,7 +20,6 @@ public sealed class ThiefBeaconSystem : EntitySystem
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly MindSystem _mind = default!;
     [Dependency] private readonly SharedRoleSystem _roles = default!;
-
     public override void Initialize()
     {
         base.Initialize();
diff --git a/Content.Server/Voting/Managers/VoteManager.cs b/Content.Server/Voting/Managers/VoteManager.cs
index 04e31916482..10b975fdcac 100644
--- a/Content.Server/Voting/Managers/VoteManager.cs
+++ b/Content.Server/Voting/Managers/VoteManager.cs
@@ -24,7 +24,6 @@
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
-
 namespace Content.Server.Voting.Managers
 {
     public sealed partial class VoteManager : IVoteManager
@@ -40,7 +39,7 @@ public sealed partial class VoteManager : IVoteManager
         [Dependency] private readonly IGameMapManager _gameMapManager = default!;
         [Dependency] private readonly IEntityManager _entityManager = default!;
         [Dependency] private readonly IAdminLogManager _adminLogger = default!;
-        [Dependency] private readonly ISharedPlaytimeManager _playtimeManager = default!; 
+        [Dependency] private readonly ISharedPlaytimeManager _playtimeManager = default!;
 
         private int _nextVoteId = 1;
 
@@ -282,7 +281,7 @@ private void SendSingleUpdate(VoteReg v, ICommonSession player)
             }
 
             // Admin always see the vote count, even if the vote is set to hide it.
-            if (_adminMgr.HasAdminFlag(player, AdminFlags.Moderator))
+            if (v.DisplayVotes || _adminMgr.HasAdminFlag(player, AdminFlags.Moderator))
             {
                 msg.DisplayVotes = true;
             }
diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.AutoFire.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.AutoFire.cs
index 8b993245948..06051d9d2ff 100644
--- a/Content.Server/Weapons/Ranged/Systems/GunSystem.AutoFire.cs
+++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.AutoFire.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Damage;
 using Content.Shared.Weapons.Ranged.Components;
 using Content.Server.Power.Components; // Frontier
 using Content.Server.Power.EntitySystems; // Frontier
@@ -5,6 +6,7 @@
 using Content.Shared.Examine; // Frontier
 using Content.Shared.Power; // Frontier
 using Content.Server.Popups; // Frontier
+using Robust.Shared.Map;
 
 namespace Content.Server.Weapons.Ranged.Systems;
 
@@ -20,17 +22,28 @@ public override void Update(float frameTime)
          */
 
         // Automatic firing without stopping if the AutoShootGunComponent component is exist and enabled
-        var query = EntityQueryEnumerator<AutoShootGunComponent, GunComponent>();
+        var query = EntityQueryEnumerator<GunComponent>();
 
-        while (query.MoveNext(out var uid, out var autoShoot, out var gun))
+        while (query.MoveNext(out var uid, out var gun))
         {
-            if (!autoShoot.Enabled)
-                continue;
-
             if (gun.NextFire > Timing.CurTime)
                 continue;
 
-            AttemptShoot(uid, gun);
+            if (TryComp(uid, out AutoShootGunComponent? autoShoot))
+            {
+                if (!autoShoot.Enabled)
+                    continue;
+
+                AttemptShoot(uid, gun);
+            }
+            else if (gun.BurstActivated)
+            {
+                var parent = _transform.GetParentUid(uid);
+                if (HasComp<DamageableComponent>(parent))
+                    AttemptShoot(parent, uid, gun, gun.ShootCoordinates ?? new EntityCoordinates(uid, gun.DefaultDirection));
+                else
+                    AttemptShoot(uid, gun);
+            }
         }
     }
 
diff --git a/Content.Server/Weather/WeatherSystem.cs b/Content.Server/Weather/WeatherSystem.cs
index dbee62a72fc..ec377809133 100644
--- a/Content.Server/Weather/WeatherSystem.cs
+++ b/Content.Server/Weather/WeatherSystem.cs
@@ -4,6 +4,7 @@
 using Robust.Shared.Console;
 using Robust.Shared.GameStates;
 using Robust.Shared.Map;
+using System.Linq;
 
 namespace Content.Server.Weather;
 
@@ -85,6 +86,7 @@ private CompletionResult WeatherCompletion(IConsoleShell shell, string[] args)
             return CompletionResult.FromHintOptions(CompletionHelper.MapIds(EntityManager), "Map Id");
 
         var a = CompletionHelper.PrototypeIDs<WeatherPrototype>(true, ProtoMan);
-        return CompletionResult.FromHintOptions(a, Loc.GetString("cmd-weather-hint"));
+        var b = a.Concat(new[] { new CompletionOption("null", Loc.GetString("cmd-weather-null")) });
+        return CompletionResult.FromHintOptions(b, Loc.GetString("cmd-weather-hint"));
     }
 }
diff --git a/Content.Server/_CD/Engraving/EngraveableComponent.cs b/Content.Server/_CD/Engraving/EngraveableComponent.cs
new file mode 100644
index 00000000000..f60ee3f584f
--- /dev/null
+++ b/Content.Server/_CD/Engraving/EngraveableComponent.cs
@@ -0,0 +1,32 @@
+namespace Content.Server._CD.Engraving;
+
+/// <summary>
+///     Allows an items' description to be modified with an engraving
+/// </summary>
+[RegisterComponent, Access(typeof(EngraveableSystem))]
+public sealed partial class EngraveableComponent : Component
+{
+    /// <summary>
+    ///     Message given to user to notify them a message was sent
+    /// </summary>
+    [DataField]
+    public string EngravedMessage = string.Empty;
+
+    /// <summary>
+    ///     The inspect text to use when there is no engraving
+    /// </summary>
+    [DataField]
+    public LocId NoEngravingText = "engraving-dogtags-no-message";
+
+    /// <summary>
+    ///     The message to use when successfully engraving the item
+    /// </summary>
+    [DataField]
+    public LocId EngraveSuccessMessage = "engraving-dogtags-succeed";
+
+    /// <summary>
+    ///     The inspect text to use when there is an engraving. The message will be shown seperately afterwards.
+    /// </summary>
+    [DataField]
+    public LocId HasEngravingText = "engraving-dogtags-has-message";
+}
diff --git a/Content.Server/_CD/Engraving/EngraveableSystem.cs b/Content.Server/_CD/Engraving/EngraveableSystem.cs
new file mode 100644
index 00000000000..370929511a5
--- /dev/null
+++ b/Content.Server/_CD/Engraving/EngraveableSystem.cs
@@ -0,0 +1,83 @@
+using Content.Server.Administration;
+using Content.Server.Administration.Logs;
+using Content.Server.Popups;
+using Content.Shared.Database;
+using Content.Shared.Popups;
+using Content.Shared.Examine;
+using Content.Shared.Verbs;
+using Robust.Shared.Player;
+using Robust.Shared.Utility;
+
+namespace Content.Server._CD.Engraving;
+
+public sealed class EngraveableSystem : EntitySystem
+{
+    [Dependency] private readonly IAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly PopupSystem _popup = default!;
+    [Dependency] private readonly QuickDialogSystem _dialog = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<EngraveableComponent, ExaminedEvent>(OnExamined);
+        SubscribeLocalEvent<EngraveableComponent, GetVerbsEvent<ActivationVerb>>(AddEngraveVerb);
+    }
+
+    private void OnExamined(Entity<EngraveableComponent> ent, ref ExaminedEvent args)
+    {
+        var msg = new FormattedMessage();
+        msg.AddMarkupOrThrow(Loc.GetString(ent.Comp.EngravedMessage == string.Empty
+            ? ent.Comp.NoEngravingText
+            : ent.Comp.HasEngravingText));
+
+        if (ent.Comp.EngravedMessage != string.Empty)
+            msg.AddMarkupPermissive(Loc.GetString(ent.Comp.EngravedMessage));
+
+        args.PushMessage(msg, 1);
+    }
+
+    private void AddEngraveVerb(Entity<EngraveableComponent> ent, ref GetVerbsEvent<ActivationVerb> args)
+    {
+        // First check if it's already been engraved. If it has, don't let them do it again.
+        if (ent.Comp.EngravedMessage != string.Empty)
+            return;
+
+        // We need an actor to give the verb.
+        if (!EntityManager.TryGetComponent(args.User, out ActorComponent? actor))
+            return;
+
+        // Make sure ghosts can't engrave stuff.
+        if (!args.CanInteract)
+            return;
+
+        var engraveVerb = new ActivationVerb
+        {
+            Text = Loc.GetString("engraving-verb-engrave"),
+            Act = () =>
+            {
+                _dialog.OpenDialog(actor.PlayerSession,
+                    Loc.GetString("engraving-verb-engrave"),
+                    Loc.GetString("engraving-popup-ui-message"),
+                    (string message) =>
+                    {
+                        // If either the actor or comp have magically vanished
+                        if (actor.PlayerSession.AttachedEntity == null || !HasComp<EngraveableComponent>(ent))
+                            return;
+
+                        ent.Comp.EngravedMessage = message;
+                        _popup.PopupEntity(Loc.GetString(ent.Comp.EngraveSuccessMessage),
+                            actor.PlayerSession.AttachedEntity.Value,
+                            actor.PlayerSession,
+                            PopupType.Medium);
+                        _adminLogger.Add(LogType.Action,
+                            LogImpact.Low,
+                            $"{ToPrettyString(actor.PlayerSession.AttachedEntity):player} engraved an item with message: {message}");
+                    });
+            },
+            Impact = LogImpact.Low,
+        };
+        engraveVerb.Impact = LogImpact.Low;
+        args.Verbs.Add(engraveVerb);
+    }
+}
diff --git a/Content.Shared.Database/TypedHwid.cs b/Content.Shared.Database/TypedHwid.cs
new file mode 100644
index 00000000000..253375e9dbc
--- /dev/null
+++ b/Content.Shared.Database/TypedHwid.cs
@@ -0,0 +1,64 @@
+using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Content.Shared.Database;
+
+/// <summary>
+/// Represents a raw HWID value together with its type.
+/// </summary>
+[Serializable]
+public sealed class ImmutableTypedHwid(ImmutableArray<byte> hwid, HwidType type)
+{
+    public readonly ImmutableArray<byte> Hwid = hwid;
+    public readonly HwidType Type = type;
+
+    public override string ToString()
+    {
+        var b64 = Convert.ToBase64String(Hwid.AsSpan());
+        return Type == HwidType.Modern ? $"V2-{b64}" : b64;
+    }
+
+    public static bool TryParse(string value, [NotNullWhen(true)] out ImmutableTypedHwid? hwid)
+    {
+        var type = HwidType.Legacy;
+        if (value.StartsWith("V2-", StringComparison.Ordinal))
+        {
+            value = value["V2-".Length..];
+            type = HwidType.Modern;
+        }
+
+        var array = new byte[GetBase64ByteLength(value)];
+        if (!Convert.TryFromBase64String(value, array, out _))
+        {
+            hwid = null;
+            return false;
+        }
+
+        // ReSharper disable once UseCollectionExpression
+        // Do not use collection expression, C# compiler is weird and it fails sandbox.
+        hwid = new ImmutableTypedHwid(ImmutableArray.Create(array), type);
+        return true;
+    }
+
+    private static int GetBase64ByteLength(string value)
+    {
+        // Why is .NET like this man wtf.
+        return 3 * (value.Length / 4) - value.TakeLast(2).Count(c => c == '=');
+    }
+}
+
+/// <summary>
+/// Represents different types of HWIDs as exposed by the engine.
+/// </summary>
+public enum HwidType
+{
+    /// <summary>
+    /// The legacy HWID system. Should only be used for checking old existing database bans.
+    /// </summary>
+    Legacy = 0,
+
+    /// <summary>
+    /// The modern HWID system.
+    /// </summary>
+    Modern = 1,
+}
diff --git a/Content.Shared/Administration/BanPanelEuiState.cs b/Content.Shared/Administration/BanPanelEuiState.cs
index dd10068e5da..74c340566b5 100644
--- a/Content.Shared/Administration/BanPanelEuiState.cs
+++ b/Content.Shared/Administration/BanPanelEuiState.cs
@@ -25,7 +25,7 @@ public sealed class CreateBanRequest : EuiMessageBase
     {
         public string? Player { get; set; }
         public string? IpAddress { get; set; }
-        public byte[]? Hwid { get; set; }
+        public ImmutableTypedHwid? Hwid { get; set; }
         public uint Minutes { get; set; }
         public string Reason { get; set; }
         public NoteSeverity Severity { get; set; }
@@ -34,7 +34,7 @@ public sealed class CreateBanRequest : EuiMessageBase
         public bool UseLastHwid { get; set; }
         public bool Erase { get; set; }
 
-        public CreateBanRequest(string? player, (IPAddress, int)? ipAddress, bool useLastIp, byte[]? hwid, bool useLastHwid, uint minutes, string reason, NoteSeverity severity, string[]? roles, bool erase)
+        public CreateBanRequest(string? player, (IPAddress, int)? ipAddress, bool useLastIp, ImmutableTypedHwid? hwid, bool useLastHwid, uint minutes, string reason, NoteSeverity severity, string[]? roles, bool erase)
         {
             Player = player;
             IpAddress = ipAddress == null ? null : $"{ipAddress.Value.Item1}/{ipAddress.Value.Item2}";
diff --git a/Content.Shared/Alert/AlertsComponent.cs b/Content.Shared/Alert/AlertsComponent.cs
index 05b11e19efb..16827e9cdff 100644
--- a/Content.Shared/Alert/AlertsComponent.cs
+++ b/Content.Shared/Alert/AlertsComponent.cs
@@ -1,4 +1,5 @@
 using Robust.Shared.GameStates;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Alert;
 
@@ -6,12 +7,23 @@ namespace Content.Shared.Alert;
 ///     Handles the icons on the right side of the screen.
 ///     Should only be used for player-controlled entities.
 /// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
+// Component is not AutoNetworked due to supporting clientside-only alerts.
+// Component state is handled manually to avoid the server overwriting the client list.
+[RegisterComponent, NetworkedComponent]
 public sealed partial class AlertsComponent : Component
 {
     [ViewVariables]
-    [AutoNetworkedField]
     public Dictionary<AlertKey, AlertState> Alerts = new();
 
     public override bool SendOnlyToOwner => true;
 }
+
+[Serializable, NetSerializable]
+public sealed class AlertComponentState : ComponentState
+{
+    public Dictionary<AlertKey, AlertState> Alerts { get; }
+    public AlertComponentState(Dictionary<AlertKey, AlertState> alerts)
+    {
+        Alerts = alerts;
+    }
+}
diff --git a/Content.Shared/CCVar/CCVars.Accessibility.cs b/Content.Shared/CCVar/CCVars.Accessibility.cs
new file mode 100644
index 00000000000..8eb61f0806d
--- /dev/null
+++ b/Content.Shared/CCVar/CCVars.Accessibility.cs
@@ -0,0 +1,41 @@
+using Robust.Shared.Configuration;
+
+namespace Content.Shared.CCVar;
+
+public sealed partial class CCVars
+{
+    /// <summary>
+    ///     Chat window opacity slider, controlling the alpha of the chat window background.
+    ///     Goes from to 0 (completely transparent) to 1 (completely opaque)
+    /// </summary>
+    public static readonly CVarDef<float> ChatWindowOpacity =
+        CVarDef.Create("accessibility.chat_window_transparency", 0.85f, CVar.CLIENTONLY | CVar.ARCHIVE);
+
+    /// <summary>
+    ///     Toggle for visual effects that may potentially cause motion sickness.
+    ///     Where reasonable, effects affected by this CVar should use an alternate effect.
+    ///     Please do not use this CVar as a bandaid for effects that could otherwise be made accessible without issue.
+    /// </summary>
+    public static readonly CVarDef<bool> ReducedMotion =
+        CVarDef.Create("accessibility.reduced_motion", false, CVar.CLIENTONLY | CVar.ARCHIVE);
+
+    public static readonly CVarDef<bool> ChatEnableColorName =
+        CVarDef.Create("accessibility.enable_color_name",
+            true,
+            CVar.CLIENTONLY | CVar.ARCHIVE,
+            "Toggles displaying names with individual colors.");
+
+    /// <summary>
+    ///     Screen shake intensity slider, controlling the intensity of the CameraRecoilSystem.
+    ///     Goes from 0 (no recoil at all) to 1 (regular amounts of recoil)
+    /// </summary>
+    public static readonly CVarDef<float> ScreenShakeIntensity =
+        CVarDef.Create("accessibility.screen_shake_intensity", 1f, CVar.CLIENTONLY | CVar.ARCHIVE);
+
+    /// <summary>
+    ///     A generic toggle for various visual effects that are color sensitive.
+    ///     As of 2/16/24, only applies to progress bar colors.
+    /// </summary>
+    public static readonly CVarDef<bool> AccessibilityColorblindFriendly =
+        CVarDef.Create("accessibility.colorblind_friendly", false, CVar.CLIENTONLY | CVar.ARCHIVE);
+}
diff --git a/Content.Shared/CCVar/CCVars.Admin.Ahelp.cs b/Content.Shared/CCVar/CCVars.Admin.Ahelp.cs
new file mode 100644
index 00000000000..48f3965bb5c
--- /dev/null
+++ b/Content.Shared/CCVar/CCVars.Admin.Ahelp.cs
@@ -0,0 +1,39 @@
+using Robust.Shared.Configuration;
+
+namespace Content.Shared.CCVar;
+
+public sealed partial class CCVars
+{
+    /// <summary>
+    ///     Ahelp rate limit values are accounted in periods of this size (seconds).
+    ///     After the period has passed, the count resets.
+    /// </summary>
+    /// <seealso cref="AhelpRateLimitCount"/>
+    public static readonly CVarDef<float> AhelpRateLimitPeriod =
+        CVarDef.Create("ahelp.rate_limit_period", 2f, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     How many ahelp messages are allowed in a single rate limit period.
+    /// </summary>
+    /// <seealso cref="AhelpRateLimitPeriod"/>
+    public static readonly CVarDef<int> AhelpRateLimitCount =
+        CVarDef.Create("ahelp.rate_limit_count", 10, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Should the administrator's position be displayed in ahelp.
+    ///     If it is is false, only the admin's ckey will be displayed in the ahelp.
+    /// </summary>
+    /// <seealso cref="AdminUseCustomNamesAdminRank"/>
+    /// <seealso cref="AhelpAdminPrefixWebhook"/>
+    public static readonly CVarDef<bool> AhelpAdminPrefix =
+        CVarDef.Create("ahelp.admin_prefix", false, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Should the administrator's position be displayed in the webhook.
+    ///     If it is is false, only the admin's ckey will be displayed in webhook.
+    /// </summary>
+    /// <seealso cref="AdminUseCustomNamesAdminRank"/>
+    /// <seealso cref="AhelpAdminPrefix"/>
+    public static readonly CVarDef<bool> AhelpAdminPrefixWebhook =
+        CVarDef.Create("ahelp.admin_prefix_webhook", false, CVar.SERVERONLY);
+}
diff --git a/Content.Shared/CCVar/CCVars.Admin.Logs.cs b/Content.Shared/CCVar/CCVars.Admin.Logs.cs
new file mode 100644
index 00000000000..862456ddfdd
--- /dev/null
+++ b/Content.Shared/CCVar/CCVars.Admin.Logs.cs
@@ -0,0 +1,42 @@
+using Robust.Shared.Configuration;
+
+namespace Content.Shared.CCVar;
+
+public sealed partial class CCVars
+{
+    /// <summary>
+    ///     Controls if admin logs are enabled. Highly recommended to shut this off for development.
+    /// </summary>
+    public static readonly CVarDef<bool> AdminLogsEnabled =
+        CVarDef.Create("adminlogs.enabled", true, CVar.SERVERONLY);
+
+    public static readonly CVarDef<float> AdminLogsQueueSendDelay =
+        CVarDef.Create("adminlogs.queue_send_delay_seconds", 5f, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     When to skip the waiting time to save in-round admin logs, if no admin logs are currently being saved
+    /// </summary>
+    public static readonly CVarDef<int> AdminLogsQueueMax =
+        CVarDef.Create("adminlogs.queue_max", 5000, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     When to skip the waiting time to save pre-round admin logs, if no admin logs are currently being saved
+    /// </summary>
+    public static readonly CVarDef<int> AdminLogsPreRoundQueueMax =
+        CVarDef.Create("adminlogs.pre_round_queue_max", 5000, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     When to start dropping logs
+    /// </summary>
+    public static readonly CVarDef<int> AdminLogsDropThreshold =
+        CVarDef.Create("adminlogs.drop_threshold", 20000, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     How many logs to send to the client at once
+    /// </summary>
+    public static readonly CVarDef<int> AdminLogsClientBatchSize =
+        CVarDef.Create("adminlogs.client_batch_size", 1000, CVar.SERVERONLY);
+
+    public static readonly CVarDef<string> AdminLogsServerName =
+        CVarDef.Create("adminlogs.server_name", "unknown", CVar.SERVERONLY);
+}
diff --git a/Content.Shared/CCVar/CCVars.Admin.Rules.cs b/Content.Shared/CCVar/CCVars.Admin.Rules.cs
new file mode 100644
index 00000000000..7385104364b
--- /dev/null
+++ b/Content.Shared/CCVar/CCVars.Admin.Rules.cs
@@ -0,0 +1,18 @@
+using Robust.Shared.Configuration;
+
+namespace Content.Shared.CCVar;
+
+public sealed partial class CCVars
+{
+    /// <summary>
+    ///     Time that players have to wait before rules can be accepted.
+    /// </summary>
+    public static readonly CVarDef<float> RulesWaitTime =
+        CVarDef.Create("rules.time", 45f, CVar.SERVER | CVar.REPLICATED);
+
+    /// <summary>
+    ///     Don't show rules to localhost/loopback interface.
+    /// </summary>
+    public static readonly CVarDef<bool> RulesExemptLocal =
+        CVarDef.Create("rules.exempt_local", true, CVar.SERVERONLY);
+}
diff --git a/Content.Shared/CCVar/CCVars.Admin.cs b/Content.Shared/CCVar/CCVars.Admin.cs
new file mode 100644
index 00000000000..28bebfbe8a6
--- /dev/null
+++ b/Content.Shared/CCVar/CCVars.Admin.cs
@@ -0,0 +1,163 @@
+using Robust.Shared.Configuration;
+
+namespace Content.Shared.CCVar;
+
+public sealed partial class CCVars
+{
+    public static readonly CVarDef<bool> AdminAnnounceLogin =
+        CVarDef.Create("admin.announce_login", true, CVar.SERVERONLY);
+
+    public static readonly CVarDef<bool> AdminAnnounceLogout =
+        CVarDef.Create("admin.announce_logout", true, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     The token used to authenticate with the admin API. Leave empty to disable the admin API. This is a secret! Do not share!
+    /// </summary>
+    public static readonly CVarDef<string> AdminApiToken =
+        CVarDef.Create("admin.api_token", string.Empty, CVar.SERVERONLY | CVar.CONFIDENTIAL);
+
+    /// <summary>
+    ///     Should users be able to see their own notes? Admins will be able to see and set notes regardless
+    /// </summary>
+    public static readonly CVarDef<bool> SeeOwnNotes =
+        CVarDef.Create("admin.see_own_notes", false, CVar.ARCHIVE | CVar.REPLICATED | CVar.SERVER);
+
+    /// <summary>
+    ///     Should the server play a quick sound to the active admins whenever a new player joins?
+    /// </summary>
+    public static readonly CVarDef<bool> AdminNewPlayerJoinSound =
+        CVarDef.Create("admin.new_player_join_sound", false, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     The amount of days before the note starts fading. It will slowly lose opacity until it reaches stale. Set to 0 to disable.
+    /// </summary>
+    public static readonly CVarDef<double> NoteFreshDays =
+        CVarDef.Create("admin.note_fresh_days", 91.31055, CVar.ARCHIVE | CVar.REPLICATED | CVar.SERVER);
+
+    /// <summary>
+    ///     The amount of days before the note completely fades, and can only be seen by admins if they press "see more notes". Set to 0
+    ///     if you want the note to immediately disappear without fading.
+    /// </summary>
+    public static readonly CVarDef<double> NoteStaleDays =
+        CVarDef.Create("admin.note_stale_days", 365.2422, CVar.ARCHIVE | CVar.REPLICATED | CVar.SERVER);
+
+    /// <summary>
+    ///     How much time does the user have to wait in seconds before confirming that they saw an admin message?
+    /// </summary>
+    public static readonly CVarDef<float> MessageWaitTime =
+        CVarDef.Create("admin.message_wait_time", 3f, CVar.ARCHIVE | CVar.REPLICATED | CVar.SERVER);
+
+    /// <summary>
+    ///     Default severity for role bans
+    /// </summary>
+    public static readonly CVarDef<string> RoleBanDefaultSeverity =
+        CVarDef.Create("admin.role_ban_default_severity", "medium", CVar.ARCHIVE | CVar.SERVER | CVar.REPLICATED);
+
+    /// <summary>
+    ///     Default severity for department bans
+    /// </summary>
+    public static readonly CVarDef<string> DepartmentBanDefaultSeverity =
+        CVarDef.Create("admin.department_ban_default_severity", "medium", CVar.ARCHIVE | CVar.SERVER | CVar.REPLICATED);
+
+    /// <summary>
+    ///     Default severity for server bans
+    /// </summary>
+    public static readonly CVarDef<string> ServerBanDefaultSeverity =
+        CVarDef.Create("admin.server_ban_default_severity", "High", CVar.ARCHIVE | CVar.SERVER | CVar.REPLICATED);
+
+    /// <summary>
+    ///     Whether a server ban will ban the player's ip by default.
+    /// </summary>
+    public static readonly CVarDef<bool> ServerBanIpBanDefault =
+        CVarDef.Create("admin.server_ban_ip_ban_default", true, CVar.ARCHIVE | CVar.SERVER | CVar.REPLICATED);
+
+    /// <summary>
+    ///     Whether a server ban will ban the player's hardware id by default.
+    /// </summary>
+    public static readonly CVarDef<bool> ServerBanHwidBanDefault =
+        CVarDef.Create("admin.server_ban_hwid_ban_default", true, CVar.ARCHIVE | CVar.SERVER | CVar.REPLICATED);
+
+    /// <summary>
+    ///     Whether to use details from last connection for ip/hwid in the BanPanel.
+    /// </summary>
+    public static readonly CVarDef<bool> ServerBanUseLastDetails =
+        CVarDef.Create("admin.server_ban_use_last_details", true, CVar.ARCHIVE | CVar.SERVER | CVar.REPLICATED);
+
+    /// <summary>
+    ///     Whether to erase a player's chat messages and their entity from the game when banned.
+    /// </summary>
+    public static readonly CVarDef<bool> ServerBanErasePlayer =
+        CVarDef.Create("admin.server_ban_erase_player", false, CVar.ARCHIVE | CVar.SERVER | CVar.REPLICATED);
+
+    /// <summary>
+    ///     Minimum players sharing a connection required to create an alert. -1 to disable the alert.
+    /// </summary>
+    /// <remarks>
+    ///     If you set this to 0 or 1 then it will alert on every connection, so probably don't do that.
+    /// </remarks>
+    public static readonly CVarDef<int> AdminAlertMinPlayersSharingConnection =
+        CVarDef.Create("admin.alert.min_players_sharing_connection", -1, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Minimum explosion intensity to create an admin alert message. -1 to disable the alert.
+    /// </summary>
+    public static readonly CVarDef<int> AdminAlertExplosionMinIntensity =
+        CVarDef.Create("admin.alert.explosion_min_intensity", 60, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Minimum particle accelerator strength to create an admin alert message.
+    /// </summary>
+    public static readonly CVarDef<int> AdminAlertParticleAcceleratorMinPowerState =
+        CVarDef.Create("admin.alert.particle_accelerator_min_power_state", 5, CVar.SERVERONLY); // strength 4
+
+    /// <summary>
+    ///     Should the ban details in admin channel include PII? (IP, HWID, etc)
+    /// </summary>
+    public static readonly CVarDef<bool> AdminShowPIIOnBan =
+        CVarDef.Create("admin.show_pii_onban", false, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     If an admin joins a round by reading up or using the late join button, automatically
+    ///     de-admin them.
+    /// </summary>
+    public static readonly CVarDef<bool> AdminDeadminOnJoin =
+        CVarDef.Create("admin.deadmin_on_join", false, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Overrides the name the client sees in ahelps. Set empty to disable.
+    /// </summary>
+    public static readonly CVarDef<string> AdminAhelpOverrideClientName =
+        CVarDef.Create("admin.override_adminname_in_client_ahelp", string.Empty, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     The threshold of minutes to appear as a "new player" in the ahelp menu
+    ///     If 0, appearing as a new player is disabled.
+    /// </summary>
+    public static readonly CVarDef<int> NewPlayerThreshold =
+        CVarDef.Create("admin.new_player_threshold", 0, CVar.ARCHIVE | CVar.REPLICATED | CVar.SERVER);
+
+    /// <summary>
+    ///     How long an admin client can go without any input before being considered AFK.
+    /// </summary>
+    public static readonly CVarDef<float> AdminAfkTime =
+        CVarDef.Create("admin.afk_time", 600f, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     If true, admins are able to connect even if
+    ///     <see cref="SoftMaxPlayers"/> would otherwise block regular players.
+    /// </summary>
+    public static readonly CVarDef<bool> AdminBypassMaxPlayers =
+        CVarDef.Create("admin.bypass_max_players", true, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Determine if custom rank names are used.
+    ///     If it is false, it'd use the actual rank name regardless of the individual's title.
+    /// </summary>
+    /// <seealso cref="AhelpAdminPrefix"/>
+    /// <seealso cref="AhelpAdminPrefixWebhook"/>
+    public static readonly CVarDef<bool> AdminUseCustomNamesAdminRank =
+        CVarDef.Create("admin.use_custom_names_admin_rank", true, CVar.SERVERONLY);
+
+    public static readonly CVarDef<bool> BanHardwareIds =
+        CVarDef.Create("ban.hardware_ids", true, CVar.SERVERONLY);
+}
diff --git a/Content.Shared/CCVar/CCVars.Atmos.cs b/Content.Shared/CCVar/CCVars.Atmos.cs
new file mode 100644
index 00000000000..cc1069b4fc8
--- /dev/null
+++ b/Content.Shared/CCVar/CCVars.Atmos.cs
@@ -0,0 +1,153 @@
+using Robust.Shared.Configuration;
+
+namespace Content.Shared.CCVar;
+
+public sealed partial class CCVars
+{
+    /// <summary>
+    ///     Whether gas differences will move entities.
+    /// </summary>
+    public static readonly CVarDef<bool> SpaceWind =
+        CVarDef.Create("atmos.space_wind", false, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Divisor from maxForce (pressureDifference * 2.25f) to force applied on objects.
+    /// </summary>
+    public static readonly CVarDef<float> SpaceWindPressureForceDivisorThrow =
+        CVarDef.Create("atmos.space_wind_pressure_force_divisor_throw", 15f, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Divisor from maxForce (pressureDifference * 2.25f) to force applied on objects.
+    /// </summary>
+    public static readonly CVarDef<float> SpaceWindPressureForceDivisorPush =
+        CVarDef.Create("atmos.space_wind_pressure_force_divisor_push", 2500f, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     The maximum velocity (not force) that may be applied to an object by atmospheric pressure differences.
+    ///     Useful to prevent clipping through objects.
+    /// </summary>
+    public static readonly CVarDef<float> SpaceWindMaxVelocity =
+        CVarDef.Create("atmos.space_wind_max_velocity", 30f, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     The maximum force that may be applied to an object by pushing (i.e. not throwing) atmospheric pressure differences.
+    ///     A "throwing" atmospheric pressure difference ignores this limit, but not the max. velocity limit.
+    /// </summary>
+    public static readonly CVarDef<float> SpaceWindMaxPushForce =
+        CVarDef.Create("atmos.space_wind_max_push_force", 20f, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Whether monstermos tile equalization is enabled.
+    /// </summary>
+    public static readonly CVarDef<bool> MonstermosEqualization =
+        CVarDef.Create("atmos.monstermos_equalization", true, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Whether monstermos explosive depressurization is enabled.
+    ///     Needs <see cref="MonstermosEqualization"/> to be enabled to work.
+    /// </summary>
+    public static readonly CVarDef<bool> MonstermosDepressurization =
+        CVarDef.Create("atmos.monstermos_depressurization", true, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Whether monstermos explosive depressurization will rip tiles..
+    ///     Needs <see cref="MonstermosEqualization"/> and <see cref="MonstermosDepressurization"/> to be enabled to work.
+    ///     WARNING: This cvar causes MAJOR contrast issues, and usually tends to make any spaced scene look very cluttered.
+    ///     This not only usually looks strange, but can also reduce playability for people with impaired vision. Please think twice before enabling this on your server.
+    ///     Also looks weird on slow spacing for unrelated reasons. If you do want to enable this, you should probably turn on instaspacing.
+    /// </summary>
+    public static readonly CVarDef<bool> MonstermosRipTiles =
+        CVarDef.Create("atmos.monstermos_rip_tiles", false, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Whether explosive depressurization will cause the grid to gain an impulse.
+    ///     Needs <see cref="MonstermosEqualization"/> and <see cref="MonstermosDepressurization"/> to be enabled to work.
+    /// </summary>
+    public static readonly CVarDef<bool> AtmosGridImpulse =
+        CVarDef.Create("atmos.grid_impulse", false, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     What fraction of air from a spaced tile escapes every tick.
+    ///     1.0 for instant spacing, 0.2 means 20% of remaining air lost each time
+    /// </summary>
+    public static readonly CVarDef<float> AtmosSpacingEscapeRatio =
+        CVarDef.Create("atmos.mmos_spacing_speed", 0.15f, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Minimum amount of air allowed on a spaced tile before it is reset to 0 immediately in kPa
+    ///     Since the decay due to SpacingEscapeRatio follows a curve, it would never reach 0.0 exactly
+    ///     unless we truncate it somewhere.
+    /// </summary>
+    public static readonly CVarDef<float> AtmosSpacingMinGas =
+        CVarDef.Create("atmos.mmos_min_gas", 2.0f, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     How much wind can go through a single tile before that tile doesn't depressurize itself
+    ///     (I.e spacing is limited in large rooms heading into smaller spaces)
+    /// </summary>
+    public static readonly CVarDef<float> AtmosSpacingMaxWind =
+        CVarDef.Create("atmos.mmos_max_wind", 500f, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Whether atmos superconduction is enabled.
+    /// </summary>
+    /// <remarks> Disabled by default, superconduction is awful. </remarks>
+    public static readonly CVarDef<bool> Superconduction =
+        CVarDef.Create("atmos.superconduction", false, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Heat loss per tile due to radiation at 20 degC, in W.
+    /// </summary>
+    public static readonly CVarDef<float> SuperconductionTileLoss =
+        CVarDef.Create("atmos.superconduction_tile_loss", 30f, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Whether excited groups will be processed and created.
+    /// </summary>
+    public static readonly CVarDef<bool> ExcitedGroups =
+        CVarDef.Create("atmos.excited_groups", true, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Whether all tiles in an excited group will clear themselves once being exposed to space.
+    ///     Similar to <see cref="MonstermosDepressurization"/>, without none of the tile ripping or
+    ///     things being thrown around very violently.
+    ///     Needs <see cref="ExcitedGroups"/> to be enabled to work.
+    /// </summary>
+    public static readonly CVarDef<bool> ExcitedGroupsSpaceIsAllConsuming =
+        CVarDef.Create("atmos.excited_groups_space_is_all_consuming", false, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Maximum time in milliseconds that atmos can take processing.
+    /// </summary>
+    public static readonly CVarDef<float> AtmosMaxProcessTime =
+        CVarDef.Create("atmos.max_process_time", 3f, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Atmos tickrate in TPS. Atmos processing will happen every 1/TPS seconds.
+    /// </summary>
+    public static readonly CVarDef<float> AtmosTickRate =
+        CVarDef.Create("atmos.tickrate", 15f, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Scale factor for how fast things happen in our atmosphere
+    ///     simulation compared to real life. 1x means pumps run at 1x
+    ///     speed. Players typically expect things to happen faster
+    ///     in-game.
+    /// </summary>
+    public static readonly CVarDef<float> AtmosSpeedup =
+        CVarDef.Create("atmos.speedup", 8f, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Like atmos.speedup, but only for gas and reaction heat values. 64x means
+    ///     gases heat up and cool down 64x faster than real life.
+    /// </summary>
+    public static readonly CVarDef<float> AtmosHeatScale =
+        CVarDef.Create("atmos.heat_scale", 8f, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Maximum explosion radius for explosions caused by bursting a gas tank ("max caps").
+    ///     Setting this to zero disables the explosion but still allows the tank to burst and leak.
+    /// </summary>
+    public static readonly CVarDef<float> AtmosTankFragment =
+        CVarDef.Create("atmos.max_explosion_range", 26f, CVar.SERVERONLY);
+}
diff --git a/Content.Shared/CCVar/CCVars.Audio.cs b/Content.Shared/CCVar/CCVars.Audio.cs
new file mode 100644
index 00000000000..4d9e7c44315
--- /dev/null
+++ b/Content.Shared/CCVar/CCVars.Audio.cs
@@ -0,0 +1,61 @@
+using Robust.Shared.Configuration;
+
+namespace Content.Shared.CCVar;
+
+public sealed partial class CCVars
+{
+        /// <summary>
+        ///     How long we'll wait until re-sampling nearby objects for ambience. Should be pretty fast, but doesn't have to match the tick rate.
+        /// </summary>
+        public static readonly CVarDef<float> AmbientCooldown =
+            CVarDef.Create("ambience.cooldown", 0.1f, CVar.ARCHIVE | CVar.CLIENTONLY);
+
+        /// <summary>
+        ///     How large of a range to sample for ambience.
+        /// </summary>
+        public static readonly CVarDef<float> AmbientRange =
+            CVarDef.Create("ambience.range", 8f, CVar.REPLICATED | CVar.SERVER);
+
+        /// <summary>
+        ///     Maximum simultaneous ambient sounds.
+        /// </summary>
+        public static readonly CVarDef<int> MaxAmbientSources =
+            CVarDef.Create("ambience.max_sounds", 16, CVar.ARCHIVE | CVar.CLIENTONLY);
+
+        /// <summary>
+        ///     The minimum value the user can set for ambience.max_sounds
+        /// </summary>
+        public static readonly CVarDef<int> MinMaxAmbientSourcesConfigured =
+            CVarDef.Create("ambience.min_max_sounds_configured", 16, CVar.REPLICATED | CVar.SERVER | CVar.CHEAT);
+
+        /// <summary>
+        ///     The maximum value the user can set for ambience.max_sounds
+        /// </summary>
+        public static readonly CVarDef<int> MaxMaxAmbientSourcesConfigured =
+            CVarDef.Create("ambience.max_max_sounds_configured", 64, CVar.REPLICATED | CVar.SERVER | CVar.CHEAT);
+
+        /// <summary>
+        ///     Ambience volume.
+        /// </summary>
+        public static readonly CVarDef<float> AmbienceVolume =
+            CVarDef.Create("ambience.volume", 1.5f, CVar.ARCHIVE | CVar.CLIENTONLY);
+
+        /// <summary>
+        ///     Ambience music volume.
+        /// </summary>
+        public static readonly CVarDef<float> AmbientMusicVolume =
+            CVarDef.Create("ambience.music_volume", 1.5f, CVar.ARCHIVE | CVar.CLIENTONLY);
+
+        /// <summary>
+        ///     Lobby / round end music volume.
+        /// </summary>
+        public static readonly CVarDef<float> LobbyMusicVolume =
+            CVarDef.Create("ambience.lobby_music_volume", 0.50f, CVar.ARCHIVE | CVar.CLIENTONLY);
+
+        /// <summary>
+        ///     UI volume.
+        /// </summary>
+        public static readonly CVarDef<float> InterfaceVolume =
+            CVarDef.Create("audio.interface_volume", 0.50f, CVar.ARCHIVE | CVar.CLIENTONLY);
+
+}
diff --git a/Content.Shared/CCVar/CCVars.Chat.Looc.cs b/Content.Shared/CCVar/CCVars.Chat.Looc.cs
new file mode 100644
index 00000000000..84ee2c28072
--- /dev/null
+++ b/Content.Shared/CCVar/CCVars.Chat.Looc.cs
@@ -0,0 +1,26 @@
+using Robust.Shared.Configuration;
+
+namespace Content.Shared.CCVar;
+
+public sealed partial class CCVars
+{
+    public static readonly CVarDef<bool> LoocEnabled =
+        CVarDef.Create("looc.enabled", true, CVar.NOTIFY | CVar.REPLICATED);
+
+    public static readonly CVarDef<bool> AdminLoocEnabled =
+        CVarDef.Create("looc.enabled_admin", true, CVar.NOTIFY);
+
+    /// <summary>
+    ///     True: Dead players can use LOOC
+    ///     False: Dead player LOOC gets redirected to dead chat
+    /// </summary>
+    public static readonly CVarDef<bool> DeadLoocEnabled =
+        CVarDef.Create("looc.enabled_dead", false, CVar.NOTIFY | CVar.REPLICATED);
+
+    /// <summary>
+    ///     True: Crit players can use LOOC
+    ///     False: Crit player LOOC gets redirected to dead chat
+    /// </summary>
+    public static readonly CVarDef<bool> CritLoocEnabled =
+        CVarDef.Create("looc.enabled_crit", false, CVar.NOTIFY | CVar.REPLICATED);
+}
diff --git a/Content.Shared/CCVar/CCVars.Chat.Ooc.cs b/Content.Shared/CCVar/CCVars.Chat.Ooc.cs
new file mode 100644
index 00000000000..ba5e41053b6
--- /dev/null
+++ b/Content.Shared/CCVar/CCVars.Chat.Ooc.cs
@@ -0,0 +1,27 @@
+using Robust.Shared.Configuration;
+
+namespace Content.Shared.CCVar;
+
+public sealed partial class CCVars
+{
+    public static readonly CVarDef<bool>
+        OocEnabled = CVarDef.Create("ooc.enabled", true, CVar.NOTIFY | CVar.REPLICATED);
+
+    public static readonly CVarDef<bool> AdminOocEnabled =
+        CVarDef.Create("ooc.enabled_admin", true, CVar.NOTIFY);
+
+    /// <summary>
+    ///     If true, whenever OOC is disabled the Discord OOC relay will also be disabled.
+    /// </summary>
+    public static readonly CVarDef<bool> DisablingOOCDisablesRelay =
+        CVarDef.Create("ooc.disabling_ooc_disables_relay", true, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Whether or not OOC chat should be enabled during a round.
+    /// </summary>
+    public static readonly CVarDef<bool> OocEnableDuringRound =
+        CVarDef.Create("ooc.enable_during_round", false, CVar.NOTIFY | CVar.REPLICATED | CVar.SERVER);
+
+    public static readonly CVarDef<bool> ShowOocPatronColor =
+        CVarDef.Create("ooc.show_ooc_patron_color", true, CVar.ARCHIVE | CVar.REPLICATED | CVar.CLIENT);
+}
diff --git a/Content.Shared/CCVar/CCVars.Chat.cs b/Content.Shared/CCVar/CCVars.Chat.cs
new file mode 100644
index 00000000000..139a82372a2
--- /dev/null
+++ b/Content.Shared/CCVar/CCVars.Chat.cs
@@ -0,0 +1,68 @@
+using Robust.Shared.Configuration;
+
+namespace Content.Shared.CCVar;
+
+public sealed partial class CCVars
+{
+    /// <summary>
+    ///     Chat rate limit values are accounted in periods of this size (seconds).
+    ///     After the period has passed, the count resets.
+    /// </summary>
+    /// <seealso cref="ChatRateLimitCount"/>
+    public static readonly CVarDef<float> ChatRateLimitPeriod =
+        CVarDef.Create("chat.rate_limit_period", 2f, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     How many chat messages are allowed in a single rate limit period.
+    /// </summary>
+    /// <remarks>
+    ///     The total rate limit throughput per second is effectively
+    ///     <see cref="ChatRateLimitCount"/> divided by <see cref="ChatRateLimitCount"/>.
+    /// </remarks>
+    /// <seealso cref="ChatRateLimitPeriod"/>
+    public static readonly CVarDef<int> ChatRateLimitCount =
+        CVarDef.Create("chat.rate_limit_count", 10, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Minimum delay (in seconds) between notifying admins about chat message rate limit violations.
+    ///     A negative value disables admin announcements.
+    /// </summary>
+    public static readonly CVarDef<int> ChatRateLimitAnnounceAdminsDelay =
+        CVarDef.Create("chat.rate_limit_announce_admins_delay", 15, CVar.SERVERONLY);
+
+    public static readonly CVarDef<int> ChatMaxMessageLength =
+        CVarDef.Create("chat.max_message_length", 1000, CVar.SERVER | CVar.REPLICATED);
+
+    public static readonly CVarDef<int> ChatMaxAnnouncementLength =
+        CVarDef.Create("chat.max_announcement_length", 256, CVar.SERVER | CVar.REPLICATED);
+
+    public static readonly CVarDef<bool> ChatSanitizerEnabled =
+        CVarDef.Create("chat.chat_sanitizer_enabled", true, CVar.SERVERONLY);
+
+    public static readonly CVarDef<bool> ChatShowTypingIndicator =
+        CVarDef.Create("chat.show_typing_indicator", true, CVar.ARCHIVE | CVar.REPLICATED | CVar.SERVER);
+
+    public static readonly CVarDef<bool> ChatEnableFancyBubbles =
+        CVarDef.Create("chat.enable_fancy_bubbles",
+            true,
+            CVar.CLIENTONLY | CVar.ARCHIVE,
+            "Toggles displaying fancy speech bubbles, which display the speaking character's name.");
+
+    public static readonly CVarDef<bool> ChatFancyNameBackground =
+        CVarDef.Create("chat.fancy_name_background",
+            false,
+            CVar.CLIENTONLY | CVar.ARCHIVE,
+            "Toggles displaying a background under the speaking character's name.");
+
+    /// <summary>
+    ///     A message broadcast to each player that joins the lobby.
+    ///     May be changed by admins ingame through use of the "set-motd" command.
+    ///     In this case the new value, if not empty, is broadcast to all connected players and saved between rounds.
+    ///     May be requested by any player through use of the "get-motd" command.
+    /// </summary>
+    public static readonly CVarDef<string> MOTD =
+        CVarDef.Create("chat.motd",
+            "",
+            CVar.SERVER | CVar.SERVERONLY | CVar.ARCHIVE,
+            "A message broadcast to each player that joins the lobby.");
+}
diff --git a/Content.Shared/CCVar/CCVars.Config.cs b/Content.Shared/CCVar/CCVars.Config.cs
new file mode 100644
index 00000000000..4e11f09ee7c
--- /dev/null
+++ b/Content.Shared/CCVar/CCVars.Config.cs
@@ -0,0 +1,35 @@
+using Robust.Shared.Configuration;
+
+namespace Content.Shared.CCVar;
+
+public sealed partial class CCVars
+{
+    // These are server-only for now since I don't foresee a client use yet,
+    // and I don't wanna have to start coming up with like .client suffixes and stuff like that.
+
+    /// <summary>
+    ///     Configuration presets to load during startup.
+    ///     Multiple presets can be separated by comma and are loaded in order.
+    /// </summary>
+    /// <remarks>
+    ///     Loaded presets must be located under the <c>ConfigPresets/</c> resource directory and end with the <c>.toml</c> extension.
+    ///     Only the file name (without extension) must be given for this variable.
+    /// </remarks>
+    public static readonly CVarDef<string> ConfigPresets =
+        CVarDef.Create("config.presets", "", CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Whether to load the preset development CVars.
+    ///     This disables some things like lobby to make development easier.
+    ///     Even when true, these are only loaded if the game is compiled with <c>DEVELOPMENT</c> set.
+    /// </summary>
+    public static readonly CVarDef<bool> ConfigPresetDevelopment =
+        CVarDef.Create("config.preset_development", true, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Whether to load the preset debug CVars.
+    ///     Even when true, these are only loaded if the game is compiled with <c>DEBUG</c> set.
+    /// </summary>
+    public static readonly CVarDef<bool> ConfigPresetDebug =
+        CVarDef.Create("config.preset_debug", true, CVar.SERVERONLY);
+}
diff --git a/Content.Shared/CCVar/CCVars.Console.cs b/Content.Shared/CCVar/CCVars.Console.cs
new file mode 100644
index 00000000000..e670b9f836e
--- /dev/null
+++ b/Content.Shared/CCVar/CCVars.Console.cs
@@ -0,0 +1,15 @@
+using Robust.Shared.Configuration;
+
+namespace Content.Shared.CCVar;
+
+public sealed partial class CCVars
+{
+    public static readonly CVarDef<bool> ConsoleLoginLocal =
+        CVarDef.Create("console.loginlocal", true, CVar.ARCHIVE | CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Automatically log in the given user as host, equivalent to the <c>promotehost</c> command.
+    /// </summary>
+    public static readonly CVarDef<string> ConsoleLoginHostUser =
+        CVarDef.Create("console.login_host_user", "", CVar.ARCHIVE | CVar.SERVERONLY);
+}
diff --git a/Content.Shared/CCVar/CCVars.Crewmanifest.cs b/Content.Shared/CCVar/CCVars.Crewmanifest.cs
new file mode 100644
index 00000000000..d6251886b95
--- /dev/null
+++ b/Content.Shared/CCVar/CCVars.Crewmanifest.cs
@@ -0,0 +1,24 @@
+using Robust.Shared.Configuration;
+
+namespace Content.Shared.CCVar;
+
+public sealed partial class CCVars
+{
+    /// <summary>
+    ///     Setting this allows a crew manifest to be opened from any window
+    ///     that has a crew manifest button, and sends the correct message.
+    ///     If this is false, only in-game entities will allow you to see
+    ///     the crew manifest, if the functionality is coded in.
+    ///     Having administrator priveledge ignores this, but will still
+    ///     hide the button in UI windows.
+    /// </summary>
+    public static readonly CVarDef<bool> CrewManifestWithoutEntity =
+        CVarDef.Create("crewmanifest.no_entity", true, CVar.REPLICATED);
+
+    /// <summary>
+    ///     Setting this allows the crew manifest to be viewed from 'unsecure'
+    ///     entities, such as the PDA.
+    /// </summary>
+    public static readonly CVarDef<bool> CrewManifestUnsecure =
+        CVarDef.Create("crewmanifest.unsecure", true, CVar.REPLICATED);
+}
diff --git a/Content.Shared/CCVar/CCVars.Database.cs b/Content.Shared/CCVar/CCVars.Database.cs
new file mode 100644
index 00000000000..c549bd7e033
--- /dev/null
+++ b/Content.Shared/CCVar/CCVars.Database.cs
@@ -0,0 +1,77 @@
+using Robust.Shared.Configuration;
+
+namespace Content.Shared.CCVar;
+
+public sealed partial class CCVars
+{
+#if DEBUG
+    private const int DefaultSqliteDelay = 1;
+#else
+    private const int DefaultSqliteDelay = 0;
+#endif
+
+    public static readonly CVarDef<string> DatabaseEngine =
+        CVarDef.Create("database.engine", "sqlite", CVar.SERVERONLY);
+
+    public static readonly CVarDef<string> DatabaseSqliteDbPath =
+        CVarDef.Create("database.sqlite_dbpath", "preferences.db", CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Milliseconds to asynchronously delay all SQLite database acquisitions with.
+    /// </summary>
+    /// <remarks>
+    ///     Defaults to 1 on DEBUG, 0 on RELEASE.
+    ///     This is intended to help catch .Result deadlock bugs that only happen on postgres
+    ///     (because SQLite is not actually asynchronous normally)
+    /// </remarks>
+    public static readonly CVarDef<int> DatabaseSqliteDelay =
+        CVarDef.Create("database.sqlite_delay", DefaultSqliteDelay, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Amount of concurrent SQLite database operations.
+    /// </summary>
+    /// <remarks>
+    ///     Note that SQLite is not a properly asynchronous database and also has limited read/write concurrency.
+    ///     Increasing this number may allow more concurrent reads, but it probably won't matter much.
+    ///     SQLite operations are normally ran on the thread pool, which may cause thread pool starvation if the concurrency is too high.
+    /// </remarks>
+    public static readonly CVarDef<int> DatabaseSqliteConcurrency =
+        CVarDef.Create("database.sqlite_concurrency", 3, CVar.SERVERONLY);
+
+    public static readonly CVarDef<string> DatabasePgHost =
+        CVarDef.Create("database.pg_host", "localhost", CVar.SERVERONLY);
+
+    public static readonly CVarDef<int> DatabasePgPort =
+        CVarDef.Create("database.pg_port", 5432, CVar.SERVERONLY);
+
+    public static readonly CVarDef<string> DatabasePgDatabase =
+        CVarDef.Create("database.pg_database", "ss14", CVar.SERVERONLY);
+
+    public static readonly CVarDef<string> DatabasePgUsername =
+        CVarDef.Create("database.pg_username", "postgres", CVar.SERVERONLY);
+
+    public static readonly CVarDef<string> DatabasePgPassword =
+        CVarDef.Create("database.pg_password", "", CVar.SERVERONLY | CVar.CONFIDENTIAL);
+
+    /// <summary>
+    ///     Max amount of concurrent Postgres database operations.
+    /// </summary>
+    public static readonly CVarDef<int> DatabasePgConcurrency =
+        CVarDef.Create("database.pg_concurrency", 8, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Milliseconds to asynchronously delay all PostgreSQL database operations with.
+    /// </summary>
+    /// <remarks>
+    ///     This is intended for performance testing. It works different from <see cref="DatabaseSqliteDelay"/>,
+    ///     as the lag is applied after acquiring the database lock.
+    /// </remarks>
+    public static readonly CVarDef<int> DatabasePgFakeLag =
+        CVarDef.Create("database.pg_fake_lag", 0, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Basically only exists for integration tests to avoid race conditions.
+    /// </summary>
+    public static readonly CVarDef<bool> DatabaseSynchronous =
+        CVarDef.Create("database.sync", false, CVar.SERVERONLY);
+}
diff --git a/Content.Shared/CCVar/CCVars.Discord.cs b/Content.Shared/CCVar/CCVars.Discord.cs
new file mode 100644
index 00000000000..a6c4ada7454
--- /dev/null
+++ b/Content.Shared/CCVar/CCVars.Discord.cs
@@ -0,0 +1,61 @@
+using Robust.Shared.Configuration;
+
+namespace Content.Shared.CCVar;
+
+public sealed partial class CCVars
+{
+    /// <summary>
+    ///     The role that will get mentioned if a new SOS ahelp comes in.
+    /// </summary>
+    public static readonly CVarDef<string> DiscordAhelpMention =
+        CVarDef.Create("discord.on_call_ping", string.Empty, CVar.SERVERONLY | CVar.CONFIDENTIAL);
+
+    /// <summary>
+    ///     URL of the discord webhook to relay unanswered ahelp messages.
+    /// </summary>
+    public static readonly CVarDef<string> DiscordOnCallWebhook =
+        CVarDef.Create("discord.on_call_webhook", string.Empty, CVar.SERVERONLY | CVar.CONFIDENTIAL);
+
+    /// <summary>
+    ///     URL of the Discord webhook which will relay all ahelp messages.
+    /// </summary>
+    public static readonly CVarDef<string> DiscordAHelpWebhook =
+        CVarDef.Create("discord.ahelp_webhook", string.Empty, CVar.SERVERONLY | CVar.CONFIDENTIAL);
+
+    /// <summary>
+    ///     The server icon to use in the Discord ahelp embed footer.
+    ///     Valid values are specified at https://discord.com/developers/docs/resources/channel#embed-object-embed-footer-structure.
+    /// </summary>
+    public static readonly CVarDef<string> DiscordAHelpFooterIcon =
+        CVarDef.Create("discord.ahelp_footer_icon", string.Empty, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     The avatar to use for the webhook. Should be an URL.
+    /// </summary>
+    public static readonly CVarDef<string> DiscordAHelpAvatar =
+        CVarDef.Create("discord.ahelp_avatar", string.Empty, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     URL of the Discord webhook which will relay all custom votes. If left empty, disables the webhook.
+    /// </summary>
+    public static readonly CVarDef<string> DiscordVoteWebhook =
+        CVarDef.Create("discord.vote_webhook", string.Empty, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     URL of the Discord webhook which will relay all votekick votes. If left empty, disables the webhook.
+    /// </summary>
+    public static readonly CVarDef<string> DiscordVotekickWebhook =
+        CVarDef.Create("discord.votekick_webhook", string.Empty, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     URL of the Discord webhook which will relay round restart messages.
+    /// </summary>
+    public static readonly CVarDef<string> DiscordRoundUpdateWebhook =
+        CVarDef.Create("discord.round_update_webhook", string.Empty, CVar.SERVERONLY | CVar.CONFIDENTIAL);
+
+    /// <summary>
+    ///     Role id for the Discord webhook to ping when the round ends.
+    /// </summary>
+    public static readonly CVarDef<string> DiscordRoundEndRoleWebhook =
+        CVarDef.Create("discord.round_end_role", string.Empty, CVar.SERVERONLY);
+}
diff --git a/Content.Shared/CCVar/CCVars.Events.cs b/Content.Shared/CCVar/CCVars.Events.cs
new file mode 100644
index 00000000000..48797b8438c
--- /dev/null
+++ b/Content.Shared/CCVar/CCVars.Events.cs
@@ -0,0 +1,12 @@
+using Robust.Shared.Configuration;
+
+namespace Content.Shared.CCVar;
+
+public sealed partial class CCVars
+{
+    /// <summary>
+    ///     Controls if the game should run station events
+    /// </summary>
+    public static readonly CVarDef<bool>
+        EventsEnabled = CVarDef.Create("events.enabled", true, CVar.ARCHIVE | CVar.SERVERONLY);
+}
diff --git a/Content.Shared/CCVar/CCVars.Explosion.cs b/Content.Shared/CCVar/CCVars.Explosion.cs
new file mode 100644
index 00000000000..51d93456b7e
--- /dev/null
+++ b/Content.Shared/CCVar/CCVars.Explosion.cs
@@ -0,0 +1,108 @@
+using Robust.Shared.Configuration;
+
+namespace Content.Shared.CCVar;
+
+public sealed partial class CCVars
+{
+    /// <summary>
+    ///     How many tiles the explosion system will process per tick
+    /// </summary>
+    /// <remarks>
+    ///     Setting this too high will put a large load on a single tick. Setting this too low will lead to
+    ///     unnaturally "slow" explosions.
+    /// </remarks>
+    public static readonly CVarDef<int> ExplosionTilesPerTick =
+        CVarDef.Create("explosion.tiles_per_tick", 100, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Upper limit on the size of an explosion before physics-throwing is disabled.
+    /// </summary>
+    /// <remarks>
+    ///     Large nukes tend to generate a lot of shrapnel that flies through space. This can functionally cripple
+    ///     the server TPS for a while after an explosion (or even during, if the explosion is processed
+    ///     incrementally.
+    /// </remarks>
+    public static readonly CVarDef<int> ExplosionThrowLimit =
+        CVarDef.Create("explosion.throw_limit", 400, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     If this is true, explosion processing will pause the NodeGroupSystem to pause updating.
+    /// </summary>
+    /// <remarks>
+    ///     This only takes effect if an explosion needs more than one tick to process (i.e., covers more than <see
+    ///     cref="ExplosionTilesPerTick"/> tiles). If this is not enabled, the node-system will rebuild its graph
+    ///     every tick as the explosion shreds the station, causing significant slowdown.
+    /// </remarks>
+    public static readonly CVarDef<bool> ExplosionSleepNodeSys =
+        CVarDef.Create("explosion.node_sleep", true, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Upper limit on the total area that an explosion can affect before the neighbor-finding algorithm just
+    ///     stops. Defaults to a 60-rile radius explosion.
+    /// </summary>
+    /// <remarks>
+    ///     Actual area may be larger, as it currently doesn't terminate mid neighbor finding. I.e., area may be that of a ~51 tile radius circle instead.
+    /// </remarks>
+    public static readonly CVarDef<int> ExplosionMaxArea =
+        CVarDef.Create("explosion.max_area", (int)3.14f * 256 * 256, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Upper limit on the number of neighbor finding steps for the explosion system neighbor-finding algorithm.
+    /// </summary>
+    /// <remarks>
+    ///     Effectively places an upper limit on the range that any explosion can have. In the vast majority of
+    ///     instances, <see cref="ExplosionMaxArea"/> will likely be hit before this becomes a limiting factor.
+    /// </remarks>
+    public static readonly CVarDef<int> ExplosionMaxIterations =
+        CVarDef.Create("explosion.max_iterations", 500, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Max Time in milliseconds to spend processing explosions every tick.
+    /// </summary>
+    /// <remarks>
+    ///     This time limiting is not perfectly implemented. Firstly, a significant chunk of processing time happens
+    ///     due to queued entity deletions, which happen outside of the system update code. Secondly, explosion
+    ///     spawning cannot currently be interrupted & resumed, and may lead to exceeding this time limit.
+    /// </remarks>
+    public static readonly CVarDef<float> ExplosionMaxProcessingTime =
+        CVarDef.Create("explosion.max_tick_time", 7f, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     If the explosion is being processed incrementally over several ticks, this variable determines whether
+    ///     updating the grid tiles should be done incrementally at the end of every tick, or only once the explosion has finished processing.
+    /// </summary>
+    /// <remarks>
+    ///     The most notable consequence of this change is that explosions will only punch a hole in the station &
+    ///     create a vacumm once they have finished exploding. So airlocks will no longer slam shut as the explosion
+    ///     expands, just suddenly at the end.
+    /// </remarks>
+    public static readonly CVarDef<bool> ExplosionIncrementalTileBreaking =
+        CVarDef.Create("explosion.incremental_tile", false, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     This determines for how many seconds an explosion should stay visible once it has finished expanding.
+    /// </summary>
+    public static readonly CVarDef<float> ExplosionPersistence =
+        CVarDef.Create("explosion.persistence", 1.0f, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     If an explosion covers a larger area than this number, the damaging/processing will always start during
+    ///     the next tick, instead of during the same tick that the explosion was generated in.
+    /// </summary>
+    /// <remarks>
+    ///     This value can be used to ensure that for large explosions the area/tile calculation and the explosion
+    ///     processing/damaging occurs in separate ticks. This helps reduce the single-tick lag if both <see
+    ///     cref="ExplosionMaxProcessingTime"/> and <see cref="ExplosionTilesPerTick"/> are large. I.e., instead of
+    ///     a single tick explosion, this cvar allows for a configuration that results in a two-tick explosion,
+    ///     though most of the computational cost is still in the second tick.
+    /// </remarks>
+    public static readonly CVarDef<int> ExplosionSingleTickAreaLimit =
+        CVarDef.Create("explosion.single_tick_area_limit", 400, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Whether or not explosions are allowed to create tiles that have
+    ///     <see cref="ContentTileDefinition.MapAtmosphere"/> set to true.
+    /// </summary>
+    public static readonly CVarDef<bool> ExplosionCanCreateVacuum =
+        CVarDef.Create("explosion.can_create_vacuum", true, CVar.SERVERONLY);
+}
diff --git a/Content.Shared/CCVar/CCVars.Game.Infolinks.cs b/Content.Shared/CCVar/CCVars.Game.Infolinks.cs
new file mode 100644
index 00000000000..fa8332b497e
--- /dev/null
+++ b/Content.Shared/CCVar/CCVars.Game.Infolinks.cs
@@ -0,0 +1,54 @@
+using Robust.Shared.Configuration;
+
+namespace Content.Shared.CCVar;
+
+public sealed partial class CCVars
+{
+    /// <summary>
+    ///     Link to Discord server to show in the launcher.
+    /// </summary>
+    public static readonly CVarDef<string> InfoLinksDiscord =
+        CVarDef.Create("infolinks.discord", "", CVar.SERVER | CVar.REPLICATED);
+
+    /// <summary>
+    ///     Link to website to show in the launcher.
+    /// </summary>
+    public static readonly CVarDef<string> InfoLinksForum =
+        CVarDef.Create("infolinks.forum", "", CVar.SERVER | CVar.REPLICATED);
+
+    /// <summary>
+    ///     Link to GitHub page to show in the launcher.
+    /// </summary>
+    public static readonly CVarDef<string> InfoLinksGithub =
+        CVarDef.Create("infolinks.github", "", CVar.SERVER | CVar.REPLICATED);
+
+    /// <summary>
+    ///     Link to website to show in the launcher.
+    /// </summary>
+    public static readonly CVarDef<string> InfoLinksWebsite =
+        CVarDef.Create("infolinks.website", "", CVar.SERVER | CVar.REPLICATED);
+
+    /// <summary>
+    ///     Link to wiki to show in the launcher.
+    /// </summary>
+    public static readonly CVarDef<string> InfoLinksWiki =
+        CVarDef.Create("infolinks.wiki", "", CVar.SERVER | CVar.REPLICATED);
+
+    /// <summary>
+    ///     Link to Patreon. Not shown in the launcher currently.
+    /// </summary>
+    public static readonly CVarDef<string> InfoLinksPatreon =
+        CVarDef.Create("infolinks.patreon", "", CVar.SERVER | CVar.REPLICATED);
+
+    /// <summary>
+    ///     Link to the bug report form.
+    /// </summary>
+    public static readonly CVarDef<string> InfoLinksBugReport =
+        CVarDef.Create("infolinks.bug_report", "", CVar.SERVER | CVar.REPLICATED);
+
+    /// <summary>
+    ///     Link to site handling ban appeals. Shown in ban disconnect messages.
+    /// </summary>
+    public static readonly CVarDef<string> InfoLinksAppeal =
+        CVarDef.Create("infolinks.appeal", "", CVar.SERVER | CVar.REPLICATED);
+}
diff --git a/Content.Shared/CCVar/CCVars.Game.cs b/Content.Shared/CCVar/CCVars.Game.cs
new file mode 100644
index 00000000000..19092055e39
--- /dev/null
+++ b/Content.Shared/CCVar/CCVars.Game.cs
@@ -0,0 +1,336 @@
+using Content.Shared.Roles;
+using Robust.Shared.Configuration;
+
+namespace Content.Shared.CCVar;
+
+public sealed partial class CCVars
+{
+        /// <summary>
+        ///     Disables most functionality in the GameTicker.
+        /// </summary>
+        public static readonly CVarDef<bool>
+            GameDummyTicker = CVarDef.Create("game.dummyticker", false, CVar.ARCHIVE | CVar.SERVERONLY);
+
+        /// <summary>
+        ///     Controls if the lobby is enabled. If it is not, and there are no available jobs, you may get stuck on a black screen.
+        /// </summary>
+        public static readonly CVarDef<bool>
+            GameLobbyEnabled = CVarDef.Create("game.lobbyenabled", true, CVar.ARCHIVE);
+
+        /// <summary>
+        ///     Controls the duration of the lobby timer in seconds. Defaults to 2 minutes and 30 seconds.
+        /// </summary>
+        public static readonly CVarDef<int>
+            GameLobbyDuration = CVarDef.Create("game.lobbyduration", 150, CVar.ARCHIVE);
+
+        /// <summary>
+        ///     Controls if players can latejoin at all.
+        /// </summary>
+        public static readonly CVarDef<bool>
+            GameDisallowLateJoins = CVarDef.Create("game.disallowlatejoins", false, CVar.ARCHIVE | CVar.SERVERONLY);
+
+        /// <summary>
+        ///     Controls the default game preset.
+        /// </summary>
+        public static readonly CVarDef<string>
+            GameLobbyDefaultPreset = CVarDef.Create("game.defaultpreset", "secret", CVar.ARCHIVE);
+
+        /// <summary>
+        ///     Controls if the game can force a different preset if the current preset's criteria are not met.
+        /// </summary>
+        public static readonly CVarDef<bool>
+            GameLobbyFallbackEnabled = CVarDef.Create("game.fallbackenabled", true, CVar.ARCHIVE);
+
+        /// <summary>
+        ///     The preset for the game to fall back to if the selected preset could not be used, and fallback is enabled.
+        /// </summary>
+        public static readonly CVarDef<string>
+            GameLobbyFallbackPreset = CVarDef.Create("game.fallbackpreset", "Traitor,Extended", CVar.ARCHIVE);
+
+        /// <summary>
+        ///     Controls if people can win the game in Suspicion or Deathmatch.
+        /// </summary>
+        public static readonly CVarDef<bool>
+            GameLobbyEnableWin = CVarDef.Create("game.enablewin", true, CVar.ARCHIVE);
+
+        /// <summary>
+        ///     Controls the maximum number of character slots a player is allowed to have.
+        /// </summary>
+        public static readonly CVarDef<int>
+            GameMaxCharacterSlots = CVarDef.Create("game.maxcharacterslots", 30, CVar.ARCHIVE | CVar.SERVERONLY);
+
+        /// <summary>
+        ///     Controls the game map prototype to load. SS14 stores these prototypes in Prototypes/Maps.
+        /// </summary>
+        public static readonly CVarDef<string>
+            GameMap = CVarDef.Create("game.map", string.Empty, CVar.SERVERONLY);
+
+        /// <summary>
+        ///     Controls whether to use world persistence or not.
+        /// </summary>
+        public static readonly CVarDef<bool>
+            UsePersistence = CVarDef.Create("game.usepersistence", false, CVar.ARCHIVE);
+
+        /// <summary>
+        ///     If world persistence is used, what map prototype should be initially loaded.
+        ///     If the save file exists, it replaces MapPath but everything else stays the same (station name and such).
+        /// </summary>
+        public static readonly CVarDef<string>
+            PersistenceMap = CVarDef.Create("game.persistencemap", "Empty", CVar.ARCHIVE);
+
+        /// <summary>
+        ///     Prototype to use for map pool.
+        /// </summary>
+        public static readonly CVarDef<string>
+            GameMapPool = CVarDef.Create("game.map_pool", "DefaultMapPool", CVar.SERVERONLY);
+
+        /// <summary>
+        ///     The depth of the queue used to calculate which map is next in rotation.
+        ///     This is how long the game "remembers" that some map was put in play. Default is 16 rounds.
+        /// </summary>
+        public static readonly CVarDef<int>
+            GameMapMemoryDepth = CVarDef.Create("game.map_memory_depth", 16, CVar.SERVERONLY);
+
+        /// <summary>
+        ///     Is map rotation enabled?
+        /// </summary>
+        public static readonly CVarDef<bool>
+            GameMapRotation = CVarDef.Create("game.map_rotation", true, CVar.SERVERONLY);
+
+        /// <summary>
+        ///     If roles should be restricted based on time.
+        /// </summary>
+        public static readonly CVarDef<bool>
+            GameRoleTimers = CVarDef.Create("game.role_timers", true, CVar.SERVER | CVar.REPLICATED);
+
+        /// <summary>
+        ///     Override default role requirements using a <see cref="JobRequirementOverridePrototype"/>
+        /// </summary>
+        public static readonly CVarDef<string>
+            GameRoleTimerOverride = CVarDef.Create("game.role_timer_override", "", CVar.SERVER | CVar.REPLICATED);
+
+        /// <summary>
+        ///     If roles should be restricted based on whether or not they are whitelisted.
+        /// </summary>
+        public static readonly CVarDef<bool>
+            GameRoleWhitelist = CVarDef.Create("game.role_whitelist", true, CVar.SERVER | CVar.REPLICATED);
+
+        /// <summary>
+        ///     Whether or not disconnecting inside of a cryopod should remove the character or just store them until they reconnect.
+        /// </summary>
+        public static readonly CVarDef<bool>
+            GameCryoSleepRejoining = CVarDef.Create("game.cryo_sleep_rejoining", false, CVar.SERVER | CVar.REPLICATED);
+
+        /// <summary>
+        ///     When enabled, guests will be assigned permanent UIDs and will have their preferences stored.
+        /// </summary>
+        public static readonly CVarDef<bool> GamePersistGuests =
+            CVarDef.Create("game.persistguests", true, CVar.ARCHIVE | CVar.SERVERONLY);
+
+        public static readonly CVarDef<bool> GameDiagonalMovement =
+            CVarDef.Create("game.diagonalmovement", true, CVar.ARCHIVE);
+
+        public static readonly CVarDef<int> SoftMaxPlayers =
+            CVarDef.Create("game.soft_max_players", 30, CVar.SERVERONLY | CVar.ARCHIVE);
+
+        /// <summary>
+        ///     If a player gets denied connection to the server,
+        ///     how long they are forced to wait before attempting to reconnect.
+        /// </summary>
+        public static readonly CVarDef<int> GameServerFullReconnectDelay =
+            CVarDef.Create("game.server_full_reconnect_delay", 30, CVar.SERVERONLY);
+
+        /// <summary>
+        ///     Whether or not panic bunker is currently enabled.
+        /// </summary>
+        public static readonly CVarDef<bool> PanicBunkerEnabled =
+            CVarDef.Create("game.panic_bunker.enabled", false, CVar.NOTIFY | CVar.REPLICATED | CVar.SERVER);
+
+        /// <summary>
+        ///     Whether or not the panic bunker will disable when an admin comes online.
+        /// </summary>
+        public static readonly CVarDef<bool> PanicBunkerDisableWithAdmins =
+            CVarDef.Create("game.panic_bunker.disable_with_admins", false, CVar.SERVERONLY);
+
+        /// <summary>
+        ///     Whether or not the panic bunker will enable when no admins are online.
+        /// </summary>
+        public static readonly CVarDef<bool> PanicBunkerEnableWithoutAdmins =
+            CVarDef.Create("game.panic_bunker.enable_without_admins", false, CVar.SERVERONLY);
+
+        /// <summary>
+        ///     Whether or not the panic bunker will count deadminned admins for
+        ///     <see cref="PanicBunkerDisableWithAdmins"/> and
+        ///     <see cref="PanicBunkerEnableWithoutAdmins"/>
+        /// </summary>
+        public static readonly CVarDef<bool> PanicBunkerCountDeadminnedAdmins =
+            CVarDef.Create("game.panic_bunker.count_deadminned_admins", false, CVar.SERVERONLY);
+
+        /// <summary>
+        ///     Show reason of disconnect for user or not.
+        /// </summary>
+        public static readonly CVarDef<bool> PanicBunkerShowReason =
+            CVarDef.Create("game.panic_bunker.show_reason", false, CVar.SERVERONLY);
+
+        /// <summary>
+        ///     Minimum age of the account (from server's PoV, so from first-seen date) in minutes.
+        /// </summary>
+        public static readonly CVarDef<int> PanicBunkerMinAccountAge =
+            CVarDef.Create("game.panic_bunker.min_account_age", 1440, CVar.SERVERONLY);
+
+        /// <summary>
+        ///     Minimal overall played time.
+        /// </summary>
+        public static readonly CVarDef<int> PanicBunkerMinOverallMinutes =
+            CVarDef.Create("game.panic_bunker.min_overall_minutes", 600, CVar.SERVERONLY);
+
+        /// <summary>
+        ///     A custom message that will be used for connections denied to the panic bunker
+        ///     If not empty, then will overwrite <see cref="PanicBunkerShowReason"/>
+        /// </summary>
+        public static readonly CVarDef<string> PanicBunkerCustomReason =
+            CVarDef.Create("game.panic_bunker.custom_reason", string.Empty, CVar.SERVERONLY);
+
+        /// <summary>
+        ///     Allow bypassing the panic bunker if the user is whitelisted.
+        /// </summary>
+        public static readonly CVarDef<bool> BypassBunkerWhitelist =
+            CVarDef.Create("game.panic_bunker.whitelisted_can_bypass", true, CVar.SERVERONLY);
+
+        /*
+         * TODO: Remove baby jail code once a more mature gateway process is established. This code is only being issued as a stopgap to help with potential tiding in the immediate future.
+         */
+
+        /// <summary>
+        ///     Whether the baby jail is currently enabled.
+        /// </summary>
+        public static readonly CVarDef<bool> BabyJailEnabled  =
+            CVarDef.Create("game.baby_jail.enabled", false, CVar.NOTIFY | CVar.REPLICATED | CVar.SERVER);
+
+        /// <summary>
+        ///     Show reason of disconnect for user or not.
+        /// </summary>
+        public static readonly CVarDef<bool> BabyJailShowReason =
+            CVarDef.Create("game.baby_jail.show_reason", false, CVar.SERVERONLY);
+
+        /// <summary>
+        ///     Maximum age of the account (from server's PoV, so from first-seen date) in minutes that can access baby
+        ///     jailed servers.
+        /// </summary>
+        public static readonly CVarDef<int> BabyJailMaxAccountAge =
+            CVarDef.Create("game.baby_jail.max_account_age", 1440, CVar.SERVERONLY);
+
+        /// <summary>
+        ///     Maximum overall played time allowed to access baby jailed servers.
+        /// </summary>
+        public static readonly CVarDef<int> BabyJailMaxOverallMinutes =
+            CVarDef.Create("game.baby_jail.max_overall_minutes", 120, CVar.SERVERONLY);
+
+        /// <summary>
+        ///     A custom message that will be used for connections denied due to the baby jail.
+        ///     If not empty, then will overwrite <see cref="BabyJailShowReason"/>
+        /// </summary>
+        public static readonly CVarDef<string> BabyJailCustomReason =
+            CVarDef.Create("game.baby_jail.custom_reason", string.Empty, CVar.SERVERONLY);
+
+        /// <summary>
+        ///     Allow bypassing the baby jail if the user is whitelisted.
+        /// </summary>
+        public static readonly CVarDef<bool> BypassBabyJailWhitelist =
+            CVarDef.Create("game.baby_jail.whitelisted_can_bypass", true, CVar.SERVERONLY);
+
+        /// <summary>
+        ///     Make people bonk when trying to climb certain objects like tables.
+        /// </summary>
+        public static readonly CVarDef<bool> GameTableBonk =
+            CVarDef.Create("game.table_bonk", false, CVar.REPLICATED);
+
+        /// <summary>
+        ///     Whether or not status icons are rendered for everyone.
+        /// </summary>
+        public static readonly CVarDef<bool> GlobalStatusIconsEnabled =
+            CVarDef.Create("game.global_status_icons_enabled", true, CVar.SERVER | CVar.REPLICATED);
+
+        /// <summary>
+        ///     Whether or not status icons are rendered on this specific client.
+        /// </summary>
+        public static readonly CVarDef<bool> LocalStatusIconsEnabled =
+            CVarDef.Create("game.local_status_icons_enabled", true, CVar.CLIENTONLY);
+
+        /// <summary>
+        ///     Whether or not coordinates on the Debug overlay should only be available to admins.
+        /// </summary>
+        public static readonly CVarDef<bool> DebugCoordinatesAdminOnly =
+            CVarDef.Create("game.debug_coordinates_admin_only", true, CVar.SERVER | CVar.REPLICATED);
+
+#if EXCEPTION_TOLERANCE
+        /// <summary>
+        ///     Amount of times round start must fail before the server is shut down.
+        ///     Set to 0 or a negative number to disable.
+        /// </summary>
+        public static readonly CVarDef<int> RoundStartFailShutdownCount =
+            CVarDef.Create("game.round_start_fail_shutdown_count", 5, CVar.SERVERONLY | CVar.SERVER);
+#endif
+
+        /// <summary>
+        ///     Delay between station alert level changes.
+        /// </summary>
+        public static readonly CVarDef<int> GameAlertLevelChangeDelay =
+            CVarDef.Create("game.alert_level_change_delay", 30, CVar.SERVERONLY);
+
+        /// <summary>
+        ///     The time in seconds that the server should wait before restarting the round.
+        ///     Defaults to 2 minutes.
+        /// </summary>
+        public static readonly CVarDef<float> RoundRestartTime =
+            CVarDef.Create("game.round_restart_time", 120f, CVar.SERVERONLY);
+
+        /// <summary>
+        ///     The prototype to use for secret weights.
+        /// </summary>
+        public static readonly CVarDef<string> SecretWeightPrototype =
+            CVarDef.Create("game.secret_weight_prototype", "Secret", CVar.SERVERONLY);
+
+        /// <summary>
+        ///     The id of the sound collection to randomly choose a sound from and play when the round ends.
+        /// </summary>
+        public static readonly CVarDef<string> RoundEndSoundCollection =
+            CVarDef.Create("game.round_end_sound_collection", "RoundEnd", CVar.SERVERONLY);
+
+        /// <summary>
+        ///     Whether or not to add every player as a global override to PVS at round end.
+        ///     This will allow all players to see their clothing in the round screen player list screen,
+        ///     but may cause lag during round end with very high player counts.
+        /// </summary>
+        public static readonly CVarDef<bool> RoundEndPVSOverrides =
+            CVarDef.Create("game.round_end_pvs_overrides", true, CVar.SERVERONLY);
+
+        /// <summary>
+        ///     If true, players can place objects onto tabletop games like chess boards.
+        /// </summary>
+        /// <remarks>
+        ///     This feature is currently highly abusable and can easily be used to crash the server,
+        ///     so it's off by default.
+        /// </remarks>
+        public static readonly CVarDef<bool> GameTabletopPlace =
+            CVarDef.Create("game.tabletop_place", false, CVar.SERVERONLY);
+
+        /// <summary>
+        ///     If true, contraband severity can be viewed in the examine menu
+        /// </summary>
+        public static readonly CVarDef<bool> ContrabandExamine =
+            CVarDef.Create("game.contraband_examine", true, CVar.SERVER | CVar.REPLICATED);
+
+        /// <summary>
+        ///     Size of the lookup area for adding entities to the context menu
+        /// </summary>
+        public static readonly CVarDef<float> GameEntityMenuLookup =
+            CVarDef.Create("game.entity_menu_lookup", 0.25f, CVar.CLIENTONLY | CVar.ARCHIVE);
+
+        /// <summary>
+        ///     Should the clients window show the server hostname in the title?
+        /// </summary>
+        public static readonly CVarDef<bool> GameHostnameInTitlebar =
+            CVarDef.Create("game.hostname_in_titlebar", true, CVar.SERVER | CVar.REPLICATED);
+
+}
diff --git a/Content.Shared/CCVar/CCVars.Ghost.cs b/Content.Shared/CCVar/CCVars.Ghost.cs
new file mode 100644
index 00000000000..39e7a3c4910
--- /dev/null
+++ b/Content.Shared/CCVar/CCVars.Ghost.cs
@@ -0,0 +1,24 @@
+using Robust.Shared.Configuration;
+
+namespace Content.Shared.CCVar;
+
+public sealed partial class CCVars
+{
+    /// <summary>
+    ///     The time you must spend reading the rules, before the "Request" button is enabled
+    /// </summary>
+    public static readonly CVarDef<float> GhostRoleTime =
+        CVarDef.Create("ghost.role_time", 3f, CVar.REPLICATED | CVar.SERVER);
+
+    /// <summary>
+    ///     If ghost role lotteries should be made near-instanteous.
+    /// </summary>
+    public static readonly CVarDef<bool> GhostQuickLottery =
+        CVarDef.Create("ghost.quick_lottery", false, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Whether or not to kill the player's mob on ghosting, when it is in a critical health state.
+    /// </summary>
+    public static readonly CVarDef<bool> GhostKillCrit =
+        CVarDef.Create("ghost.kill_crit", true, CVar.REPLICATED | CVar.SERVER);
+}
diff --git a/Content.Shared/CCVar/CCVars.Hud.cs b/Content.Shared/CCVar/CCVars.Hud.cs
new file mode 100644
index 00000000000..f96924b3496
--- /dev/null
+++ b/Content.Shared/CCVar/CCVars.Hud.cs
@@ -0,0 +1,24 @@
+using Robust.Shared.Configuration;
+
+namespace Content.Shared.CCVar;
+
+public sealed partial class CCVars
+{
+    public static readonly CVarDef<int> HudTheme =
+        CVarDef.Create("hud.theme", 0, CVar.ARCHIVE | CVar.CLIENTONLY);
+
+    public static readonly CVarDef<bool> HudHeldItemShow =
+        CVarDef.Create("hud.held_item_show", true, CVar.ARCHIVE | CVar.CLIENTONLY);
+
+    public static readonly CVarDef<bool> CombatModeIndicatorsPointShow =
+        CVarDef.Create("hud.combat_mode_indicators_point_show", true, CVar.ARCHIVE | CVar.CLIENTONLY);
+
+    public static readonly CVarDef<bool> LoocAboveHeadShow =
+        CVarDef.Create("hud.show_looc_above_head", true, CVar.ARCHIVE | CVar.CLIENTONLY);
+
+    public static readonly CVarDef<float> HudHeldItemOffset =
+        CVarDef.Create("hud.held_item_offset", 28f, CVar.ARCHIVE | CVar.CLIENTONLY);
+
+    public static readonly CVarDef<bool> HudFpsCounterVisible =
+        CVarDef.Create("hud.fps_counter_visible", false, CVar.CLIENTONLY | CVar.ARCHIVE);
+}
diff --git a/Content.Shared/CCVar/CCVars.Ic.cs b/Content.Shared/CCVar/CCVars.Ic.cs
new file mode 100644
index 00000000000..e149e9f3e1e
--- /dev/null
+++ b/Content.Shared/CCVar/CCVars.Ic.cs
@@ -0,0 +1,48 @@
+using Robust.Shared.Configuration;
+
+namespace Content.Shared.CCVar;
+
+public sealed partial class CCVars
+{
+    /// <summary>
+    ///     Restricts IC character names to alphanumeric chars.
+    /// </summary>
+    public static readonly CVarDef<bool> RestrictedNames =
+        CVarDef.Create("ic.restricted_names", true, CVar.SERVER | CVar.REPLICATED);
+
+    /// <summary>
+    ///     Allows flavor text (character descriptions)
+    /// </summary>
+    public static readonly CVarDef<bool> FlavorText =
+        CVarDef.Create("ic.flavor_text", false, CVar.SERVER | CVar.REPLICATED);
+
+    /// <summary>
+    ///     Adds a period at the end of a sentence if the sentence ends in a letter.
+    /// </summary>
+    public static readonly CVarDef<bool> ChatPunctuation =
+        CVarDef.Create("ic.punctuation", false, CVar.SERVER);
+
+    /// <summary>
+    ///     Enables automatically forcing IC name rules. Uppercases the first letter of the first and last words of the name
+    /// </summary>
+    public static readonly CVarDef<bool> ICNameCase =
+        CVarDef.Create("ic.name_case", true, CVar.SERVER | CVar.REPLICATED);
+
+    /// <summary>
+    ///     Whether or not players' characters are randomly generated rather than using their selected characters in the creator.
+    /// </summary>
+    public static readonly CVarDef<bool> ICRandomCharacters =
+        CVarDef.Create("ic.random_characters", false, CVar.SERVER);
+
+    /// <summary>
+    ///     A weighted random prototype used to determine the species selected for random characters.
+    /// </summary>
+    public static readonly CVarDef<string> ICRandomSpeciesWeights =
+        CVarDef.Create("ic.random_species_weights", "SpeciesWeights", CVar.SERVER);
+
+    /// <summary>
+    ///     Control displaying SSD indicators near players
+    /// </summary>
+    public static readonly CVarDef<bool> ICShowSSDIndicator =
+        CVarDef.Create("ic.show_ssd_indicator", true, CVar.CLIENTONLY);
+}
diff --git a/Content.Shared/CCVar/CCVars.Interactions.cs b/Content.Shared/CCVar/CCVars.Interactions.cs
new file mode 100644
index 00000000000..c62f81be0ca
--- /dev/null
+++ b/Content.Shared/CCVar/CCVars.Interactions.cs
@@ -0,0 +1,54 @@
+using Robust.Shared.Configuration;
+
+namespace Content.Shared.CCVar;
+
+public sealed partial class CCVars
+{
+    /// <summary>
+    ///     Deadzone for drag-drop interactions.
+    /// </summary>
+    public static readonly CVarDef<float> DragDropDeadZone =
+        CVarDef.Create("control.drag_dead_zone", 12f, CVar.CLIENTONLY | CVar.ARCHIVE);
+
+    /// <summary>
+    ///     Toggles whether the walking key is a toggle or a held key.
+    /// </summary>
+    public static readonly CVarDef<bool> ToggleWalk =
+        CVarDef.Create("control.toggle_walk", false, CVar.CLIENTONLY | CVar.ARCHIVE);
+
+    // The rationale behind the default limit is simply that I can easily get to 7 interactions per second by just
+    // trying to spam toggle a light switch or lever (though the UseDelay component limits the actual effect of the
+    // interaction).  I don't want to accidentally spam admins with alerts just because somebody is spamming a
+    // key manually, nor do we want to alert them just because the player is having network issues and the server
+    // receives multiple interactions at once. But we also want to try catch people with modified clients that spam
+    // many interactions on the same tick. Hence, a very short period, with a relatively high count.
+
+    /// <summary>
+    ///     Maximum number of interactions that a player can perform within <see cref="InteractionRateLimitCount"/> seconds
+    /// </summary>
+    public static readonly CVarDef<int> InteractionRateLimitCount =
+        CVarDef.Create("interaction.rate_limit_count", 5, CVar.SERVER | CVar.REPLICATED);
+
+    /// <seealso cref="InteractionRateLimitCount"/>
+    public static readonly CVarDef<float> InteractionRateLimitPeriod =
+        CVarDef.Create("interaction.rate_limit_period", 0.5f, CVar.SERVER | CVar.REPLICATED);
+
+    /// <summary>
+    ///     Minimum delay (in seconds) between notifying admins about interaction rate limit violations. A negative
+    ///     value disables admin announcements.
+    /// </summary>
+    public static readonly CVarDef<int> InteractionRateLimitAnnounceAdminsDelay =
+        CVarDef.Create("interaction.rate_limit_announce_admins_delay", 120, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Whether or not the storage UI is static and bound to the hotbar, or unbound and allowed to be dragged anywhere.
+    /// </summary>
+    public static readonly CVarDef<bool> StaticStorageUI =
+        CVarDef.Create("control.static_storage_ui", true, CVar.CLIENTONLY | CVar.ARCHIVE);
+
+    /// <summary>
+    ///     Whether or not the storage window uses a transparent or opaque sprite.
+    /// </summary>
+    public static readonly CVarDef<bool> OpaqueStorageWindow =
+        CVarDef.Create("control.opaque_storage_background", false, CVar.CLIENTONLY | CVar.ARCHIVE);
+}
diff --git a/Content.Shared/CCVar/CCVars.Interface.cs b/Content.Shared/CCVar/CCVars.Interface.cs
new file mode 100644
index 00000000000..79a28e6b4e6
--- /dev/null
+++ b/Content.Shared/CCVar/CCVars.Interface.cs
@@ -0,0 +1,24 @@
+using Robust.Shared.Configuration;
+
+namespace Content.Shared.CCVar;
+
+public sealed partial class CCVars
+{
+    public static readonly CVarDef<string> UIClickSound =
+        CVarDef.Create("interface.click_sound", "/Audio/UserInterface/click.ogg", CVar.REPLICATED);
+
+    public static readonly CVarDef<string> UIHoverSound =
+        CVarDef.Create("interface.hover_sound", "/Audio/UserInterface/hover.ogg", CVar.REPLICATED);
+
+    public static readonly CVarDef<string> UILayout =
+        CVarDef.Create("ui.layout", "Default", CVar.CLIENTONLY | CVar.ARCHIVE);
+
+    public static readonly CVarDef<string> DefaultScreenChatSize =
+        CVarDef.Create("ui.default_chat_size", "", CVar.CLIENTONLY | CVar.ARCHIVE);
+
+    public static readonly CVarDef<string> SeparatedScreenChatSize =
+        CVarDef.Create("ui.separated_chat_size", "0.6,0", CVar.CLIENTONLY | CVar.ARCHIVE);
+
+    public static readonly CVarDef<bool> OutlineEnabled =
+        CVarDef.Create("outline.enabled", true, CVar.CLIENTONLY);
+}
diff --git a/Content.Shared/CCVar/CCVars.Mapping.cs b/Content.Shared/CCVar/CCVars.Mapping.cs
new file mode 100644
index 00000000000..06cd2870ba2
--- /dev/null
+++ b/Content.Shared/CCVar/CCVars.Mapping.cs
@@ -0,0 +1,24 @@
+using Robust.Shared.Configuration;
+
+namespace Content.Shared.CCVar;
+
+public sealed partial class CCVars
+{
+    /// <summary>
+    ///     Will mapping mode enable autosaves when it's activated?
+    /// </summary>
+    public static readonly CVarDef<bool>
+        AutosaveEnabled = CVarDef.Create("mapping.autosave", true, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Autosave interval in seconds.
+    /// </summary>
+    public static readonly CVarDef<float>
+        AutosaveInterval = CVarDef.Create("mapping.autosave_interval", 600f, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Directory in server user data to save to. Saves will be inside folders in this directory.
+    /// </summary>
+    public static readonly CVarDef<string>
+        AutosaveDirectory = CVarDef.Create("mapping.autosave_dir", "Autosaves", CVar.SERVERONLY);
+}
diff --git a/Content.Shared/CCVar/CCVars.Midi.cs b/Content.Shared/CCVar/CCVars.Midi.cs
new file mode 100644
index 00000000000..4ca4bfd6f86
--- /dev/null
+++ b/Content.Shared/CCVar/CCVars.Midi.cs
@@ -0,0 +1,18 @@
+using Robust.Shared.Configuration;
+
+namespace Content.Shared.CCVar;
+
+public sealed partial class CCVars
+{
+    public static readonly CVarDef<int> MaxMidiEventsPerSecond =
+        CVarDef.Create("midi.max_events_per_second", 1000, CVar.REPLICATED | CVar.SERVER);
+
+    public static readonly CVarDef<int> MaxMidiEventsPerBatch =
+        CVarDef.Create("midi.max_events_per_batch", 60, CVar.REPLICATED | CVar.SERVER);
+
+    public static readonly CVarDef<int> MaxMidiBatchesDropped =
+        CVarDef.Create("midi.max_batches_dropped", 1, CVar.SERVERONLY);
+
+    public static readonly CVarDef<int> MaxMidiLaggedBatches =
+        CVarDef.Create("midi.max_lagged_batches", 8, CVar.SERVERONLY);
+}
diff --git a/Content.Shared/CCVar/CCVars.Misc.cs b/Content.Shared/CCVar/CCVars.Misc.cs
new file mode 100644
index 00000000000..3d597c74274
--- /dev/null
+++ b/Content.Shared/CCVar/CCVars.Misc.cs
@@ -0,0 +1,97 @@
+using Robust.Shared.Configuration;
+
+namespace Content.Shared.CCVar;
+
+public sealed partial class CCVars
+{
+    public static readonly CVarDef<bool> HolidaysEnabled = CVarDef.Create("holidays.enabled", true, CVar.SERVERONLY);
+    public static readonly CVarDef<bool> BrandingSteam = CVarDef.Create("branding.steam", false, CVar.CLIENTONLY);
+    public static readonly CVarDef<int> EntityMenuGroupingType = CVarDef.Create("entity_menu", 0, CVar.CLIENTONLY);
+
+    /// <summary>
+    ///     Should we pre-load all of the procgen atlasses.
+    /// </summary>
+    public static readonly CVarDef<bool> ProcgenPreload =
+        CVarDef.Create("procgen.preload", true, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Enabled: Cloning has 70% cost and reclaimer will refuse to reclaim corpses with souls. (For LRP).
+    ///     Disabled: Cloning has full biomass cost and reclaimer can reclaim corpses with souls. (Playtested and balanced for MRP+).
+    /// </summary>
+    public static readonly CVarDef<bool> BiomassEasyMode =
+        CVarDef.Create("biomass.easy_mode", true, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     A scale factor applied to a grid's bounds when trying to find a spot to randomly generate an anomaly.
+    /// </summary>
+    public static readonly CVarDef<float> AnomalyGenerationGridBoundsScale =
+        CVarDef.Create("anomaly.generation_grid_bounds_scale", 0.6f, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     How long a client can go without any input before being considered AFK.
+    /// </summary>
+    public static readonly CVarDef<float> AfkTime =
+        CVarDef.Create("afk.time", 60f, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Flavor limit. This is to ensure that having a large mass of flavors in
+    ///     some food object won't spam a user with flavors.
+    /// </summary>
+    public static readonly CVarDef<int>
+        FlavorLimit = CVarDef.Create("flavor.limit", 10, CVar.SERVERONLY);
+
+    public static readonly CVarDef<string> DestinationFile =
+        CVarDef.Create("autogen.destination_file", "", CVar.SERVER | CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Whether uploaded files will be stored in the server's database.
+    ///     This is useful to keep "logs" on what files admins have uploaded in the past.
+    /// </summary>
+    public static readonly CVarDef<bool> ResourceUploadingStoreEnabled =
+        CVarDef.Create("netres.store_enabled", true, CVar.SERVER | CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Numbers of days before stored uploaded files are deleted. Set to zero or negative to disable auto-delete.
+    ///     This is useful to free some space automatically. Auto-deletion runs only on server boot.
+    /// </summary>
+    public static readonly CVarDef<int> ResourceUploadingStoreDeletionDays =
+        CVarDef.Create("netres.store_deletion_days", 30, CVar.SERVER | CVar.SERVERONLY);
+
+    /// <summary>
+    ///     If a server update restart is pending, the delay after the last player leaves before we actually restart. In seconds.
+    /// </summary>
+    public static readonly CVarDef<float> UpdateRestartDelay =
+        CVarDef.Create("update.restart_delay", 20f, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     If fire alarms should have all access, or if activating/resetting these
+    ///     should be restricted to what is dictated on a player's access card.
+    ///     Defaults to true.
+    /// </summary>
+    public static readonly CVarDef<bool> FireAlarmAllAccess =
+        CVarDef.Create("firealarm.allaccess", true, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Time between play time autosaves, in seconds.
+    /// </summary>
+    public static readonly CVarDef<float>
+        PlayTimeSaveInterval = CVarDef.Create("playtime.save_interval", 900f, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     The maximum amount of time the entity GC can process, in ms.
+    /// </summary>
+    public static readonly CVarDef<int> GCMaximumTimeMs =
+        CVarDef.Create("entgc.maximum_time_ms", 5, CVar.SERVERONLY);
+
+    public static readonly CVarDef<bool> GatewayGeneratorEnabled =
+        CVarDef.Create("gateway.generator_enabled", true);
+
+    public static readonly CVarDef<string> TippyEntity =
+        CVarDef.Create("tippy.entity", "Tippy", CVar.SERVER | CVar.REPLICATED);
+
+    /// <summary>
+    ///     The number of seconds that must pass for a single entity to be able to point at something again.
+    /// </summary>
+    public static readonly CVarDef<float> PointingCooldownSeconds =
+        CVarDef.Create("pointing.cooldown_seconds", 0.5f, CVar.SERVERONLY);
+}
diff --git a/Content.Shared/CCVar/CCVars.NPC.cs b/Content.Shared/CCVar/CCVars.NPC.cs
new file mode 100644
index 00000000000..f0d5520195d
--- /dev/null
+++ b/Content.Shared/CCVar/CCVars.NPC.cs
@@ -0,0 +1,16 @@
+using Robust.Shared.Configuration;
+
+namespace Content.Shared.CCVar;
+
+public sealed partial class CCVars
+{
+    public static readonly CVarDef<int> NPCMaxUpdates =
+        CVarDef.Create("npc.max_updates", 128);
+
+    public static readonly CVarDef<bool> NPCEnabled = CVarDef.Create("npc.enabled", true);
+
+    /// <summary>
+    ///     Should NPCs pathfind when steering. For debug purposes.
+    /// </summary>
+    public static readonly CVarDef<bool> NPCPathfinding = CVarDef.Create("npc.pathfinding", true);
+}
diff --git a/Content.Shared/CCVar/CCVars.Net.cs b/Content.Shared/CCVar/CCVars.Net.cs
new file mode 100644
index 00000000000..b7465def2eb
--- /dev/null
+++ b/Content.Shared/CCVar/CCVars.Net.cs
@@ -0,0 +1,15 @@
+using Robust.Shared.Configuration;
+
+namespace Content.Shared.CCVar;
+
+public sealed partial class CCVars
+{
+    public static readonly CVarDef<float> NetAtmosDebugOverlayTickRate =
+        CVarDef.Create("net.atmosdbgoverlaytickrate", 3.0f);
+
+    public static readonly CVarDef<float> NetGasOverlayTickRate =
+        CVarDef.Create("net.gasoverlaytickrate", 3.0f);
+
+    public static readonly CVarDef<int> GasOverlayThresholds =
+        CVarDef.Create("net.gasoverlaythresholds", 20);
+}
diff --git a/Content.Shared/CCVar/CCVars.Parallax.cs b/Content.Shared/CCVar/CCVars.Parallax.cs
new file mode 100644
index 00000000000..9b19c8f4943
--- /dev/null
+++ b/Content.Shared/CCVar/CCVars.Parallax.cs
@@ -0,0 +1,15 @@
+using Robust.Shared.Configuration;
+
+namespace Content.Shared.CCVar;
+
+public sealed partial class CCVars
+{
+    public static readonly CVarDef<bool> ParallaxEnabled =
+        CVarDef.Create("parallax.enabled", true, CVar.CLIENTONLY);
+
+    public static readonly CVarDef<bool> ParallaxDebug =
+        CVarDef.Create("parallax.debug", false, CVar.CLIENTONLY);
+
+    public static readonly CVarDef<bool> ParallaxLowQuality =
+        CVarDef.Create("parallax.low_quality", false, CVar.ARCHIVE | CVar.CLIENTONLY);
+}
diff --git a/Content.Shared/CCVar/CCVars.Physics.cs b/Content.Shared/CCVar/CCVars.Physics.cs
new file mode 100644
index 00000000000..379676b5df9
--- /dev/null
+++ b/Content.Shared/CCVar/CCVars.Physics.cs
@@ -0,0 +1,27 @@
+using Robust.Shared.Configuration;
+
+namespace Content.Shared.CCVar;
+
+public sealed partial class CCVars
+{
+    /// <summary>
+    ///     When a mob is walking should its X / Y movement be relative to its parent (true) or the map (false).
+    /// </summary>
+    public static readonly CVarDef<bool> RelativeMovement =
+        CVarDef.Create("physics.relative_movement", true, CVar.ARCHIVE | CVar.REPLICATED | CVar.SERVER);
+
+    public static readonly CVarDef<float> TileFrictionModifier =
+        CVarDef.Create("physics.tile_friction", 40.0f, CVar.ARCHIVE | CVar.REPLICATED | CVar.SERVER);
+
+    public static readonly CVarDef<float> StopSpeed =
+        CVarDef.Create("physics.stop_speed", 0.1f, CVar.ARCHIVE | CVar.REPLICATED | CVar.SERVER);
+
+    /// <summary>
+    ///     Whether mobs can push objects like lockers.
+    /// </summary>
+    /// <remarks>
+    ///     Technically client doesn't need to know about it but this may prevent a bug in the distant future so it stays.
+    /// </remarks>
+    public static readonly CVarDef<bool> MobPushing =
+        CVarDef.Create("physics.mob_pushing", false, CVar.REPLICATED | CVar.SERVER);
+}
diff --git a/Content.Shared/CCVar/CCVars.Radiation.cs b/Content.Shared/CCVar/CCVars.Radiation.cs
new file mode 100644
index 00000000000..dfcce15b2f9
--- /dev/null
+++ b/Content.Shared/CCVar/CCVars.Radiation.cs
@@ -0,0 +1,32 @@
+using Robust.Shared.Configuration;
+
+namespace Content.Shared.CCVar;
+
+public sealed partial class CCVars
+{
+    /// <summary>
+    ///     What is the smallest radiation dose in rads that can be received by object.
+    ///     Extremely small values may impact performance.
+    /// </summary>
+    public static readonly CVarDef<float> RadiationMinIntensity =
+        CVarDef.Create("radiation.min_intensity", 0.1f, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Rate of radiation system update in seconds.
+    /// </summary>
+    public static readonly CVarDef<float> RadiationGridcastUpdateRate =
+        CVarDef.Create("radiation.gridcast.update_rate", 1.0f, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     If both radiation source and receiver are placed on same grid, ignore grids between them.
+    ///     May get inaccurate result in some cases, but greatly boost performance in general.
+    /// </summary>
+    public static readonly CVarDef<bool> RadiationGridcastSimplifiedSameGrid =
+        CVarDef.Create("radiation.gridcast.simplified_same_grid", true, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Max distance that radiation ray can travel in meters.
+    /// </summary>
+    public static readonly CVarDef<float> RadiationGridcastMaxDistance =
+        CVarDef.Create("radiation.gridcast.max_distance", 50f, CVar.SERVERONLY);
+}
diff --git a/Content.Shared/CCVar/CCVars.Replays.cs b/Content.Shared/CCVar/CCVars.Replays.cs
new file mode 100644
index 00000000000..64f47e8ad8c
--- /dev/null
+++ b/Content.Shared/CCVar/CCVars.Replays.cs
@@ -0,0 +1,43 @@
+using Robust.Shared.Configuration;
+
+namespace Content.Shared.CCVar;
+
+public sealed partial class CCVars
+{
+    /// <summary>
+    ///     Whether or not to record admin chat. If replays are being publicly distributes, this should probably be
+    ///     false.
+    /// </summary>
+    public static readonly CVarDef<bool> ReplayRecordAdminChat =
+        CVarDef.Create("replay.record_admin_chat", false, CVar.ARCHIVE);
+
+    /// <summary>
+    ///     Automatically record full rounds as replays.
+    /// </summary>
+    public static readonly CVarDef<bool> ReplayAutoRecord =
+        CVarDef.Create("replay.auto_record", false, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     The file name to record automatic replays to. The path is relative to <see cref="CVars.ReplayDirectory"/>.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    ///     If the path includes slashes, directories will be automatically created if necessary.
+    /// </para>
+    /// <para>
+    ///     A number of substitutions can be used to automatically fill in the file name: <c>{year}</c>, <c>{month}</c>, <c>{day}</c>, <c>{hour}</c>, <c>{minute}</c>, <c>{round}</c>.
+    /// </para>
+    /// </remarks>
+    public static readonly CVarDef<string> ReplayAutoRecordName =
+        CVarDef.Create("replay.auto_record_name",
+            "{year}_{month}_{day}-{hour}_{minute}-round_{round}.zip",
+            CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Path that, if provided, automatic replays are initially recorded in.
+    ///     When the recording is done, the file is moved into its final destination.
+    ///     Unless this path is rooted, it will be relative to <see cref="CVars.ReplayDirectory"/>.
+    /// </summary>
+    public static readonly CVarDef<string> ReplayAutoRecordTempDir =
+        CVarDef.Create("replay.auto_record_temp_dir", "", CVar.SERVERONLY);
+}
diff --git a/Content.Shared/CCVar/CCVars.Salvage.cs b/Content.Shared/CCVar/CCVars.Salvage.cs
new file mode 100644
index 00000000000..ddc332786ba
--- /dev/null
+++ b/Content.Shared/CCVar/CCVars.Salvage.cs
@@ -0,0 +1,18 @@
+using Robust.Shared.Configuration;
+
+namespace Content.Shared.CCVar;
+
+public sealed partial class CCVars
+{
+    /// <summary>
+    ///     Duration for missions
+    /// </summary>
+    public static readonly CVarDef<float>
+        SalvageExpeditionDuration = CVarDef.Create("salvage.expedition_duration", 660f, CVar.REPLICATED);
+
+    /// <summary>
+    ///     Cooldown for missions.
+    /// </summary>
+    public static readonly CVarDef<float>
+        SalvageExpeditionCooldown = CVarDef.Create("salvage.expedition_cooldown", 780f, CVar.REPLICATED);
+}
diff --git a/Content.Shared/CCVar/CCVars.Server.cs b/Content.Shared/CCVar/CCVars.Server.cs
new file mode 100644
index 00000000000..2c861584afc
--- /dev/null
+++ b/Content.Shared/CCVar/CCVars.Server.cs
@@ -0,0 +1,43 @@
+using Robust.Shared.Configuration;
+
+namespace Content.Shared.CCVar;
+
+public sealed partial class CCVars
+{
+    /*
+     * Server
+     */
+
+    /// <summary>
+    ///     Change this to have the changelog and rules "last seen" date stored separately.
+    /// </summary>
+    public static readonly CVarDef<string> ServerId =
+        CVarDef.Create("server.id", "unknown_server_id", CVar.REPLICATED | CVar.SERVER);
+
+    /// <summary>
+    ///     Guide Entry Prototype ID to be displayed as the server rules.
+    /// </summary>
+    public static readonly CVarDef<string> RulesFile =
+        CVarDef.Create("server.rules_file", "DefaultRuleset", CVar.REPLICATED | CVar.SERVER);
+
+    /// <summary>
+    ///     Guide entry that is displayed by default when a guide is opened.
+    /// </summary>
+    public static readonly CVarDef<string> DefaultGuide =
+        CVarDef.Create("server.default_guide", "NewPlayer", CVar.REPLICATED | CVar.SERVER);
+
+    /// <summary>
+    ///     If greater than 0, automatically restart the server after this many minutes of uptime.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    ///     This is intended to work around various bugs and performance issues caused by long continuous server uptime.
+    /// </para>
+    /// <para>
+    ///     This uses the same non-disruptive logic as update restarts,
+    ///     i.e. the game will only restart at round end or when there is nobody connected.
+    /// </para>
+    /// </remarks>
+    public static readonly CVarDef<int> ServerUptimeRestartMinutes =
+        CVarDef.Create("server.uptime_restart_minutes", 0, CVar.SERVERONLY);
+}
diff --git a/Content.Shared/CCVar/CCVars.Shuttle.cs b/Content.Shared/CCVar/CCVars.Shuttle.cs
new file mode 100644
index 00000000000..f66fe9ca598
--- /dev/null
+++ b/Content.Shared/CCVar/CCVars.Shuttle.cs
@@ -0,0 +1,176 @@
+using Robust.Shared.Configuration;
+
+namespace Content.Shared.CCVar;
+
+public sealed partial class CCVars
+{
+    /// <summary>
+    ///     If true then the camera will match the grid / map and is unchangeable.
+    ///     - When traversing grids it will snap to 0 degrees rotation.
+    ///     False means the player has control over the camera rotation.
+    ///     - When traversing grids it will snap to the nearest cardinal which will generally be imperceptible.
+    /// </summary>
+    public static readonly CVarDef<bool> CameraRotationLocked =
+        CVarDef.Create("shuttle.camera_rotation_locked", false, CVar.REPLICATED);
+
+    /// <summary>
+    ///     Whether the arrivals terminal should be on a planet map.
+    /// </summary>
+    public static readonly CVarDef<bool> ArrivalsPlanet =
+        CVarDef.Create("shuttle.arrivals_planet", true, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Whether the arrivals shuttle is enabled.
+    /// </summary>
+    public static readonly CVarDef<bool> ArrivalsShuttles =
+        CVarDef.Create("shuttle.arrivals", true, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     The map to use for the arrivals station.
+    /// </summary>
+    public static readonly CVarDef<string> ArrivalsMap =
+        CVarDef.Create("shuttle.arrivals_map", "/Maps/Misc/terminal.yml", CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Cooldown between arrivals departures. This should be longer than the FTL time or it will double cycle.
+    /// </summary>
+    public static readonly CVarDef<float> ArrivalsCooldown =
+        CVarDef.Create("shuttle.arrivals_cooldown", 50f, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Are players allowed to return on the arrivals shuttle.
+    /// </summary>
+    public static readonly CVarDef<bool> ArrivalsReturns =
+        CVarDef.Create("shuttle.arrivals_returns", false, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Should all players who spawn at arrivals have godmode until they leave the map?
+    /// </summary>
+    public static readonly CVarDef<bool> GodmodeArrivals =
+        CVarDef.Create("shuttle.godmode_arrivals", false, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     If a grid is split then hide any smaller ones under this mass (kg) from the map.
+    ///     This is useful to avoid split grids spamming out labels.
+    /// </summary>
+    public static readonly CVarDef<int> HideSplitGridsUnder =
+        CVarDef.Create("shuttle.hide_split_grids_under", 30, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Whether to automatically spawn escape shuttles.
+    /// </summary>
+    public static readonly CVarDef<bool> GridFill =
+        CVarDef.Create("shuttle.grid_fill", true, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Whether to automatically preloading grids by GridPreloaderSystem
+    /// </summary>
+    public static readonly CVarDef<bool> PreloadGrids =
+        CVarDef.Create("shuttle.preload_grids", true, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     How long the warmup time before FTL start should be.
+    /// </summary>
+    public static readonly CVarDef<float> FTLStartupTime =
+        CVarDef.Create("shuttle.startup_time", 5.5f, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     How long a shuttle spends in FTL.
+    /// </summary>
+    public static readonly CVarDef<float> FTLTravelTime =
+        CVarDef.Create("shuttle.travel_time", 20f, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     How long the final stage of FTL before arrival should be.
+    /// </summary>
+    public static readonly CVarDef<float> FTLArrivalTime =
+        CVarDef.Create("shuttle.arrival_time", 5f, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     How much time needs to pass before a shuttle can FTL again.
+    /// </summary>
+    public static readonly CVarDef<float> FTLCooldown =
+        CVarDef.Create("shuttle.cooldown", 10f, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     The maximum <see cref="PhysicsComponent.Mass"/> a grid can have before it becomes unable to FTL.
+    ///     Any value equal to or less than zero will disable this check.
+    /// </summary>
+    public static readonly CVarDef<float> FTLMassLimit =
+        CVarDef.Create("shuttle.mass_limit", 300f, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     How long to knock down entities for if they aren't buckled when FTL starts and stops.
+    /// </summary>
+    public static readonly CVarDef<float> HyperspaceKnockdownTime =
+        CVarDef.Create("shuttle.hyperspace_knockdown_time", 5f, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Is the emergency shuttle allowed to be early launched.
+    /// </summary>
+    public static readonly CVarDef<bool> EmergencyEarlyLaunchAllowed =
+        CVarDef.Create("shuttle.emergency_early_launch_allowed", false, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     How long the emergency shuttle remains docked with the station, in seconds.
+    /// </summary>
+    public static readonly CVarDef<float> EmergencyShuttleDockTime =
+        CVarDef.Create("shuttle.emergency_dock_time", 180f, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     If the emergency shuttle can't dock at a priority port, the dock time will be multiplied with this value.
+    /// </summary>
+    public static readonly CVarDef<float> EmergencyShuttleDockTimeMultiplierOtherDock =
+        CVarDef.Create("shuttle.emergency_dock_time_multiplier_other_dock", 1.6667f, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     If the emergency shuttle can't dock at all, the dock time will be multiplied with this value.
+    /// </summary>
+    public static readonly CVarDef<float> EmergencyShuttleDockTimeMultiplierNoDock =
+        CVarDef.Create("shuttle.emergency_dock_time_multiplier_no_dock", 2f, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     How long after the console is authorized for the shuttle to early launch.
+    /// </summary>
+    public static readonly CVarDef<float> EmergencyShuttleAuthorizeTime =
+        CVarDef.Create("shuttle.emergency_authorize_time", 10f, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     The minimum time for the emergency shuttle to arrive at centcomm.
+    ///     Actual minimum travel time cannot be less than <see cref="ShuttleSystem.DefaultArrivalTime"/>
+    /// </summary>
+    public static readonly CVarDef<float> EmergencyShuttleMinTransitTime =
+        CVarDef.Create("shuttle.emergency_transit_time_min", 60f, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     The maximum time for the emergency shuttle to arrive at centcomm.
+    /// </summary>
+    public static readonly CVarDef<float> EmergencyShuttleMaxTransitTime =
+        CVarDef.Create("shuttle.emergency_transit_time_max", 180f, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Whether the emergency shuttle is enabled or should the round just end.
+    /// </summary>
+    public static readonly CVarDef<bool> EmergencyShuttleEnabled =
+        CVarDef.Create("shuttle.emergency", true, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     The percentage of time passed from the initial call to when the shuttle can no longer be recalled.
+    ///     ex. a call time of 10min and turning point of 0.5 means the shuttle cannot be recalled after 5 minutes.
+    /// </summary>
+    public static readonly CVarDef<float> EmergencyRecallTurningPoint =
+        CVarDef.Create("shuttle.recall_turning_point", 0.5f, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Time in minutes after round start to auto-call the shuttle. Set to zero to disable.
+    /// </summary>
+    public static readonly CVarDef<int> EmergencyShuttleAutoCallTime =
+        CVarDef.Create("shuttle.auto_call_time", 90, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Time in minutes after the round was extended (by recalling the shuttle) to call
+    ///     the shuttle again.
+    /// </summary>
+    public static readonly CVarDef<int> EmergencyShuttleAutoCallExtensionTime =
+        CVarDef.Create("shuttle.auto_call_extension_time", 45, CVar.SERVERONLY);
+}
diff --git a/Content.Shared/CCVar/CCVars.Sounds.cs b/Content.Shared/CCVar/CCVars.Sounds.cs
new file mode 100644
index 00000000000..73d9d3852f1
--- /dev/null
+++ b/Content.Shared/CCVar/CCVars.Sounds.cs
@@ -0,0 +1,34 @@
+using Robust.Shared.Configuration;
+
+namespace Content.Shared.CCVar;
+
+public sealed partial class CCVars
+{
+    public static readonly CVarDef<bool> LobbyMusicEnabled =
+        CVarDef.Create("ambience.lobby_music_enabled", true, CVar.ARCHIVE | CVar.CLIENTONLY);
+
+    public static readonly CVarDef<bool> EventMusicEnabled =
+        CVarDef.Create("ambience.event_music_enabled", true, CVar.ARCHIVE | CVar.CLIENTONLY);
+
+    /// <summary>
+    ///     Round end sound (APC Destroyed)
+    /// </summary>
+    public static readonly CVarDef<bool> RestartSoundsEnabled =
+        CVarDef.Create("ambience.restart_sounds_enabled", true, CVar.ARCHIVE | CVar.CLIENTONLY);
+
+
+
+    public static readonly CVarDef<bool> AdminSoundsEnabled =
+        CVarDef.Create("audio.admin_sounds_enabled", true, CVar.ARCHIVE | CVar.CLIENTONLY);
+
+    public static readonly CVarDef<string> AdminChatSoundPath =
+        CVarDef.Create("audio.admin_chat_sound_path",
+            "/Audio/Items/pop.ogg",
+            CVar.ARCHIVE | CVar.CLIENT | CVar.REPLICATED);
+
+    public static readonly CVarDef<float> AdminChatSoundVolume =
+        CVarDef.Create("audio.admin_chat_sound_volume", -5f, CVar.ARCHIVE | CVar.CLIENT | CVar.REPLICATED);
+
+    public static readonly CVarDef<string> AHelpSound =
+        CVarDef.Create("audio.ahelp_sound", "/Audio/Effects/adminhelp.ogg", CVar.ARCHIVE | CVar.CLIENTONLY);
+}
diff --git a/Content.Shared/CCVar/CCVars.Status.cs b/Content.Shared/CCVar/CCVars.Status.cs
new file mode 100644
index 00000000000..007f678106a
--- /dev/null
+++ b/Content.Shared/CCVar/CCVars.Status.cs
@@ -0,0 +1,13 @@
+using Robust.Shared.Configuration;
+
+namespace Content.Shared.CCVar;
+
+public sealed partial class CCVars
+{
+    public static readonly CVarDef<string> StatusMoMMIUrl =
+        CVarDef.Create("status.mommiurl", "", CVar.SERVERONLY);
+
+    public static readonly CVarDef<string> StatusMoMMIPassword =
+        CVarDef.Create("status.mommipassword", "", CVar.SERVERONLY | CVar.CONFIDENTIAL);
+
+}
diff --git a/Content.Shared/CCVar/CCVars.Tips.cs b/Content.Shared/CCVar/CCVars.Tips.cs
new file mode 100644
index 00000000000..61e6342061f
--- /dev/null
+++ b/Content.Shared/CCVar/CCVars.Tips.cs
@@ -0,0 +1,40 @@
+using Robust.Shared.Configuration;
+
+namespace Content.Shared.CCVar;
+
+public sealed partial class CCVars
+{
+    /// <summary>
+    ///     Whether tips being shown is enabled at all.
+    /// </summary>
+    public static readonly CVarDef<bool> TipsEnabled =
+        CVarDef.Create("tips.enabled", true);
+
+    /// <summary>
+    ///     The dataset prototype to use when selecting a random tip.
+    /// </summary>
+    public static readonly CVarDef<string> TipsDataset =
+        CVarDef.Create("tips.dataset", "Tips");
+
+    /// <summary>
+    ///     The number of seconds between each tip being displayed when the round is not actively going
+    ///     (i.e. postround or lobby)
+    /// </summary>
+    public static readonly CVarDef<float> TipFrequencyOutOfRound =
+        CVarDef.Create("tips.out_of_game_frequency", 60f * 1.5f);
+
+    /// <summary>
+    ///     The number of seconds between each tip being displayed when the round is actively going
+    /// </summary>
+    public static readonly CVarDef<float> TipFrequencyInRound =
+        CVarDef.Create("tips.in_game_frequency", 60f * 60);
+
+    public static readonly CVarDef<string> LoginTipsDataset =
+        CVarDef.Create("tips.login_dataset", "Tips");
+
+    /// <summary>
+    ///     The chance for Tippy to replace a normal tip message.
+    /// </summary>
+    public static readonly CVarDef<float> TipsTippyChance =
+        CVarDef.Create("tips.tippy_chance", 0.01f);
+}
diff --git a/Content.Shared/CCVar/CCVars.Viewport.cs b/Content.Shared/CCVar/CCVars.Viewport.cs
new file mode 100644
index 00000000000..d94394d2a75
--- /dev/null
+++ b/Content.Shared/CCVar/CCVars.Viewport.cs
@@ -0,0 +1,33 @@
+using Robust.Shared.Configuration;
+
+namespace Content.Shared.CCVar;
+
+public sealed partial class CCVars
+{
+    public static readonly CVarDef<bool> ViewportStretch =
+        CVarDef.Create("viewport.stretch", true, CVar.CLIENTONLY | CVar.ARCHIVE);
+
+    public static readonly CVarDef<int> ViewportFixedScaleFactor =
+        CVarDef.Create("viewport.fixed_scale_factor", 2, CVar.CLIENTONLY | CVar.ARCHIVE);
+
+    public static readonly CVarDef<int> ViewportSnapToleranceMargin =
+        CVarDef.Create("viewport.snap_tolerance_margin", 64, CVar.CLIENTONLY | CVar.ARCHIVE);
+
+    public static readonly CVarDef<int> ViewportSnapToleranceClip =
+        CVarDef.Create("viewport.snap_tolerance_clip", 32, CVar.CLIENTONLY | CVar.ARCHIVE);
+
+    public static readonly CVarDef<bool> ViewportScaleRender =
+        CVarDef.Create("viewport.scale_render", true, CVar.CLIENTONLY | CVar.ARCHIVE);
+
+    public static readonly CVarDef<int> ViewportMinimumWidth =
+        CVarDef.Create("viewport.minimum_width", 15, CVar.REPLICATED | CVar.SERVER);
+
+    public static readonly CVarDef<int> ViewportMaximumWidth =
+        CVarDef.Create("viewport.maximum_width", 21, CVar.REPLICATED | CVar.SERVER);
+
+    public static readonly CVarDef<int> ViewportWidth =
+        CVarDef.Create("viewport.width", 21, CVar.CLIENTONLY | CVar.ARCHIVE);
+
+    public static readonly CVarDef<bool> ViewportVerticalFit =
+        CVarDef.Create("viewport.vertical_fit", true, CVar.CLIENTONLY | CVar.ARCHIVE);
+}
diff --git a/Content.Shared/CCVar/CCVars.Vote.cs b/Content.Shared/CCVar/CCVars.Vote.cs
new file mode 100644
index 00000000000..ee9fee7d3db
--- /dev/null
+++ b/Content.Shared/CCVar/CCVars.Vote.cs
@@ -0,0 +1,180 @@
+using Robust.Shared.Configuration;
+
+namespace Content.Shared.CCVar;
+
+public sealed partial class CCVars
+{
+    /// <summary>
+    ///     Allows enabling/disabling player-started votes for ultimate authority
+    /// </summary>
+    public static readonly CVarDef<bool> VoteEnabled =
+        CVarDef.Create("vote.enabled", true, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     See vote.enabled, but specific to restart votes
+    /// </summary>
+    public static readonly CVarDef<bool> VoteRestartEnabled =
+        CVarDef.Create("vote.restart_enabled", true, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Config for when the restart vote should be allowed to be called regardless with less than this amount of players.
+    /// </summary>
+    public static readonly CVarDef<int> VoteRestartMaxPlayers =
+        CVarDef.Create("vote.restart_max_players", 20, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Config for when the restart vote should be allowed to be called based on percentage of ghosts.
+    /// </summary>
+    public static readonly CVarDef<int> VoteRestartGhostPercentage =
+        CVarDef.Create("vote.restart_ghost_percentage", 55, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     See vote.enabled, but specific to preset votes
+    /// </summary>
+    public static readonly CVarDef<bool> VotePresetEnabled =
+        CVarDef.Create("vote.preset_enabled", true, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     See vote.enabled, but specific to map votes
+    /// </summary>
+    public static readonly CVarDef<bool> VoteMapEnabled =
+        CVarDef.Create("vote.map_enabled", false, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     The required ratio of the server that must agree for a restart round vote to go through.
+    /// </summary>
+    public static readonly CVarDef<float> VoteRestartRequiredRatio =
+        CVarDef.Create("vote.restart_required_ratio", 0.85f, CVar.SERVERONLY);
+
+    /// <summary>
+    /// Whether or not to prevent the restart vote from having any effect when there is an online admin
+    /// </summary>
+    public static readonly CVarDef<bool> VoteRestartNotAllowedWhenAdminOnline =
+        CVarDef.Create("vote.restart_not_allowed_when_admin_online", true, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     The delay which two votes of the same type are allowed to be made by separate people, in seconds.
+    /// </summary>
+    public static readonly CVarDef<float> VoteSameTypeTimeout =
+        CVarDef.Create("vote.same_type_timeout", 240f, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Sets the duration of the map vote timer.
+    /// </summary>
+    public static readonly CVarDef<int>
+        VoteTimerMap = CVarDef.Create("vote.timermap", 90, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Sets the duration of the restart vote timer.
+    /// </summary>
+    public static readonly CVarDef<int>
+        VoteTimerRestart = CVarDef.Create("vote.timerrestart", 60, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Sets the duration of the gamemode/preset vote timer.
+    /// </summary>
+    public static readonly CVarDef<int>
+        VoteTimerPreset = CVarDef.Create("vote.timerpreset", 30, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Sets the duration of the map vote timer when ALONE.
+    /// </summary>
+    public static readonly CVarDef<int>
+        VoteTimerAlone = CVarDef.Create("vote.timeralone", 10, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Allows enabling/disabling player-started votekick for ultimate authority
+    /// </summary>
+    public static readonly CVarDef<bool> VotekickEnabled =
+        CVarDef.Create("votekick.enabled", true, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Config for when the votekick should be allowed to be called based on number of eligible voters.
+    /// </summary>
+    public static readonly CVarDef<int> VotekickEligibleNumberRequirement =
+        CVarDef.Create("votekick.eligible_number", 5, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Whether a votekick initiator must be a ghost or not.
+    /// </summary>
+    public static readonly CVarDef<bool> VotekickInitiatorGhostRequirement =
+        CVarDef.Create("votekick.initiator_ghost_requirement", true, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Should the initiator be whitelisted to initiate a votekick?
+    /// </summary>
+    public static readonly CVarDef<bool> VotekickInitiatorWhitelistedRequirement =
+        CVarDef.Create("votekick.initiator_whitelist_requirement", true, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Should the initiator be able to start a votekick if they are bellow the votekick.voter_playtime requirement?
+    /// </summary>
+    public static readonly CVarDef<bool> VotekickInitiatorTimeRequirement =
+        CVarDef.Create("votekick.initiator_time_requirement", false, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Whether a votekick voter must be a ghost or not.
+    /// </summary>
+    public static readonly CVarDef<bool> VotekickVoterGhostRequirement =
+        CVarDef.Create("votekick.voter_ghost_requirement", true, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Config for how many hours playtime a player must have to be able to vote on a votekick.
+    /// </summary>
+    public static readonly CVarDef<int> VotekickEligibleVoterPlaytime =
+        CVarDef.Create("votekick.voter_playtime", 100, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Config for how many seconds a player must have been dead to initiate a votekick / be able to vote on a votekick.
+    /// </summary>
+    public static readonly CVarDef<int> VotekickEligibleVoterDeathtime =
+        CVarDef.Create("votekick.voter_deathtime", 30, CVar.REPLICATED | CVar.SERVER);
+
+    /// <summary>
+    ///     The required ratio of eligible voters that must agree for a votekick to go through.
+    /// </summary>
+    public static readonly CVarDef<float> VotekickRequiredRatio =
+        CVarDef.Create("votekick.required_ratio", 0.6f, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Whether or not to prevent the votekick from having any effect when there is an online admin.
+    /// </summary>
+    public static readonly CVarDef<bool> VotekickNotAllowedWhenAdminOnline =
+        CVarDef.Create("votekick.not_allowed_when_admin_online", true, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     The delay for which two votekicks are allowed to be made by separate people, in seconds.
+    /// </summary>
+    public static readonly CVarDef<float> VotekickTimeout =
+        CVarDef.Create("votekick.timeout", 120f, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Sets the duration of the votekick vote timer.
+    /// </summary>
+    public static readonly CVarDef<int>
+        VotekickTimer = CVarDef.Create("votekick.timer", 60, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Config for how many hours playtime a player must have to get protection from the Raider votekick type when playing as an antag.
+    /// </summary>
+    public static readonly CVarDef<int> VotekickAntagRaiderProtection =
+        CVarDef.Create("votekick.antag_raider_protection", 10, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Default severity for votekick bans
+    /// </summary>
+    public static readonly CVarDef<string> VotekickBanDefaultSeverity =
+        CVarDef.Create("votekick.ban_default_severity", "High", CVar.ARCHIVE | CVar.SERVER | CVar.REPLICATED);
+
+    /// <summary>
+    ///     Duration of a ban caused by a votekick (in minutes).
+    /// </summary>
+    public static readonly CVarDef<int> VotekickBanDuration =
+        CVarDef.Create("votekick.ban_duration", 180, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Whether the ghost requirement settings for votekicks should be ignored for the lobby.
+    /// </summary>
+    public static readonly CVarDef<bool> VotekickIgnoreGhostReqInLobby =
+        CVarDef.Create("votekick.ignore_ghost_req_in_lobby", true, CVar.SERVERONLY);
+}
diff --git a/Content.Shared/CCVar/CCVars.Whitelist.cs b/Content.Shared/CCVar/CCVars.Whitelist.cs
new file mode 100644
index 00000000000..7a7a5206a11
--- /dev/null
+++ b/Content.Shared/CCVar/CCVars.Whitelist.cs
@@ -0,0 +1,19 @@
+using Robust.Shared.Configuration;
+
+namespace Content.Shared.CCVar;
+
+public sealed partial class CCVars
+{
+    /// <summary>
+    ///     Controls whether the server will deny any players that are not whitelisted in the DB.
+    /// </summary>
+    public static readonly CVarDef<bool> WhitelistEnabled =
+        CVarDef.Create("whitelist.enabled", false, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Specifies the whitelist prototypes to be used by the server. This should be a comma-separated list of prototypes.
+    ///     If a whitelists conditions to be active fail (for example player count), the next whitelist will be used instead. If no whitelist is valid, the player will be allowed to connect.
+    /// </summary>
+    public static readonly CVarDef<string> WhitelistPrototypeList =
+        CVarDef.Create("whitelist.prototype_list", "basicWhitelist", CVar.SERVERONLY);
+}
diff --git a/Content.Shared/CCVar/CCVars.Worldgen.cs b/Content.Shared/CCVar/CCVars.Worldgen.cs
new file mode 100644
index 00000000000..da165ce74a7
--- /dev/null
+++ b/Content.Shared/CCVar/CCVars.Worldgen.cs
@@ -0,0 +1,18 @@
+using Robust.Shared.Configuration;
+
+namespace Content.Shared.CCVar;
+
+public sealed partial class CCVars
+{
+    /// <summary>
+    ///     Whether or not world generation is enabled.
+    /// </summary>
+    public static readonly CVarDef<bool> WorldgenEnabled =
+        CVarDef.Create("worldgen.enabled", false, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     The worldgen config to use.
+    /// </summary>
+    public static readonly CVarDef<string> WorldgenConfig =
+        CVarDef.Create("worldgen.worldgen_config", "Default", CVar.SERVERONLY);
+}
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index c63fac2c474..316d9b8690a 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -1,2413 +1,28 @@
-using Content.Shared.Maps;
-using Content.Shared.Roles;
 using Robust.Shared;
 using Robust.Shared.Configuration;
-using Robust.Shared.Physics.Components;
 
-namespace Content.Shared.CCVar
-{
-    // ReSharper disable once InconsistentNaming
-    [CVarDefs]
-    public sealed class CCVars : CVars
-    {
-        /*
-         * Server
-         */
-
-        /// <summary>
-        ///     Change this to have the changelog and rules "last seen" date stored separately.
-        /// </summary>
-        public static readonly CVarDef<string> ServerId =
-            CVarDef.Create("server.id", "unknown_server_id", CVar.REPLICATED | CVar.SERVER);
-
-        /// <summary>
-        ///     Guide Entry Prototype ID to be displayed as the server rules.
-        /// </summary>
-        public static readonly CVarDef<string> RulesFile =
-            CVarDef.Create("server.rules_file", "DefaultRuleset", CVar.REPLICATED | CVar.SERVER);
-
-        /// <summary>
-        ///     Guide entry that is displayed by default when a guide is opened.
-        /// </summary>
-        public static readonly CVarDef<string> DefaultGuide =
-            CVarDef.Create("server.default_guide", "NewPlayer", CVar.REPLICATED | CVar.SERVER);
-
-        /// <summary>
-        /// If greater than 0, automatically restart the server after this many minutes of uptime.
-        /// </summary>
-        /// <remarks>
-        /// <para>
-        /// This is intended to work around various bugs and performance issues caused by long continuous server uptime.
-        /// </para>
-        /// <para>
-        /// This uses the same non-disruptive logic as update restarts,
-        /// i.e. the game will only restart at round end or when there is nobody connected.
-        /// </para>
-        /// </remarks>
-        public static readonly CVarDef<int> ServerUptimeRestartMinutes =
-            CVarDef.Create("server.uptime_restart_minutes", 0, CVar.SERVERONLY);
-
-        /*
-         * Ambience
-         */
-
-        /// <summary>
-        /// How long we'll wait until re-sampling nearby objects for ambience. Should be pretty fast, but doesn't have to match the tick rate.
-        /// </summary>
-        public static readonly CVarDef<float> AmbientCooldown =
-            CVarDef.Create("ambience.cooldown", 0.1f, CVar.ARCHIVE | CVar.CLIENTONLY);
-
-        /// <summary>
-        /// How large of a range to sample for ambience.
-        /// </summary>
-        public static readonly CVarDef<float> AmbientRange =
-            CVarDef.Create("ambience.range", 8f, CVar.REPLICATED | CVar.SERVER);
-
-        /// <summary>
-        /// Maximum simultaneous ambient sounds.
-        /// </summary>
-        public static readonly CVarDef<int> MaxAmbientSources =
-            CVarDef.Create("ambience.max_sounds", 16, CVar.ARCHIVE | CVar.CLIENTONLY);
-
-        /// <summary>
-        /// The minimum value the user can set for ambience.max_sounds
-        /// </summary>
-        public static readonly CVarDef<int> MinMaxAmbientSourcesConfigured =
-            CVarDef.Create("ambience.min_max_sounds_configured", 16, CVar.REPLICATED | CVar.SERVER | CVar.CHEAT);
-
-        /// <summary>
-        /// The maximum value the user can set for ambience.max_sounds
-        /// </summary>
-        public static readonly CVarDef<int> MaxMaxAmbientSourcesConfigured =
-            CVarDef.Create("ambience.max_max_sounds_configured", 64, CVar.REPLICATED | CVar.SERVER | CVar.CHEAT);
-
-        /// <summary>
-        /// Ambience volume.
-        /// </summary>
-        public static readonly CVarDef<float> AmbienceVolume =
-            CVarDef.Create("ambience.volume", 1.5f, CVar.ARCHIVE | CVar.CLIENTONLY);
-
-        /// <summary>
-        /// Ambience music volume.
-        /// </summary>
-        public static readonly CVarDef<float> AmbientMusicVolume =
-            CVarDef.Create("ambience.music_volume", 1.5f, CVar.ARCHIVE | CVar.CLIENTONLY);
-
-        /// <summary>
-        /// Lobby / round end music volume.
-        /// </summary>
-        public static readonly CVarDef<float> LobbyMusicVolume =
-            CVarDef.Create("ambience.lobby_music_volume", 0.50f, CVar.ARCHIVE | CVar.CLIENTONLY);
-
-        /// <summary>
-        /// UI volume.
-        /// </summary>
-        public static readonly CVarDef<float> InterfaceVolume =
-            CVarDef.Create("audio.interface_volume", 0.50f, CVar.ARCHIVE | CVar.CLIENTONLY);
-
-        /*
-         * Status
-         */
-
-        public static readonly CVarDef<string> StatusMoMMIUrl =
-            CVarDef.Create("status.mommiurl", "", CVar.SERVERONLY);
-
-        public static readonly CVarDef<string> StatusMoMMIPassword =
-            CVarDef.Create("status.mommipassword", "", CVar.SERVERONLY | CVar.CONFIDENTIAL);
-
-        /*
-         * Events
-         */
-
-        /// <summary>
-        ///     Controls if the game should run station events
-        /// </summary>
-        public static readonly CVarDef<bool>
-            EventsEnabled = CVarDef.Create("events.enabled", true, CVar.ARCHIVE | CVar.SERVERONLY);
-
-        /*
-         * Game
-         */
-
-        /// <summary>
-        ///     Disables most functionality in the GameTicker.
-        /// </summary>
-        public static readonly CVarDef<bool>
-            GameDummyTicker = CVarDef.Create("game.dummyticker", false, CVar.ARCHIVE | CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Controls if the lobby is enabled. If it is not, and there are no available jobs, you may get stuck on a black screen.
-        /// </summary>
-        public static readonly CVarDef<bool>
-            GameLobbyEnabled = CVarDef.Create("game.lobbyenabled", true, CVar.ARCHIVE);
-
-        /// <summary>
-        ///     Controls the duration of the lobby timer in seconds. Defaults to 2 minutes and 30 seconds.
-        /// </summary>
-        public static readonly CVarDef<int>
-            GameLobbyDuration = CVarDef.Create("game.lobbyduration", 150, CVar.ARCHIVE);
-
-        /// <summary>
-        ///     Controls if players can latejoin at all.
-        /// </summary>
-        public static readonly CVarDef<bool>
-            GameDisallowLateJoins = CVarDef.Create("game.disallowlatejoins", false, CVar.ARCHIVE | CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Controls the default game preset.
-        /// </summary>
-        public static readonly CVarDef<string>
-            GameLobbyDefaultPreset = CVarDef.Create("game.defaultpreset", "secret", CVar.ARCHIVE);
-
-        /// <summary>
-        ///     Controls if the game can force a different preset if the current preset's criteria are not met.
-        /// </summary>
-        public static readonly CVarDef<bool>
-            GameLobbyFallbackEnabled = CVarDef.Create("game.fallbackenabled", true, CVar.ARCHIVE);
-
-        /// <summary>
-        ///     The preset for the game to fall back to if the selected preset could not be used, and fallback is enabled.
-        /// </summary>
-        public static readonly CVarDef<string>
-            GameLobbyFallbackPreset = CVarDef.Create("game.fallbackpreset", "Traitor,Extended", CVar.ARCHIVE);
-
-        /// <summary>
-        ///     Controls if people can win the game in Suspicion or Deathmatch.
-        /// </summary>
-        public static readonly CVarDef<bool>
-            GameLobbyEnableWin = CVarDef.Create("game.enablewin", true, CVar.ARCHIVE);
-
-        /// <summary>
-        ///     Controls the maximum number of character slots a player is allowed to have.
-        /// </summary>
-        public static readonly CVarDef<int>
-            GameMaxCharacterSlots = CVarDef.Create("game.maxcharacterslots", 30, CVar.ARCHIVE | CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Controls the game map prototype to load. SS14 stores these prototypes in Prototypes/Maps.
-        /// </summary>
-        public static readonly CVarDef<string>
-            GameMap = CVarDef.Create("game.map", string.Empty, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Controls whether to use world persistence or not.
-        /// </summary>
-        public static readonly CVarDef<bool>
-            UsePersistence = CVarDef.Create("game.usepersistence", false, CVar.ARCHIVE);
-
-        /// <summary>
-        ///     If world persistence is used, what map prototype should be initially loaded.
-        ///     If the save file exists, it replaces MapPath but everything else stays the same (station name and such).
-        /// </summary>
-        public static readonly CVarDef<string>
-            PersistenceMap = CVarDef.Create("game.persistencemap", "Empty", CVar.ARCHIVE);
-
-        /// <summary>
-        ///     Prototype to use for map pool.
-        /// </summary>
-        public static readonly CVarDef<string>
-            GameMapPool = CVarDef.Create("game.map_pool", "DefaultMapPool", CVar.SERVERONLY);
-
-        /// <summary>
-        /// The depth of the queue used to calculate which map is next in rotation.
-        /// This is how long the game "remembers" that some map was put in play. Default is 16 rounds.
-        /// </summary>
-        public static readonly CVarDef<int>
-            GameMapMemoryDepth = CVarDef.Create("game.map_memory_depth", 16, CVar.SERVERONLY);
-
-        /// <summary>
-        /// Is map rotation enabled?
-        /// </summary>
-        public static readonly CVarDef<bool>
-            GameMapRotation = CVarDef.Create("game.map_rotation", true, CVar.SERVERONLY);
-
-        /// <summary>
-        /// If roles should be restricted based on time.
-        /// </summary>
-        public static readonly CVarDef<bool>
-            GameRoleTimers = CVarDef.Create("game.role_timers", true, CVar.SERVER | CVar.REPLICATED);
-
-        /// <summary>
-        /// Override default role requirements using a <see cref="JobRequirementOverridePrototype"/>
-        /// </summary>
-        public static readonly CVarDef<string>
-            GameRoleTimerOverride = CVarDef.Create("game.role_timer_override", "", CVar.SERVER | CVar.REPLICATED);
-
-        /// <summary>
-        /// If roles should be restricted based on whether or not they are whitelisted.
-        /// </summary>
-        public static readonly CVarDef<bool>
-            GameRoleWhitelist = CVarDef.Create("game.role_whitelist", true, CVar.SERVER | CVar.REPLICATED);
-
-        /// <summary>
-        /// Whether or not disconnecting inside of a cryopod should remove the character or just store them until they reconnect.
-        /// </summary>
-        public static readonly CVarDef<bool>
-            GameCryoSleepRejoining = CVarDef.Create("game.cryo_sleep_rejoining", false, CVar.SERVER | CVar.REPLICATED);
-
-        /// <summary>
-        ///     When enabled, guests will be assigned permanent UIDs and will have their preferences stored.
-        /// </summary>
-        public static readonly CVarDef<bool> GamePersistGuests =
-            CVarDef.Create("game.persistguests", true, CVar.ARCHIVE | CVar.SERVERONLY);
-
-        public static readonly CVarDef<bool> GameDiagonalMovement =
-            CVarDef.Create("game.diagonalmovement", true, CVar.ARCHIVE);
-
-        public static readonly CVarDef<int> SoftMaxPlayers =
-            CVarDef.Create("game.soft_max_players", 30, CVar.SERVERONLY | CVar.ARCHIVE);
-
-        /// <summary>
-        /// If a player gets denied connection to the server,
-        /// how long they are forced to wait before attempting to reconnect.
-        /// </summary>
-        public static readonly CVarDef<int> GameServerFullReconnectDelay =
-            CVarDef.Create("game.server_full_reconnect_delay", 30, CVar.SERVERONLY);
-
-        /// <summary>
-        /// Whether or not panic bunker is currently enabled.
-        /// </summary>
-        public static readonly CVarDef<bool> PanicBunkerEnabled =
-            CVarDef.Create("game.panic_bunker.enabled", false, CVar.NOTIFY | CVar.REPLICATED);
-
-        /// <summary>
-        /// Whether or not the panic bunker will disable when an admin comes online.
-        /// </summary>
-        public static readonly CVarDef<bool> PanicBunkerDisableWithAdmins =
-            CVarDef.Create("game.panic_bunker.disable_with_admins", false, CVar.SERVERONLY);
-
-        /// <summary>
-        /// Whether or not the panic bunker will enable when no admins are online.
-        /// </summary>
-        public static readonly CVarDef<bool> PanicBunkerEnableWithoutAdmins =
-            CVarDef.Create("game.panic_bunker.enable_without_admins", false, CVar.SERVERONLY);
-
-        /// <summary>
-        /// Whether or not the panic bunker will count deadminned admins for
-        /// <see cref="PanicBunkerDisableWithAdmins"/> and
-        /// <see cref="PanicBunkerEnableWithoutAdmins"/>
-        /// </summary>
-        public static readonly CVarDef<bool> PanicBunkerCountDeadminnedAdmins =
-            CVarDef.Create("game.panic_bunker.count_deadminned_admins", false, CVar.SERVERONLY);
-
-        /// <summary>
-        /// Show reason of disconnect for user or not.
-        /// </summary>
-        public static readonly CVarDef<bool> PanicBunkerShowReason =
-            CVarDef.Create("game.panic_bunker.show_reason", false, CVar.SERVERONLY);
-
-        /// <summary>
-        /// Minimum age of the account (from server's PoV, so from first-seen date) in minutes.
-        /// </summary>
-        public static readonly CVarDef<int> PanicBunkerMinAccountAge =
-            CVarDef.Create("game.panic_bunker.min_account_age", 1440, CVar.SERVERONLY);
-
-        /// <summary>
-        /// Minimal overall played time.
-        /// </summary>
-        public static readonly CVarDef<int> PanicBunkerMinOverallMinutes =
-            CVarDef.Create("game.panic_bunker.min_overall_minutes", 600, CVar.SERVERONLY);
-
-        /// <summary>
-        /// A custom message that will be used for connections denied to the panic bunker
-        /// If not empty, then will overwrite <see cref="PanicBunkerShowReason"/>
-        /// </summary>
-        public static readonly CVarDef<string> PanicBunkerCustomReason =
-            CVarDef.Create("game.panic_bunker.custom_reason", string.Empty, CVar.SERVERONLY);
-
-        /// <summary>
-        /// Allow bypassing the panic bunker if the user is whitelisted.
-        /// </summary>
-        public static readonly CVarDef<bool> BypassBunkerWhitelist =
-            CVarDef.Create("game.panic_bunker.whitelisted_can_bypass", true, CVar.SERVERONLY);
-
-        /*
-         * TODO: Remove baby jail code once a more mature gateway process is established. This code is only being issued as a stopgap to help with potential tiding in the immediate future.
-         */
-
-        /// <summary>
-        /// Whether the baby jail is currently enabled.
-        /// </summary>
-        public static readonly CVarDef<bool> BabyJailEnabled  =
-            CVarDef.Create("game.baby_jail.enabled", false, CVar.NOTIFY | CVar.REPLICATED | CVar.SERVER);
-
-        /// <summary>
-        /// Show reason of disconnect for user or not.
-        /// </summary>
-        public static readonly CVarDef<bool> BabyJailShowReason =
-            CVarDef.Create("game.baby_jail.show_reason", false, CVar.SERVERONLY);
-
-        /// <summary>
-        /// Maximum age of the account (from server's PoV, so from first-seen date) in minutes that can access baby
-        /// jailed servers.
-        /// </summary>
-        public static readonly CVarDef<int> BabyJailMaxAccountAge =
-            CVarDef.Create("game.baby_jail.max_account_age", 1440, CVar.SERVERONLY);
-
-        /// <summary>
-        /// Maximum overall played time allowed to access baby jailed servers.
-        /// </summary>
-        public static readonly CVarDef<int> BabyJailMaxOverallMinutes =
-            CVarDef.Create("game.baby_jail.max_overall_minutes", 120, CVar.SERVERONLY);
-
-        /// <summary>
-        /// A custom message that will be used for connections denied due to the baby jail.
-        /// If not empty, then will overwrite <see cref="BabyJailShowReason"/>
-        /// </summary>
-        public static readonly CVarDef<string> BabyJailCustomReason =
-            CVarDef.Create("game.baby_jail.custom_reason", string.Empty, CVar.SERVERONLY);
-
-        /// <summary>
-        /// Allow bypassing the baby jail if the user is whitelisted.
-        /// </summary>
-        public static readonly CVarDef<bool> BypassBabyJailWhitelist =
-            CVarDef.Create("game.baby_jail.whitelisted_can_bypass", true, CVar.SERVERONLY);
-
-        /// <summary>
-        /// Make people bonk when trying to climb certain objects like tables.
-        /// </summary>
-        public static readonly CVarDef<bool> GameTableBonk =
-            CVarDef.Create("game.table_bonk", false, CVar.REPLICATED);
-
-        /// <summary>
-        /// Whether or not status icons are rendered for everyone.
-        /// </summary>
-        public static readonly CVarDef<bool> GlobalStatusIconsEnabled =
-            CVarDef.Create("game.global_status_icons_enabled", true, CVar.SERVER | CVar.REPLICATED);
-
-        /// <summary>
-        /// Whether or not status icons are rendered on this specific client.
-        /// </summary>
-        public static readonly CVarDef<bool> LocalStatusIconsEnabled =
-            CVarDef.Create("game.local_status_icons_enabled", true, CVar.CLIENTONLY);
-
-        /// <summary>
-        /// Whether or not coordinates on the Debug overlay should only be available to admins.
-        /// </summary>
-        public static readonly CVarDef<bool> DebugCoordinatesAdminOnly =
-            CVarDef.Create("game.debug_coordinates_admin_only", true, CVar.SERVER | CVar.REPLICATED);
-
-#if EXCEPTION_TOLERANCE
-        /// <summary>
-        ///     Amount of times round start must fail before the server is shut down.
-        ///     Set to 0 or a negative number to disable.
-        /// </summary>
-        public static readonly CVarDef<int> RoundStartFailShutdownCount =
-            CVarDef.Create("game.round_start_fail_shutdown_count", 5, CVar.SERVERONLY | CVar.SERVER);
-#endif
-
-        /// <summary>
-        /// Delay between station alert level changes.
-        /// </summary>
-        public static readonly CVarDef<int> GameAlertLevelChangeDelay =
-            CVarDef.Create("game.alert_level_change_delay", 30, CVar.SERVERONLY);
-
-        /// <summary>
-        /// The time in seconds that the server should wait before restarting the round.
-        /// Defaults to 2 minutes.
-        /// </summary>
-        public static readonly CVarDef<float> RoundRestartTime =
-            CVarDef.Create("game.round_restart_time", 120f, CVar.SERVERONLY);
-
-        /// <summary>
-        /// The prototype to use for secret weights.
-        /// </summary>
-        public static readonly CVarDef<string> SecretWeightPrototype =
-            CVarDef.Create("game.secret_weight_prototype", "Secret", CVar.SERVERONLY);
-
-        /// <summary>
-        /// The id of the sound collection to randomly choose a sound from and play when the round ends.
-        /// </summary>
-        public static readonly CVarDef<string> RoundEndSoundCollection =
-            CVarDef.Create("game.round_end_sound_collection", "RoundEnd", CVar.SERVERONLY);
-
-        /// <summary>
-        /// Whether or not to add every player as a global override to PVS at round end.
-        /// This will allow all players to see their clothing in the round screen player list screen,
-        /// but may cause lag during round end with very high player counts.
-        /// </summary>
-        public static readonly CVarDef<bool> RoundEndPVSOverrides =
-            CVarDef.Create("game.round_end_pvs_overrides", true, CVar.SERVERONLY);
-
-        /// <summary>
-        /// If true, players can place objects onto tabletop games like chess boards.
-        /// </summary>
-        /// <remarks>
-        /// This feature is currently highly abusable and can easily be used to crash the server,
-        /// so it's off by default.
-        /// </remarks>
-        public static readonly CVarDef<bool> GameTabletopPlace =
-            CVarDef.Create("game.tabletop_place", false, CVar.SERVERONLY);
-
-        /// <summary>
-        /// If true, contraband severity can be viewed in the examine menu
-        /// </summary>
-        public static readonly CVarDef<bool> ContrabandExamine =
-            CVarDef.Create("game.contraband_examine", true, CVar.SERVER | CVar.REPLICATED);
-
-        /// <summary>
-        /// Size of the lookup area for adding entities to the context menu
-        /// </summary>
-        public static readonly CVarDef<float> GameEntityMenuLookup =
-            CVarDef.Create("game.entity_menu_lookup", 0.25f, CVar.CLIENTONLY | CVar.ARCHIVE);
-
-        /// <summary>
-        /// Should the clients window show the server hostname in the title?
-        /// </summary>
-        public static readonly CVarDef<bool> GameHostnameInTitlebar =
-            CVarDef.Create("game.hostname_in_titlebar", true, CVar.SERVER | CVar.REPLICATED);
-
-        /*
-         * Discord
-         */
-
-        /// <summary>
-        /// The role that will get mentioned if a new SOS ahelp comes in.
-        /// </summary>
-        public static readonly CVarDef<string> DiscordAhelpMention =
-        CVarDef.Create("discord.on_call_ping", string.Empty, CVar.SERVERONLY | CVar.CONFIDENTIAL);
-
-        /// <summary>
-        /// URL of the discord webhook to relay unanswered ahelp messages.
-        /// </summary>
-        public static readonly CVarDef<string> DiscordOnCallWebhook =
-            CVarDef.Create("discord.on_call_webhook", string.Empty, CVar.SERVERONLY | CVar.CONFIDENTIAL);
-
-        /// <summary>
-        /// URL of the Discord webhook which will relay all ahelp messages.
-        /// </summary>
-        public static readonly CVarDef<string> DiscordAHelpWebhook =
-            CVarDef.Create("discord.ahelp_webhook", string.Empty, CVar.SERVERONLY | CVar.CONFIDENTIAL);
-
-        /// <summary>
-        /// The server icon to use in the Discord ahelp embed footer.
-        /// Valid values are specified at https://discord.com/developers/docs/resources/channel#embed-object-embed-footer-structure.
-        /// </summary>
-        public static readonly CVarDef<string> DiscordAHelpFooterIcon =
-            CVarDef.Create("discord.ahelp_footer_icon", string.Empty, CVar.SERVERONLY);
-
-        /// <summary>
-        /// The avatar to use for the webhook. Should be an URL.
-        /// </summary>
-        public static readonly CVarDef<string> DiscordAHelpAvatar =
-            CVarDef.Create("discord.ahelp_avatar", string.Empty, CVar.SERVERONLY);
-
-        /// <summary>
-        /// URL of the Discord webhook which will relay all custom votes. If left empty, disables the webhook.
-        /// </summary>
-        public static readonly CVarDef<string> DiscordVoteWebhook =
-            CVarDef.Create("discord.vote_webhook", string.Empty, CVar.SERVERONLY);
-
-        /// <summary>
-        /// URL of the Discord webhook which will relay all votekick votes. If left empty, disables the webhook.
-        /// </summary>
-        public static readonly CVarDef<string> DiscordVotekickWebhook =
-            CVarDef.Create("discord.votekick_webhook", string.Empty, CVar.SERVERONLY);
-
-        /// URL of the Discord webhook which will relay round restart messages.
-        /// </summary>
-        public static readonly CVarDef<string> DiscordRoundUpdateWebhook =
-            CVarDef.Create("discord.round_update_webhook", string.Empty, CVar.SERVERONLY | CVar.CONFIDENTIAL);
-
-        /// <summary>
-        /// Role id for the Discord webhook to ping when the round ends.
-        /// </summary>
-        public static readonly CVarDef<string> DiscordRoundEndRoleWebhook =
-            CVarDef.Create("discord.round_end_role", string.Empty, CVar.SERVERONLY);
-
-        /*
-         * Tips
-         */
-
-        /// <summary>
-        ///     Whether tips being shown is enabled at all.
-        /// </summary>
-        public static readonly CVarDef<bool> TipsEnabled =
-            CVarDef.Create("tips.enabled", true);
-
-        /// <summary>
-        ///     The dataset prototype to use when selecting a random tip.
-        /// </summary>
-        public static readonly CVarDef<string> TipsDataset =
-            CVarDef.Create("tips.dataset", "Tips");
-
-        /// <summary>
-        ///     The number of seconds between each tip being displayed when the round is not actively going
-        ///     (i.e. postround or lobby)
-        /// </summary>
-        public static readonly CVarDef<float> TipFrequencyOutOfRound =
-            CVarDef.Create("tips.out_of_game_frequency", 60f * 1.5f);
-
-        /// <summary>
-        ///     The number of seconds between each tip being displayed when the round is actively going
-        /// </summary>
-        public static readonly CVarDef<float> TipFrequencyInRound =
-            CVarDef.Create("tips.in_game_frequency", 60f * 60);
-
-        public static readonly CVarDef<string> LoginTipsDataset =
-            CVarDef.Create("tips.login_dataset", "Tips");
-
-        /// <summary>
-        ///     The chance for Tippy to replace a normal tip message.
-        /// </summary>
-        public static readonly CVarDef<float> TipsTippyChance =
-            CVarDef.Create("tips.tippy_chance", 0.01f);
-
-        /*
-         * Console
-         */
-
-        public static readonly CVarDef<bool> ConsoleLoginLocal =
-            CVarDef.Create("console.loginlocal", true, CVar.ARCHIVE | CVar.SERVERONLY);
-
-        /// <summary>
-        /// Automatically log in the given user as host, equivalent to the <c>promotehost</c> command.
-        /// </summary>
-        public static readonly CVarDef<string> ConsoleLoginHostUser =
-            CVarDef.Create("console.login_host_user", "", CVar.ARCHIVE | CVar.SERVERONLY);
-
-
-        /*
-         * Database stuff
-         */
-
-        public static readonly CVarDef<string> DatabaseEngine =
-            CVarDef.Create("database.engine", "sqlite", CVar.SERVERONLY);
-
-        public static readonly CVarDef<string> DatabaseSqliteDbPath =
-            CVarDef.Create("database.sqlite_dbpath", "preferences.db", CVar.SERVERONLY);
-
-        /// <summary>
-        /// Milliseconds to asynchronously delay all SQLite database acquisitions with.
-        /// </summary>
-        /// <remarks>
-        /// Defaults to 1 on DEBUG, 0 on RELEASE.
-        /// This is intended to help catch .Result deadlock bugs that only happen on postgres
-        /// (because SQLite is not actually asynchronous normally)
-        /// </remarks>
-        public static readonly CVarDef<int> DatabaseSqliteDelay =
-            CVarDef.Create("database.sqlite_delay", DefaultSqliteDelay, CVar.SERVERONLY);
-
-        /// <summary>
-        /// Amount of concurrent SQLite database operations.
-        /// </summary>
-        /// <remarks>
-        /// Note that SQLite is not a properly asynchronous database and also has limited read/write concurrency.
-        /// Increasing this number may allow more concurrent reads, but it probably won't matter much.
-        /// SQLite operations are normally ran on the thread pool, which may cause thread pool starvation if the concurrency is too high.
-        /// </remarks>
-        public static readonly CVarDef<int> DatabaseSqliteConcurrency =
-            CVarDef.Create("database.sqlite_concurrency", 3, CVar.SERVERONLY);
-
-#if DEBUG
-        private const int DefaultSqliteDelay = 1;
-#else
-        private const int DefaultSqliteDelay = 0;
-#endif
-
-
-        public static readonly CVarDef<string> DatabasePgHost =
-            CVarDef.Create("database.pg_host", "localhost", CVar.SERVERONLY);
-
-        public static readonly CVarDef<int> DatabasePgPort =
-            CVarDef.Create("database.pg_port", 5432, CVar.SERVERONLY);
-
-        public static readonly CVarDef<string> DatabasePgDatabase =
-            CVarDef.Create("database.pg_database", "ss14", CVar.SERVERONLY);
-
-        public static readonly CVarDef<string> DatabasePgUsername =
-            CVarDef.Create("database.pg_username", "postgres", CVar.SERVERONLY);
-
-        public static readonly CVarDef<string> DatabasePgPassword =
-            CVarDef.Create("database.pg_password", "", CVar.SERVERONLY | CVar.CONFIDENTIAL);
-
-        /// <summary>
-        /// Max amount of concurrent Postgres database operations.
-        /// </summary>
-        public static readonly CVarDef<int> DatabasePgConcurrency =
-            CVarDef.Create("database.pg_concurrency", 8, CVar.SERVERONLY);
-
-        /// <summary>
-        /// Milliseconds to asynchronously delay all PostgreSQL database operations with.
-        /// </summary>
-        /// <remarks>
-        /// This is intended for performance testing. It works different from <see cref="DatabaseSqliteDelay"/>,
-        /// as the lag is applied after acquiring the database lock.
-        /// </remarks>
-        public static readonly CVarDef<int> DatabasePgFakeLag =
-            CVarDef.Create("database.pg_fake_lag", 0, CVar.SERVERONLY);
-
-        // Basically only exists for integration tests to avoid race conditions.
-        public static readonly CVarDef<bool> DatabaseSynchronous =
-            CVarDef.Create("database.sync", false, CVar.SERVERONLY);
-
-        /*
-         * Interface
-         */
-
-        public static readonly CVarDef<string> UIClickSound =
-            CVarDef.Create("interface.click_sound", "/Audio/UserInterface/click.ogg", CVar.REPLICATED);
-
-        public static readonly CVarDef<string> UIHoverSound =
-            CVarDef.Create("interface.hover_sound", "/Audio/UserInterface/hover.ogg", CVar.REPLICATED);
-
-        /*
-         * Outline
-         */
-
-        public static readonly CVarDef<bool> OutlineEnabled =
-            CVarDef.Create("outline.enabled", true, CVar.CLIENTONLY);
-
-
-        /*
-         * Parallax
-         */
-
-        public static readonly CVarDef<bool> ParallaxEnabled =
-            CVarDef.Create("parallax.enabled", true, CVar.CLIENTONLY);
-
-        public static readonly CVarDef<bool> ParallaxDebug =
-            CVarDef.Create("parallax.debug", false, CVar.CLIENTONLY);
-
-        public static readonly CVarDef<bool> ParallaxLowQuality =
-            CVarDef.Create("parallax.low_quality", false, CVar.ARCHIVE | CVar.CLIENTONLY);
-
-        /*
-         * Physics
-         */
-
-        /// <summary>
-        /// When a mob is walking should its X / Y movement be relative to its parent (true) or the map (false).
-        /// </summary>
-        public static readonly CVarDef<bool> RelativeMovement =
-            CVarDef.Create("physics.relative_movement", true, CVar.ARCHIVE | CVar.REPLICATED | CVar.SERVER);
-
-        public static readonly CVarDef<float> TileFrictionModifier =
-            CVarDef.Create("physics.tile_friction", 40.0f, CVar.ARCHIVE | CVar.REPLICATED | CVar.SERVER);
-
-        public static readonly CVarDef<float> StopSpeed =
-            CVarDef.Create("physics.stop_speed", 0.1f, CVar.ARCHIVE | CVar.REPLICATED | CVar.SERVER);
-
-        /// <summary>
-        /// Whether mobs can push objects like lockers.
-        /// </summary>
-        /// <remarks>
-        /// Technically client doesn't need to know about it but this may prevent a bug in the distant future so it stays.
-        /// </remarks>
-        public static readonly CVarDef<bool> MobPushing =
-            CVarDef.Create("physics.mob_pushing", false, CVar.REPLICATED | CVar.SERVER);
-
-        /*
-         * Music
-         */
-
-        public static readonly CVarDef<bool> LobbyMusicEnabled =
-            CVarDef.Create("ambience.lobby_music_enabled", true, CVar.ARCHIVE | CVar.CLIENTONLY);
-
-        public static readonly CVarDef<bool> EventMusicEnabled =
-            CVarDef.Create("ambience.event_music_enabled", true, CVar.ARCHIVE | CVar.CLIENTONLY);
-
-        /*
-         * Specific Sounds
-         */
-        // Round  end sound (APC Destroyed)
-        public static readonly CVarDef<bool> RestartSoundsEnabled =
-            CVarDef.Create("ambience.restart_sounds_enabled", true, CVar.ARCHIVE | CVar.CLIENTONLY);
-
-
-        /*
-         * Admin sounds
-         */
-
-        public static readonly CVarDef<bool> AdminSoundsEnabled =
-            CVarDef.Create("audio.admin_sounds_enabled", true, CVar.ARCHIVE | CVar.CLIENTONLY);
-        public static readonly CVarDef<string> AdminChatSoundPath =
-            CVarDef.Create("audio.admin_chat_sound_path", "/Audio/Items/pop.ogg", CVar.ARCHIVE | CVar.CLIENT | CVar.REPLICATED);
-        public static readonly CVarDef<float> AdminChatSoundVolume =
-            CVarDef.Create("audio.admin_chat_sound_volume", -5f, CVar.ARCHIVE | CVar.CLIENT | CVar.REPLICATED);
-        public static readonly CVarDef<string> AHelpSound =
-            CVarDef.Create("audio.ahelp_sound", "/Audio/Effects/adminhelp.ogg", CVar.ARCHIVE | CVar.CLIENTONLY);
-
-        /*
-         * HUD
-         */
-
-        public static readonly CVarDef<int> HudTheme =
-            CVarDef.Create("hud.theme", 0, CVar.ARCHIVE | CVar.CLIENTONLY);
-
-        public static readonly CVarDef<bool> HudHeldItemShow =
-            CVarDef.Create("hud.held_item_show", true, CVar.ARCHIVE | CVar.CLIENTONLY);
-
-        public static readonly CVarDef<bool> CombatModeIndicatorsPointShow =
-            CVarDef.Create("hud.combat_mode_indicators_point_show", true, CVar.ARCHIVE | CVar.CLIENTONLY);
-
-        public static readonly CVarDef<bool> LoocAboveHeadShow =
-            CVarDef.Create("hud.show_looc_above_head", true, CVar.ARCHIVE | CVar.CLIENTONLY);
-
-        public static readonly CVarDef<float> HudHeldItemOffset =
-            CVarDef.Create("hud.held_item_offset", 28f, CVar.ARCHIVE | CVar.CLIENTONLY);
-
-        public static readonly CVarDef<bool> HudFpsCounterVisible =
-            CVarDef.Create("hud.fps_counter_visible", false, CVar.CLIENTONLY | CVar.ARCHIVE);
-
-        /*
-         * NPCs
-         */
-
-        public static readonly CVarDef<int> NPCMaxUpdates =
-            CVarDef.Create("npc.max_updates", 128);
-
-        public static readonly CVarDef<bool> NPCEnabled = CVarDef.Create("npc.enabled", true);
-
-        /// <summary>
-        /// Should NPCs pathfind when steering. For debug purposes.
-        /// </summary>
-        public static readonly CVarDef<bool> NPCPathfinding = CVarDef.Create("npc.pathfinding", true);
-
-        /*
-         * Net
-         */
-
-        public static readonly CVarDef<float> NetAtmosDebugOverlayTickRate =
-            CVarDef.Create("net.atmosdbgoverlaytickrate", 3.0f);
-
-        public static readonly CVarDef<float> NetGasOverlayTickRate =
-            CVarDef.Create("net.gasoverlaytickrate", 3.0f);
-
-        public static readonly CVarDef<int> GasOverlayThresholds =
-            CVarDef.Create("net.gasoverlaythresholds", 20);
-
-        /*
-         * Admin
-         */
-
-        public static readonly CVarDef<bool> AdminAnnounceLogin =
-            CVarDef.Create("admin.announce_login", true, CVar.SERVERONLY);
-
-        public static readonly CVarDef<bool> AdminAnnounceLogout =
-            CVarDef.Create("admin.announce_logout", true, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     The token used to authenticate with the admin API. Leave empty to disable the admin API. This is a secret! Do not share!
-        /// </summary>
-        public static readonly CVarDef<string> AdminApiToken =
-            CVarDef.Create("admin.api_token", string.Empty, CVar.SERVERONLY | CVar.CONFIDENTIAL);
-
-
-        /// <summary>
-        /// Should users be able to see their own notes? Admins will be able to see and set notes regardless
-        /// </summary>
-        public static readonly CVarDef<bool> SeeOwnNotes =
-            CVarDef.Create("admin.see_own_notes", false, CVar.ARCHIVE | CVar.REPLICATED | CVar.SERVER);
-
-        /// <summary>
-        /// Should the server play a quick sound to the active admins whenever a new player joins?
-        /// </summary>
-        public static readonly CVarDef<bool> AdminNewPlayerJoinSound =
-            CVarDef.Create("admin.new_player_join_sound", false, CVar.SERVERONLY);
-
-        /// <summary>
-        /// The amount of days before the note starts fading. It will slowly lose opacity until it reaches stale. Set to 0 to disable.
-        /// </summary>
-        public static readonly CVarDef<double> NoteFreshDays =
-            CVarDef.Create("admin.note_fresh_days", 91.31055, CVar.ARCHIVE | CVar.REPLICATED | CVar.SERVER);
-
-        /// <summary>
-        /// The amount of days before the note completely fades, and can only be seen by admins if they press "see more notes". Set to 0
-        /// if you want the note to immediately disappear without fading.
-        /// </summary>
-        public static readonly CVarDef<double> NoteStaleDays =
-            CVarDef.Create("admin.note_stale_days", 365.2422, CVar.ARCHIVE | CVar.REPLICATED | CVar.SERVER);
-
-        /// <summary>
-        /// How much time does the user have to wait in seconds before confirming that they saw an admin message?
-        /// </summary>
-        public static readonly CVarDef<float> MessageWaitTime =
-            CVarDef.Create("admin.message_wait_time", 3f, CVar.ARCHIVE | CVar.REPLICATED | CVar.SERVER);
-
-        /// <summary>
-        /// Default severity for role bans
-        /// </summary>
-        public static readonly CVarDef<string> RoleBanDefaultSeverity =
-            CVarDef.Create("admin.role_ban_default_severity", "medium", CVar.ARCHIVE | CVar.SERVER | CVar.REPLICATED);
-
-        /// <summary>
-        /// Default severity for department bans
-        /// </summary>
-        public static readonly CVarDef<string> DepartmentBanDefaultSeverity =
-            CVarDef.Create("admin.department_ban_default_severity", "medium", CVar.ARCHIVE | CVar.SERVER | CVar.REPLICATED);
-
-        /// <summary>
-        /// Default severity for server bans
-        /// </summary>
-        public static readonly CVarDef<string> ServerBanDefaultSeverity =
-            CVarDef.Create("admin.server_ban_default_severity", "High", CVar.ARCHIVE | CVar.SERVER | CVar.REPLICATED);
-
-        /// <summary>
-        /// Whether a server ban will ban the player's ip by default.
-        /// </summary>
-        public static readonly CVarDef<bool> ServerBanIpBanDefault =
-            CVarDef.Create("admin.server_ban_ip_ban_default", true, CVar.ARCHIVE | CVar.SERVER | CVar.REPLICATED);
-
-        /// <summary>
-        /// Whether a server ban will ban the player's hardware id by default.
-        /// </summary>
-        public static readonly CVarDef<bool> ServerBanHwidBanDefault =
-            CVarDef.Create("admin.server_ban_hwid_ban_default", true, CVar.ARCHIVE | CVar.SERVER | CVar.REPLICATED);
-
-        /// <summary>
-        /// Whether to use details from last connection for ip/hwid in the BanPanel.
-        /// </summary>
-        public static readonly CVarDef<bool> ServerBanUseLastDetails =
-            CVarDef.Create("admin.server_ban_use_last_details", true, CVar.ARCHIVE | CVar.SERVER | CVar.REPLICATED);
-
-        /// <summary>
-        /// Whether to erase a player's chat messages and their entity from the game when banned.
-        /// </summary>
-        public static readonly CVarDef<bool> ServerBanErasePlayer =
-            CVarDef.Create("admin.server_ban_erase_player", false, CVar.ARCHIVE | CVar.SERVER | CVar.REPLICATED);
-
-        /// <summary>
-        ///     Minimum players sharing a connection required to create an alert. -1 to disable the alert.
-        /// </summary>
-        /// <remarks>
-        ///     If you set this to 0 or 1 then it will alert on every connection, so probably don't do that.
-        /// </remarks>
-        public static readonly CVarDef<int> AdminAlertMinPlayersSharingConnection =
-            CVarDef.Create("admin.alert.min_players_sharing_connection", -1, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Minimum explosion intensity to create an admin alert message. -1 to disable the alert.
-        /// </summary>
-        public static readonly CVarDef<int> AdminAlertExplosionMinIntensity =
-            CVarDef.Create("admin.alert.explosion_min_intensity", 60, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Minimum particle accelerator strength to create an admin alert message.
-        /// </summary>
-        public static readonly CVarDef<int> AdminAlertParticleAcceleratorMinPowerState =
-            CVarDef.Create("admin.alert.particle_accelerator_min_power_state", 5, CVar.SERVERONLY); // strength 4
-
-        /// <summary>
-        ///     Should the ban details in admin channel include PII? (IP, HWID, etc)
-        /// </summary>
-        public static readonly CVarDef<bool> AdminShowPIIOnBan =
-            CVarDef.Create("admin.show_pii_onban", false, CVar.SERVERONLY);
-
-        /// <summary>
-        /// If an admin joins a round by reading up or using the late join button, automatically
-        /// de-admin them.
-        /// </summary>
-        public static readonly CVarDef<bool> AdminDeadminOnJoin =
-            CVarDef.Create("admin.deadmin_on_join", false, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Overrides the name the client sees in ahelps. Set empty to disable.
-        /// </summary>
-        public static readonly CVarDef<string> AdminAhelpOverrideClientName =
-            CVarDef.Create("admin.override_adminname_in_client_ahelp", string.Empty, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     The threshold of minutes to appear as a "new player" in the ahelp menu
-        ///     If 0, appearing as a new player is disabled.
-        /// </summary>
-        public static readonly CVarDef<int> NewPlayerThreshold =
-            CVarDef.Create("admin.new_player_threshold", 0, CVar.ARCHIVE | CVar.REPLICATED | CVar.SERVER);
-
-        /// <summary>
-        /// How long an admin client can go without any input before being considered AFK.
-        /// </summary>
-        public static readonly CVarDef<float> AdminAfkTime =
-            CVarDef.Create("admin.afk_time", 600f, CVar.SERVERONLY);
-
-        /// <summary>
-        /// If true, admins are able to connect even if
-        /// <see cref="SoftMaxPlayers"/> would otherwise block regular players.
-        /// </summary>
-        public static readonly CVarDef<bool> AdminBypassMaxPlayers =
-            CVarDef.Create("admin.bypass_max_players", true, CVar.SERVERONLY);
-
-        /// <summary>
-        /// Determine if custom rank names are used.
-        /// If it is false, it'd use the actual rank name regardless of the individual's title.
-        /// </summary>
-        /// <seealso cref="AhelpAdminPrefix"/>
-        /// <seealso cref="AhelpAdminPrefixWebhook"/>
-        public static readonly CVarDef<bool> AdminUseCustomNamesAdminRank =
-            CVarDef.Create("admin.use_custom_names_admin_rank", true, CVar.SERVERONLY);
-
-        /*
-         * AHELP
-         */
-
-        /// <summary>
-        /// Ahelp rate limit values are accounted in periods of this size (seconds).
-        /// After the period has passed, the count resets.
-        /// </summary>
-        /// <seealso cref="AhelpRateLimitCount"/>
-        public static readonly CVarDef<float> AhelpRateLimitPeriod =
-            CVarDef.Create("ahelp.rate_limit_period", 2f, CVar.SERVERONLY);
-
-        /// <summary>
-        /// How many ahelp messages are allowed in a single rate limit period.
-        /// </summary>
-        /// <seealso cref="AhelpRateLimitPeriod"/>
-        public static readonly CVarDef<int> AhelpRateLimitCount =
-            CVarDef.Create("ahelp.rate_limit_count", 10, CVar.SERVERONLY);
-
-        /// <summary>
-        /// Should the administrator's position be displayed in ahelp.
-        /// If it is is false, only the admin's ckey will be displayed in the ahelp.
-        /// </summary>
-        /// <seealso cref="AdminUseCustomNamesAdminRank"/>
-        /// <seealso cref="AhelpAdminPrefixWebhook"/>
-        public static readonly CVarDef<bool> AhelpAdminPrefix =
-            CVarDef.Create("ahelp.admin_prefix", true, CVar.SERVERONLY);
-
-        /// <summary>
-        /// Should the administrator's position be displayed in the webhook.
-        /// If it is is false, only the admin's ckey will be displayed in webhook.
-        /// </summary>
-        /// <seealso cref="AdminUseCustomNamesAdminRank"/>
-        /// <seealso cref="AhelpAdminPrefix"/>
-        public static readonly CVarDef<bool> AhelpAdminPrefixWebhook =
-            CVarDef.Create("ahelp.admin_prefix_webhook", true, CVar.SERVERONLY);
-
-        /*
-         * Explosions
-         */
-
-        /// <summary>
-        ///     How many tiles the explosion system will process per tick
-        /// </summary>
-        /// <remarks>
-        ///     Setting this too high will put a large load on a single tick. Setting this too low will lead to
-        ///     unnaturally "slow" explosions.
-        /// </remarks>
-        public static readonly CVarDef<int> ExplosionTilesPerTick =
-            CVarDef.Create("explosion.tiles_per_tick", 100, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Upper limit on the size of an explosion before physics-throwing is disabled.
-        /// </summary>
-        /// <remarks>
-        ///     Large nukes tend to generate a lot of shrapnel that flies through space. This can functionally cripple
-        ///     the server TPS for a while after an explosion (or even during, if the explosion is processed
-        ///     incrementally.
-        /// </remarks>
-        public static readonly CVarDef<int> ExplosionThrowLimit =
-            CVarDef.Create("explosion.throw_limit", 400, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     If this is true, explosion processing will pause the NodeGroupSystem to pause updating.
-        /// </summary>
-        /// <remarks>
-        ///     This only takes effect if an explosion needs more than one tick to process (i.e., covers more than <see
-        ///     cref="ExplosionTilesPerTick"/> tiles). If this is not enabled, the node-system will rebuild its graph
-        ///     every tick as the explosion shreds the station, causing significant slowdown.
-        /// </remarks>
-        public static readonly CVarDef<bool> ExplosionSleepNodeSys =
-            CVarDef.Create("explosion.node_sleep", true, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Upper limit on the total area that an explosion can affect before the neighbor-finding algorithm just
-        ///     stops. Defaults to a 60-rile radius explosion.
-        /// </summary>
-        /// <remarks>
-        ///     Actual area may be larger, as it currently doesn't terminate mid neighbor finding. I.e., area may be that of a ~51 tile radius circle instead.
-        /// </remarks>
-        public static readonly CVarDef<int> ExplosionMaxArea =
-            CVarDef.Create("explosion.max_area", (int) 3.14f * 256 * 256, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Upper limit on the number of neighbor finding steps for the explosion system neighbor-finding algorithm.
-        /// </summary>
-        /// <remarks>
-        ///     Effectively places an upper limit on the range that any explosion can have. In the vast majority of
-        ///     instances, <see cref="ExplosionMaxArea"/> will likely be hit before this becomes a limiting factor.
-        /// </remarks>
-        public static readonly CVarDef<int> ExplosionMaxIterations =
-            CVarDef.Create("explosion.max_iterations", 500, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Max Time in milliseconds to spend processing explosions every tick.
-        /// </summary>
-        /// <remarks>
-        ///     This time limiting is not perfectly implemented. Firstly, a significant chunk of processing time happens
-        ///     due to queued entity deletions, which happen outside of the system update code. Secondly, explosion
-        ///     spawning cannot currently be interrupted & resumed, and may lead to exceeding this time limit.
-        /// </remarks>
-        public static readonly CVarDef<float> ExplosionMaxProcessingTime =
-            CVarDef.Create("explosion.max_tick_time", 7f, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     If the explosion is being processed incrementally over several ticks, this variable determines whether
-        ///     updating the grid tiles should be done incrementally at the end of every tick, or only once the explosion has finished processing.
-        /// </summary>
-        /// <remarks>
-        ///     The most notable consequence of this change is that explosions will only punch a hole in the station &
-        ///     create a vacumm once they have finished exploding. So airlocks will no longer slam shut as the explosion
-        ///     expands, just suddenly at the end.
-        /// </remarks>
-        public static readonly CVarDef<bool> ExplosionIncrementalTileBreaking =
-            CVarDef.Create("explosion.incremental_tile", false, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     This determines for how many seconds an explosion should stay visible once it has finished expanding.
-        /// </summary>
-        public static readonly CVarDef<float> ExplosionPersistence =
-            CVarDef.Create("explosion.persistence", 1.0f, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     If an explosion covers a larger area than this number, the damaging/processing will always start during
-        ///     the next tick, instead of during the same tick that the explosion was generated in.
-        /// </summary>
-        /// <remarks>
-        ///     This value can be used to ensure that for large explosions the area/tile calculation and the explosion
-        ///     processing/damaging occurs in separate ticks. This helps reduce the single-tick lag if both <see
-        ///     cref="ExplosionMaxProcessingTime"/> and <see cref="ExplosionTilesPerTick"/> are large. I.e., instead of
-        ///     a single tick explosion, this cvar allows for a configuration that results in a two-tick explosion,
-        ///     though most of the computational cost is still in the second tick.
-        /// </remarks>
-        public static readonly CVarDef<int> ExplosionSingleTickAreaLimit =
-            CVarDef.Create("explosion.single_tick_area_limit", 400, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Whether or not explosions are allowed to create tiles that have
-        ///     <see cref="ContentTileDefinition.MapAtmosphere"/> set to true.
-        /// </summary>
-        public static readonly CVarDef<bool> ExplosionCanCreateVacuum =
-            CVarDef.Create("explosion.can_create_vacuum", true, CVar.SERVERONLY);
-
-        /*
-         * Radiation
-         */
-
-        /// <summary>
-        ///     What is the smallest radiation dose in rads that can be received by object.
-        ///     Extremely small values may impact performance.
-        /// </summary>
-        public static readonly CVarDef<float> RadiationMinIntensity =
-            CVarDef.Create("radiation.min_intensity", 0.1f, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Rate of radiation system update in seconds.
-        /// </summary>
-        public static readonly CVarDef<float> RadiationGridcastUpdateRate =
-            CVarDef.Create("radiation.gridcast.update_rate", 1.0f, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     If both radiation source and receiver are placed on same grid, ignore grids between them.
-        ///     May get inaccurate result in some cases, but greatly boost performance in general.
-        /// </summary>
-        public static readonly CVarDef<bool> RadiationGridcastSimplifiedSameGrid =
-            CVarDef.Create("radiation.gridcast.simplified_same_grid", true, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Max distance that radiation ray can travel in meters.
-        /// </summary>
-        public static readonly CVarDef<float> RadiationGridcastMaxDistance =
-            CVarDef.Create("radiation.gridcast.max_distance", 50f, CVar.SERVERONLY);
-
-        /*
-         * Admin logs
-         */
-
-        /// <summary>
-        ///     Controls if admin logs are enabled. Highly recommended to shut this off for development.
-        /// </summary>
-        public static readonly CVarDef<bool> AdminLogsEnabled =
-            CVarDef.Create("adminlogs.enabled", true, CVar.SERVERONLY);
-
-        public static readonly CVarDef<float> AdminLogsQueueSendDelay =
-            CVarDef.Create("adminlogs.queue_send_delay_seconds", 5f, CVar.SERVERONLY);
-
-        // When to skip the waiting time to save in-round admin logs, if no admin logs are currently being saved
-        public static readonly CVarDef<int> AdminLogsQueueMax =
-            CVarDef.Create("adminlogs.queue_max", 5000, CVar.SERVERONLY);
-
-        // When to skip the waiting time to save pre-round admin logs, if no admin logs are currently being saved
-        public static readonly CVarDef<int> AdminLogsPreRoundQueueMax =
-            CVarDef.Create("adminlogs.pre_round_queue_max", 5000, CVar.SERVERONLY);
-
-        // When to start dropping logs
-        public static readonly CVarDef<int> AdminLogsDropThreshold =
-            CVarDef.Create("adminlogs.drop_threshold", 20000, CVar.SERVERONLY);
-
-        // How many logs to send to the client at once
-        public static readonly CVarDef<int> AdminLogsClientBatchSize =
-            CVarDef.Create("adminlogs.client_batch_size", 1000, CVar.SERVERONLY);
-
-        public static readonly CVarDef<string> AdminLogsServerName =
-            CVarDef.Create("adminlogs.server_name", "unknown", CVar.SERVERONLY);
-
-        /*
-         * Atmos
-         */
-
-        /// <summary>
-        ///     Whether gas differences will move entities.
-        /// </summary>
-        public static readonly CVarDef<bool> SpaceWind =
-            CVarDef.Create("atmos.space_wind", true, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Divisor from maxForce (pressureDifference * 2.25f) to force applied on objects.
-        /// </summary>
-        public static readonly CVarDef<float> SpaceWindPressureForceDivisorThrow =
-            CVarDef.Create("atmos.space_wind_pressure_force_divisor_throw", 15f, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Divisor from maxForce (pressureDifference * 2.25f) to force applied on objects.
-        /// </summary>
-        public static readonly CVarDef<float> SpaceWindPressureForceDivisorPush =
-            CVarDef.Create("atmos.space_wind_pressure_force_divisor_push", 2500f, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     The maximum velocity (not force) that may be applied to an object by atmospheric pressure differences.
-        ///     Useful to prevent clipping through objects.
-        /// </summary>
-        public static readonly CVarDef<float> SpaceWindMaxVelocity =
-            CVarDef.Create("atmos.space_wind_max_velocity", 30f, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     The maximum force that may be applied to an object by pushing (i.e. not throwing) atmospheric pressure differences.
-        ///     A "throwing" atmospheric pressure difference ignores this limit, but not the max. velocity limit.
-        /// </summary>
-        public static readonly CVarDef<float> SpaceWindMaxPushForce =
-            CVarDef.Create("atmos.space_wind_max_push_force", 20f, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Whether monstermos tile equalization is enabled.
-        /// </summary>
-        public static readonly CVarDef<bool> MonstermosEqualization =
-            CVarDef.Create("atmos.monstermos_equalization", true, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Whether monstermos explosive depressurization is enabled.
-        ///     Needs <see cref="MonstermosEqualization"/> to be enabled to work.
-        /// </summary>
-        public static readonly CVarDef<bool> MonstermosDepressurization =
-            CVarDef.Create("atmos.monstermos_depressurization", true, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Whether monstermos explosive depressurization will rip tiles..
-        ///     Needs <see cref="MonstermosEqualization"/> and <see cref="MonstermosDepressurization"/> to be enabled to work.
-		///     WARNING: This cvar causes MAJOR contrast issues, and usually tends to make any spaced scene look very cluttered.
-		///     This not only usually looks strange, but can also reduce playability for people with impaired vision. Please think twice before enabling this on your server.
-		///     Also looks weird on slow spacing for unrelated reasons. If you do want to enable this, you should probably turn on instaspacing.
-        /// </summary>
-        public static readonly CVarDef<bool> MonstermosRipTiles =
-            CVarDef.Create("atmos.monstermos_rip_tiles", false, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Whether explosive depressurization will cause the grid to gain an impulse.
-        ///     Needs <see cref="MonstermosEqualization"/> and <see cref="MonstermosDepressurization"/> to be enabled to work.
-        /// </summary>
-        public static readonly CVarDef<bool> AtmosGridImpulse =
-            CVarDef.Create("atmos.grid_impulse", false, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     What fraction of air from a spaced tile escapes every tick.
-        ///     1.0 for instant spacing, 0.2 means 20% of remaining air lost each time
-        /// </summary>
-        public static readonly CVarDef<float> AtmosSpacingEscapeRatio =
-            CVarDef.Create("atmos.mmos_spacing_speed", 0.15f, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Minimum amount of air allowed on a spaced tile before it is reset to 0 immediately in kPa
-        ///     Since the decay due to SpacingEscapeRatio follows a curve, it would never reach 0.0 exactly
-        ///     unless we truncate it somewhere.
-        /// </summary>
-        public static readonly CVarDef<float> AtmosSpacingMinGas =
-            CVarDef.Create("atmos.mmos_min_gas", 2.0f, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     How much wind can go through a single tile before that tile doesn't depressurize itself
-        ///     (I.e spacing is limited in large rooms heading into smaller spaces)
-        /// </summary>
-        public static readonly CVarDef<float> AtmosSpacingMaxWind =
-            CVarDef.Create("atmos.mmos_max_wind", 500f, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Whether atmos superconduction is enabled.
-        /// </summary>
-        /// <remarks> Disabled by default, superconduction is awful. </remarks>
-        public static readonly CVarDef<bool> Superconduction =
-            CVarDef.Create("atmos.superconduction", false, CVar.SERVERONLY);
+namespace Content.Shared.CCVar;
 
-        /// <summary>
-        ///     Heat loss per tile due to radiation at 20 degC, in W.
-        /// </summary>
-        public static readonly CVarDef<float> SuperconductionTileLoss =
-            CVarDef.Create("atmos.superconduction_tile_loss", 30f, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Whether excited groups will be processed and created.
-        /// </summary>
-        public static readonly CVarDef<bool> ExcitedGroups =
-            CVarDef.Create("atmos.excited_groups", true, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Whether all tiles in an excited group will clear themselves once being exposed to space.
-        ///     Similar to <see cref="MonstermosDepressurization"/>, without none of the tile ripping or
-        ///     things being thrown around very violently.
-        ///     Needs <see cref="ExcitedGroups"/> to be enabled to work.
-        /// </summary>
-        public static readonly CVarDef<bool> ExcitedGroupsSpaceIsAllConsuming =
-            CVarDef.Create("atmos.excited_groups_space_is_all_consuming", false, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Maximum time in milliseconds that atmos can take processing.
-        /// </summary>
-        public static readonly CVarDef<float> AtmosMaxProcessTime =
-            CVarDef.Create("atmos.max_process_time", 3f, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Atmos tickrate in TPS. Atmos processing will happen every 1/TPS seconds.
-        /// </summary>
-        public static readonly CVarDef<float> AtmosTickRate =
-            CVarDef.Create("atmos.tickrate", 15f, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Scale factor for how fast things happen in our atmosphere
-        ///     simulation compared to real life. 1x means pumps run at 1x
-        ///     speed. Players typically expect things to happen faster
-        ///     in-game.
-        /// </summary>
-        public static readonly CVarDef<float> AtmosSpeedup =
-            CVarDef.Create("atmos.speedup", 8f, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Like atmos.speedup, but only for gas and reaction heat values. 64x means
-        ///     gases heat up and cool down 64x faster than real life.
-        /// </summary>
-        public static readonly CVarDef<float> AtmosHeatScale =
-            CVarDef.Create("atmos.heat_scale", 8f, CVar.SERVERONLY);
-
-        /// <summary>
-        /// Maximum explosion radius for explosions caused by bursting a gas tank ("max caps").
-        /// Setting this to zero disables the explosion but still allows the tank to burst and leak.
-        /// </summary>
-        public static readonly CVarDef<float> AtmosTankFragment =
-            CVarDef.Create("atmos.max_explosion_range", 26f, CVar.SERVERONLY);
-
-        /*
-         * MIDI instruments
-         */
-
-        public static readonly CVarDef<int> MaxMidiEventsPerSecond =
-            CVarDef.Create("midi.max_events_per_second", 1000, CVar.REPLICATED | CVar.SERVER);
-
-        public static readonly CVarDef<int> MaxMidiEventsPerBatch =
-            CVarDef.Create("midi.max_events_per_batch", 60, CVar.REPLICATED | CVar.SERVER);
-
-        public static readonly CVarDef<int> MaxMidiBatchesDropped =
-            CVarDef.Create("midi.max_batches_dropped", 1, CVar.SERVERONLY);
-
-        public static readonly CVarDef<int> MaxMidiLaggedBatches =
-            CVarDef.Create("midi.max_lagged_batches", 8, CVar.SERVERONLY);
-
-        /*
-         * Holidays
-         */
-
-        public static readonly CVarDef<bool> HolidaysEnabled = CVarDef.Create("holidays.enabled", true, CVar.SERVERONLY);
-
-        /*
-         * Branding stuff
-         */
-
-        public static readonly CVarDef<bool> BrandingSteam = CVarDef.Create("branding.steam", false, CVar.CLIENTONLY);
-
-        /*
-         * OOC
-         */
-
-        public static readonly CVarDef<bool> OocEnabled = CVarDef.Create("ooc.enabled", true, CVar.NOTIFY | CVar.REPLICATED);
-
-        public static readonly CVarDef<bool> AdminOocEnabled =
-            CVarDef.Create("ooc.enabled_admin", true, CVar.NOTIFY);
-
-        /// <summary>
-        /// If true, whenever OOC is disabled the Discord OOC relay will also be disabled.
-        /// </summary>
-        public static readonly CVarDef<bool> DisablingOOCDisablesRelay = CVarDef.Create("ooc.disabling_ooc_disables_relay", true, CVar.SERVERONLY);
-
-        /// <summary>
-        /// Whether or not OOC chat should be enabled during a round.
-        /// </summary>
-        public static readonly CVarDef<bool> OocEnableDuringRound =
-            CVarDef.Create("ooc.enable_during_round", false, CVar.NOTIFY | CVar.REPLICATED | CVar.SERVER);
-
-        public static readonly CVarDef<bool> ShowOocPatronColor =
-            CVarDef.Create("ooc.show_ooc_patron_color", true, CVar.ARCHIVE | CVar.REPLICATED | CVar.CLIENT);
-
-        /*
-         * LOOC
-         */
-
-        public static readonly CVarDef<bool> LoocEnabled = CVarDef.Create("looc.enabled", true, CVar.NOTIFY | CVar.REPLICATED);
-
-        public static readonly CVarDef<bool> AdminLoocEnabled =
-            CVarDef.Create("looc.enabled_admin", true, CVar.NOTIFY);
-
-        /// <summary>
-        /// True: Dead players can use LOOC
-        /// False: Dead player LOOC gets redirected to dead chat
-        /// </summary>
-        public static readonly CVarDef<bool> DeadLoocEnabled = CVarDef.Create("looc.enabled_dead", false, CVar.NOTIFY | CVar.REPLICATED);
-
-        /// <summary>
-        /// True: Crit players can use LOOC
-        /// False: Crit player LOOC gets redirected to dead chat
-        /// </summary>
-        public static readonly CVarDef<bool> CritLoocEnabled = CVarDef.Create("looc.enabled_crit", false, CVar.NOTIFY | CVar.REPLICATED);
-
-        /*
-         * Entity Menu Grouping Types
-         */
-        public static readonly CVarDef<int> EntityMenuGroupingType = CVarDef.Create("entity_menu", 0, CVar.CLIENTONLY);
-
-        /*
-         * Whitelist
-         */
-
-        /// <summary>
-        ///     Controls whether the server will deny any players that are not whitelisted in the DB.
-        /// </summary>
-        public static readonly CVarDef<bool> WhitelistEnabled =
-            CVarDef.Create("whitelist.enabled", false, CVar.SERVERONLY);
-        /// <summary>
-        ///     Specifies the whitelist prototypes to be used by the server. This should be a comma-separated list of prototypes.
-        ///     If a whitelists conditions to be active fail (for example player count), the next whitelist will be used instead. If no whitelist is valid, the player will be allowed to connect.
-        /// </summary>
-        public static readonly CVarDef<string> WhitelistPrototypeList =
-            CVarDef.Create("whitelist.prototype_list", "basicWhitelist", CVar.SERVERONLY);
-
-        /*
-         * VOTE
-         */
-
-        /// <summary>
-        ///     Allows enabling/disabling player-started votes for ultimate authority
-        /// </summary>
-        public static readonly CVarDef<bool> VoteEnabled =
-            CVarDef.Create("vote.enabled", true, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     See vote.enabled, but specific to restart votes
-        /// </summary>
-        public static readonly CVarDef<bool> VoteRestartEnabled =
-            CVarDef.Create("vote.restart_enabled", true, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Config for when the restart vote should be allowed to be called regardless with less than this amount of players.
-        /// </summary>
-        public static readonly CVarDef<int> VoteRestartMaxPlayers =
-            CVarDef.Create("vote.restart_max_players", 20, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Config for when the restart vote should be allowed to be called based on percentage of ghosts.
-        ///
-        public static readonly CVarDef<int> VoteRestartGhostPercentage =
-            CVarDef.Create("vote.restart_ghost_percentage", 55, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     See vote.enabled, but specific to preset votes
-        /// </summary>
-        public static readonly CVarDef<bool> VotePresetEnabled =
-            CVarDef.Create("vote.preset_enabled", false, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     See vote.enabled, but specific to map votes
-        /// </summary>
-        public static readonly CVarDef<bool> VoteMapEnabled =
-            CVarDef.Create("vote.map_enabled", false, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     The required ratio of the server that must agree for a restart round vote to go through.
-        /// </summary>
-        public static readonly CVarDef<float> VoteRestartRequiredRatio =
-            CVarDef.Create("vote.restart_required_ratio", 0.85f, CVar.SERVERONLY);
-
-        /// <summary>
-        /// Whether or not to prevent the restart vote from having any effect when there is an online admin
-        /// </summary>
-        public static readonly CVarDef<bool> VoteRestartNotAllowedWhenAdminOnline =
-            CVarDef.Create("vote.restart_not_allowed_when_admin_online", true, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     The delay which two votes of the same type are allowed to be made by separate people, in seconds.
-        /// </summary>
-        public static readonly CVarDef<float> VoteSameTypeTimeout =
-            CVarDef.Create("vote.same_type_timeout", 240f, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Sets the duration of the map vote timer.
-        /// </summary>
-        public static readonly CVarDef<int>
-            VoteTimerMap = CVarDef.Create("vote.timermap", 90, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Sets the duration of the restart vote timer.
-        /// </summary>
-        public static readonly CVarDef<int>
-            VoteTimerRestart = CVarDef.Create("vote.timerrestart", 60, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Sets the duration of the gamemode/preset vote timer.
-        /// </summary>
-        public static readonly CVarDef<int>
-            VoteTimerPreset = CVarDef.Create("vote.timerpreset", 30, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Sets the duration of the map vote timer when ALONE.
-        /// </summary>
-        public static readonly CVarDef<int>
-            VoteTimerAlone = CVarDef.Create("vote.timeralone", 10, CVar.SERVERONLY);
-
-        /*
-         * VOTEKICK
-         */
-
-        /// <summary>
-        ///     Allows enabling/disabling player-started votekick for ultimate authority
-        /// </summary>
-        public static readonly CVarDef<bool> VotekickEnabled =
-            CVarDef.Create("votekick.enabled", true, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Config for when the votekick should be allowed to be called based on number of eligible voters.
-        /// </summary>
-        public static readonly CVarDef<int> VotekickEligibleNumberRequirement =
-            CVarDef.Create("votekick.eligible_number", 5, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Whether a votekick initiator must be a ghost or not.
-        /// </summary>
-        public static readonly CVarDef<bool> VotekickInitiatorGhostRequirement =
-            CVarDef.Create("votekick.initiator_ghost_requirement", true, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Should the initiator be whitelisted to initiate a votekick?
-        /// </summary>
-        public static readonly CVarDef<bool> VotekickInitiatorWhitelistedRequirement =
-            CVarDef.Create("votekick.initiator_whitelist_requirement", true, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Should the initiator be able to start a votekick if they are bellow the votekick.voter_playtime requirement?
-        /// </summary>
-        public static readonly CVarDef<bool> VotekickInitiatorTimeRequirement =
-            CVarDef.Create("votekick.initiator_time_requirement", false, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Whether a votekick voter must be a ghost or not.
-        /// </summary>
-        public static readonly CVarDef<bool> VotekickVoterGhostRequirement =
-            CVarDef.Create("votekick.voter_ghost_requirement", true, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Config for how many hours playtime a player must have to be able to vote on a votekick.
-        /// </summary>
-        public static readonly CVarDef<int> VotekickEligibleVoterPlaytime =
-            CVarDef.Create("votekick.voter_playtime", 100, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Config for how many seconds a player must have been dead to initiate a votekick / be able to vote on a votekick.
-        /// </summary>
-        public static readonly CVarDef<int> VotekickEligibleVoterDeathtime =
-            CVarDef.Create("votekick.voter_deathtime", 30, CVar.REPLICATED | CVar.SERVER);
-
-        /// <summary>
-        ///     The required ratio of eligible voters that must agree for a votekick to go through.
-        /// </summary>
-        public static readonly CVarDef<float> VotekickRequiredRatio =
-            CVarDef.Create("votekick.required_ratio", 0.6f, CVar.SERVERONLY);
-
-        /// <summary>
-        /// Whether or not to prevent the votekick from having any effect when there is an online admin.
-        /// </summary>
-        public static readonly CVarDef<bool> VotekickNotAllowedWhenAdminOnline =
-            CVarDef.Create("votekick.not_allowed_when_admin_online", true, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     The delay for which two votekicks are allowed to be made by separate people, in seconds.
-        /// </summary>
-        public static readonly CVarDef<float> VotekickTimeout =
-            CVarDef.Create("votekick.timeout", 120f, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Sets the duration of the votekick vote timer.
-        /// </summary>
-        public static readonly CVarDef<int>
-            VotekickTimer = CVarDef.Create("votekick.timer", 60, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Config for how many hours playtime a player must have to get protection from the Raider votekick type when playing as an antag.
-        /// </summary>
-        public static readonly CVarDef<int> VotekickAntagRaiderProtection =
-            CVarDef.Create("votekick.antag_raider_protection", 10, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Default severity for votekick bans
-        /// </summary>
-        public static readonly CVarDef<string> VotekickBanDefaultSeverity =
-            CVarDef.Create("votekick.ban_default_severity", "High", CVar.ARCHIVE | CVar.SERVER | CVar.REPLICATED);
-
-        /// <summary>
-        ///     Duration of a ban caused by a votekick (in minutes).
-        /// </summary>
-        public static readonly CVarDef<int> VotekickBanDuration =
-            CVarDef.Create("votekick.ban_duration", 180, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Whether the ghost requirement settings for votekicks should be ignored for the lobby. 
-        /// </summary>
-        public static readonly CVarDef<bool> VotekickIgnoreGhostReqInLobby =
-            CVarDef.Create("votekick.ignore_ghost_req_in_lobby", true, CVar.SERVERONLY);
-
-        /*
-         * BAN
-         */
-
-        public static readonly CVarDef<bool> BanHardwareIds =
-            CVarDef.Create("ban.hardware_ids", true, CVar.SERVERONLY);
-
-        /*
-         * Procgen
-         */
-
-        /// <summary>
-        /// Should we pre-load all of the procgen atlasses.
-        /// </summary>
-        public static readonly CVarDef<bool> ProcgenPreload =
-            CVarDef.Create("procgen.preload", true, CVar.SERVERONLY);
-
-        /*
-         * Shuttles
-         */
-
-        // Look this is technically eye behavior but its main impact is shuttles so I just dumped it here.
-        /// <summary>
-        /// If true then the camera will match the grid / map and is unchangeable.
-        /// - When traversing grids it will snap to 0 degrees rotation.
-        /// False means the player has control over the camera rotation.
-        /// - When traversing grids it will snap to the nearest cardinal which will generally be imperceptible.
-        /// </summary>
-        public static readonly CVarDef<bool> CameraRotationLocked =
-            CVarDef.Create("shuttle.camera_rotation_locked", false, CVar.REPLICATED);
-
-        /// <summary>
-        /// Whether the arrivals terminal should be on a planet map.
-        /// </summary>
-        public static readonly CVarDef<bool> ArrivalsPlanet =
-            CVarDef.Create("shuttle.arrivals_planet", true, CVar.SERVERONLY);
-
-        /// <summary>
-        /// Whether the arrivals shuttle is enabled.
-        /// </summary>
-        public static readonly CVarDef<bool> ArrivalsShuttles =
-            CVarDef.Create("shuttle.arrivals", false, CVar.SERVERONLY);
-
-        /// <summary>
-        /// The map to use for the arrivals station.
-        /// </summary>
-        public static readonly CVarDef<string> ArrivalsMap =
-            CVarDef.Create("shuttle.arrivals_map", "/Maps/Misc/terminal.yml", CVar.SERVERONLY);
-
-        /// <summary>
-        /// Cooldown between arrivals departures. This should be longer than the FTL time or it will double cycle.
-        /// </summary>
-        public static readonly CVarDef<float> ArrivalsCooldown =
-            CVarDef.Create("shuttle.arrivals_cooldown", 50f, CVar.SERVERONLY);
-
-        /// <summary>
-        /// Are players allowed to return on the arrivals shuttle.
-        /// </summary>
-        public static readonly CVarDef<bool> ArrivalsReturns =
-            CVarDef.Create("shuttle.arrivals_returns", false, CVar.SERVERONLY);
-
-        /// <summary>
-        /// Should all players who spawn at arrivals have godmode until they leave the map?
-        /// </summary>
-        public static readonly CVarDef<bool> GodmodeArrivals =
-            CVarDef.Create("shuttle.godmode_arrivals", false, CVar.SERVERONLY);
-
-        /// <summary>
-        /// If a grid is split then hide any smaller ones under this mass (kg) from the map.
-        /// This is useful to avoid split grids spamming out labels.
-        /// </summary>
-        public static readonly CVarDef<int> HideSplitGridsUnder =
-            CVarDef.Create("shuttle.hide_split_grids_under", 30, CVar.SERVERONLY);
-
-        /// <summary>
-        /// Whether to automatically spawn escape shuttles.
-        /// </summary>
-        public static readonly CVarDef<bool> GridFill =
-            CVarDef.Create("shuttle.grid_fill", true, CVar.SERVERONLY);
-
-        /// <summary>
-        /// Whether to automatically preloading grids by GridPreloaderSystem
-        /// </summary>
-        public static readonly CVarDef<bool> PreloadGrids =
-            CVarDef.Create("shuttle.preload_grids", true, CVar.SERVERONLY);
-
-        /// <summary>
-        /// How long the warmup time before FTL start should be.
-        /// </summary>
-        public static readonly CVarDef<float> FTLStartupTime =
-            CVarDef.Create("shuttle.startup_time", 5.5f, CVar.SERVERONLY);
-
-        /// <summary>
-        /// How long a shuttle spends in FTL.
-        /// </summary>
-        public static readonly CVarDef<float> FTLTravelTime =
-            CVarDef.Create("shuttle.travel_time", 20f, CVar.SERVERONLY);
-
-        /// <summary>
-        /// How long the final stage of FTL before arrival should be.
-        /// </summary>
-        public static readonly CVarDef<float> FTLArrivalTime =
-            CVarDef.Create("shuttle.arrival_time", 5f, CVar.SERVERONLY);
-
-        /// <summary>
-        /// How much time needs to pass before a shuttle can FTL again.
-        /// </summary>
-        public static readonly CVarDef<float> FTLCooldown =
-            CVarDef.Create("shuttle.cooldown", 10f, CVar.SERVERONLY);
-
-        /// <summary>
-        /// The maximum <see cref="PhysicsComponent.Mass"/> a grid can have before it becomes unable to FTL.
-        /// Any value equal to or less than zero will disable this check.
-        /// </summary>
-        public static readonly CVarDef<float> FTLMassLimit =
-            CVarDef.Create("shuttle.mass_limit", 300f, CVar.SERVERONLY);
-
-        /// <summary>
-        /// How long to knock down entities for if they aren't buckled when FTL starts and stops.
-        /// </summary>
-        public static readonly CVarDef<float> HyperspaceKnockdownTime =
-            CVarDef.Create("shuttle.hyperspace_knockdown_time", 5f, CVar.SERVERONLY);
-
-        /*
-         * Emergency
-         */
-
-        /// <summary>
-        /// Is the emergency shuttle allowed to be early launched.
-        /// </summary>
-        public static readonly CVarDef<bool> EmergencyEarlyLaunchAllowed =
-            CVarDef.Create("shuttle.emergency_early_launch_allowed", false, CVar.SERVERONLY);
-
-        /// <summary>
-        /// How long the emergency shuttle remains docked with the station, in seconds.
-        /// </summary>
-        public static readonly CVarDef<float> EmergencyShuttleDockTime =
-            CVarDef.Create("shuttle.emergency_dock_time", 240f, CVar.SERVERONLY);
-
-        /// <summary>
-        /// If the emergency shuttle can't dock at a priority port, the dock time will be multiplied with this value.
-        /// </summary>
-        public static readonly CVarDef<float> EmergencyShuttleDockTimeMultiplierOtherDock =
-            CVarDef.Create("shuttle.emergency_dock_time_multiplier_other_dock", 1.6667f, CVar.SERVERONLY);
-
-        /// <summary>
-        /// If the emergency shuttle can't dock at all, the dock time will be multiplied with this value.
-        /// </summary>
-        public static readonly CVarDef<float> EmergencyShuttleDockTimeMultiplierNoDock =
-            CVarDef.Create("shuttle.emergency_dock_time_multiplier_no_dock", 2f, CVar.SERVERONLY);
-
-        /// <summary>
-        /// How long after the console is authorized for the shuttle to early launch.
-        /// </summary>
-        public static readonly CVarDef<float> EmergencyShuttleAuthorizeTime =
-            CVarDef.Create("shuttle.emergency_authorize_time", 10f, CVar.SERVERONLY);
-
-        /// <summary>
-        /// The minimum time for the emergency shuttle to arrive at centcomm.
-        /// Actual minimum travel time cannot be less than <see cref="ShuttleSystem.DefaultArrivalTime"/>
-        /// </summary>
-        public static readonly CVarDef<float> EmergencyShuttleMinTransitTime =
-            CVarDef.Create("shuttle.emergency_transit_time_min", 90f, CVar.SERVERONLY);
-
-        /// <summary>
-        /// The maximum time for the emergency shuttle to arrive at centcomm.
-        /// </summary>
-        public static readonly CVarDef<float> EmergencyShuttleMaxTransitTime =
-            CVarDef.Create("shuttle.emergency_transit_time_max", 180f, CVar.SERVERONLY);
-
-        /// <summary>
-        /// Whether the emergency shuttle is enabled or should the round just end.
-        /// </summary>
-        public static readonly CVarDef<bool> EmergencyShuttleEnabled =
-            CVarDef.Create("shuttle.emergency", true, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     The percentage of time passed from the initial call to when the shuttle can no longer be recalled.
-        ///     ex. a call time of 10min and turning point of 0.5 means the shuttle cannot be recalled after 5 minutes.
-        /// </summary>
-        public static readonly CVarDef<float> EmergencyRecallTurningPoint =
-            CVarDef.Create("shuttle.recall_turning_point", 0.5f, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Time in minutes after round start to auto-call the shuttle. Set to zero to disable.
-        /// </summary>
-        public static readonly CVarDef<int> EmergencyShuttleAutoCallTime =
-            CVarDef.Create("shuttle.auto_call_time", 120, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Time in minutes after the round was extended (by recalling the shuttle) to call
-        ///     the shuttle again.
-        /// </summary>
-        public static readonly CVarDef<int> EmergencyShuttleAutoCallExtensionTime =
-            CVarDef.Create("shuttle.auto_call_extension_time", 30, CVar.SERVERONLY);
-
-        /*
-         * Crew Manifests
-         */
-
-        /// <summary>
-        ///     Setting this allows a crew manifest to be opened from any window
-        ///     that has a crew manifest button, and sends the correct message.
-        ///     If this is false, only in-game entities will allow you to see
-        ///     the crew manifest, if the functionality is coded in.
-        ///     Having administrator priveledge ignores this, but will still
-        ///     hide the button in UI windows.
-        /// </summary>
-        public static readonly CVarDef<bool> CrewManifestWithoutEntity =
-            CVarDef.Create("crewmanifest.no_entity", true, CVar.REPLICATED);
-
-        /// <summary>
-        ///     Setting this allows the crew manifest to be viewed from 'unsecure'
-        ///     entities, such as the PDA.
-        /// </summary>
-        public static readonly CVarDef<bool> CrewManifestUnsecure =
-            CVarDef.Create("crewmanifest.unsecure", true, CVar.REPLICATED);
-
-        /*
-         * Biomass
-         */
-
-        /// <summary>
-        ///     Enabled: Cloning has 70% cost and reclaimer will refuse to reclaim corpses with souls. (For LRP).
-        ///     Disabled: Cloning has full biomass cost and reclaimer can reclaim corpses with souls. (Playtested and balanced for MRP+).
-        /// </summary>
-        public static readonly CVarDef<bool> BiomassEasyMode =
-            CVarDef.Create("biomass.easy_mode", false, CVar.SERVERONLY);
-
-        /*
-         * Anomaly
-         */
-
-        /// <summary>
-        ///     A scale factor applied to a grid's bounds when trying to find a spot to randomly generate an anomaly.
-        /// </summary>
-        public static readonly CVarDef<float> AnomalyGenerationGridBoundsScale =
-            CVarDef.Create("anomaly.generation_grid_bounds_scale", 0.6f, CVar.SERVERONLY);
-
-        /*
-         * VIEWPORT
-         */
-
-        public static readonly CVarDef<bool> ViewportStretch =
-            CVarDef.Create("viewport.stretch", true, CVar.CLIENTONLY | CVar.ARCHIVE);
-
-        public static readonly CVarDef<int> ViewportFixedScaleFactor =
-            CVarDef.Create("viewport.fixed_scale_factor", 2, CVar.CLIENTONLY | CVar.ARCHIVE);
-
-        // This default is basically specifically chosen so fullscreen/maximized 1080p hits a 2x snap and does NN.
-        public static readonly CVarDef<int> ViewportSnapToleranceMargin =
-            CVarDef.Create("viewport.snap_tolerance_margin", 64, CVar.CLIENTONLY | CVar.ARCHIVE);
-
-        public static readonly CVarDef<int> ViewportSnapToleranceClip =
-            CVarDef.Create("viewport.snap_tolerance_clip", 32, CVar.CLIENTONLY | CVar.ARCHIVE);
-
-        public static readonly CVarDef<bool> ViewportScaleRender =
-            CVarDef.Create("viewport.scale_render", true, CVar.CLIENTONLY | CVar.ARCHIVE);
-
-        public static readonly CVarDef<int> ViewportMinimumWidth =
-            CVarDef.Create("viewport.minimum_width", 15, CVar.REPLICATED | CVar.SERVER);
-
-        public static readonly CVarDef<int> ViewportMaximumWidth =
-            CVarDef.Create("viewport.maximum_width", 21, CVar.REPLICATED | CVar.SERVER);
-
-        public static readonly CVarDef<int> ViewportWidth =
-            CVarDef.Create("viewport.width", 21, CVar.CLIENTONLY | CVar.ARCHIVE);
-
-        public static readonly CVarDef<bool> ViewportVerticalFit =
-            CVarDef.Create("viewport.vertical_fit", true, CVar.CLIENTONLY | CVar.ARCHIVE);
-
-        /*
-         * UI
-         */
-
-        public static readonly CVarDef<string> UILayout =
-            CVarDef.Create("ui.layout", "Default", CVar.CLIENTONLY | CVar.ARCHIVE);
-
-        public static readonly CVarDef<string> DefaultScreenChatSize =
-            CVarDef.Create("ui.default_chat_size", "", CVar.CLIENTONLY | CVar.ARCHIVE);
-
-        public static readonly CVarDef<string> SeparatedScreenChatSize =
-            CVarDef.Create("ui.separated_chat_size", "0.6,0", CVar.CLIENTONLY | CVar.ARCHIVE);
-
-
-        /*
-        * Accessibility
-        */
-
-        /// <summary>
-        /// Chat window opacity slider, controlling the alpha of the chat window background.
-        /// Goes from to 0 (completely transparent) to 1 (completely opaque)
-        /// </summary>
-        public static readonly CVarDef<float> ChatWindowOpacity =
-            CVarDef.Create("accessibility.chat_window_transparency", 0.85f, CVar.CLIENTONLY | CVar.ARCHIVE);
-
-        /// <summary>
-        /// Toggle for visual effects that may potentially cause motion sickness.
-        /// Where reasonable, effects affected by this CVar should use an alternate effect.
-        /// Please do not use this CVar as a bandaid for effects that could otherwise be made accessible without issue.
-        /// </summary>
-        public static readonly CVarDef<bool> ReducedMotion =
-            CVarDef.Create("accessibility.reduced_motion", false, CVar.CLIENTONLY | CVar.ARCHIVE);
-
-        public static readonly CVarDef<bool> ChatEnableColorName =
-            CVarDef.Create("accessibility.enable_color_name", true, CVar.CLIENTONLY | CVar.ARCHIVE, "Toggles displaying names with individual colors.");
-
-        /// <summary>
-        /// Screen shake intensity slider, controlling the intensity of the CameraRecoilSystem.
-        /// Goes from 0 (no recoil at all) to 1 (regular amounts of recoil)
-        /// </summary>
-        public static readonly CVarDef<float> ScreenShakeIntensity =
-            CVarDef.Create("accessibility.screen_shake_intensity", 1f, CVar.CLIENTONLY | CVar.ARCHIVE);
-
-        /// <summary>
-        /// A generic toggle for various visual effects that are color sensitive.
-        /// As of 2/16/24, only applies to progress bar colors.
-        /// </summary>
-        public static readonly CVarDef<bool> AccessibilityColorblindFriendly =
-            CVarDef.Create("accessibility.colorblind_friendly", false, CVar.CLIENTONLY | CVar.ARCHIVE);
-
-        /*
-         * CHAT
-         */
-
-        /// <summary>
-        /// Chat rate limit values are accounted in periods of this size (seconds).
-        /// After the period has passed, the count resets.
-        /// </summary>
-        /// <seealso cref="ChatRateLimitCount"/>
-        public static readonly CVarDef<float> ChatRateLimitPeriod =
-            CVarDef.Create("chat.rate_limit_period", 2f, CVar.SERVERONLY);
-
-        /// <summary>
-        /// How many chat messages are allowed in a single rate limit period.
-        /// </summary>
-        /// <remarks>
-        /// The total rate limit throughput per second is effectively
-        /// <see cref="ChatRateLimitCount"/> divided by <see cref="ChatRateLimitCount"/>.
-        /// </remarks>
-        /// <seealso cref="ChatRateLimitPeriod"/>
-        public static readonly CVarDef<int> ChatRateLimitCount =
-            CVarDef.Create("chat.rate_limit_count", 10, CVar.SERVERONLY);
-
-        /// <summary>
-        /// Minimum delay (in seconds) between notifying admins about chat message rate limit violations.
-        /// A negative value disables admin announcements.
-        /// </summary>
-        public static readonly CVarDef<int> ChatRateLimitAnnounceAdminsDelay =
-            CVarDef.Create("chat.rate_limit_announce_admins_delay", 15, CVar.SERVERONLY);
-
-        public static readonly CVarDef<int> ChatMaxMessageLength =
-            CVarDef.Create("chat.max_message_length", 1000, CVar.SERVER | CVar.REPLICATED);
-
-        public static readonly CVarDef<int> ChatMaxAnnouncementLength =
-            CVarDef.Create("chat.max_announcement_length", 256, CVar.SERVER | CVar.REPLICATED);
-
-        public static readonly CVarDef<bool> ChatSanitizerEnabled =
-            CVarDef.Create("chat.chat_sanitizer_enabled", true, CVar.SERVERONLY);
-
-        public static readonly CVarDef<bool> ChatShowTypingIndicator =
-            CVarDef.Create("chat.show_typing_indicator", true, CVar.ARCHIVE | CVar.REPLICATED | CVar.SERVER);
-
-        public static readonly CVarDef<bool> ChatEnableFancyBubbles =
-            CVarDef.Create("chat.enable_fancy_bubbles", true, CVar.CLIENTONLY | CVar.ARCHIVE, "Toggles displaying fancy speech bubbles, which display the speaking character's name.");
-
-        public static readonly CVarDef<bool> ChatFancyNameBackground =
-            CVarDef.Create("chat.fancy_name_background", false, CVar.CLIENTONLY | CVar.ARCHIVE, "Toggles displaying a background under the speaking character's name.");
-
-        /// <summary>
-        /// A message broadcast to each player that joins the lobby.
-        /// May be changed by admins ingame through use of the "set-motd" command.
-        /// In this case the new value, if not empty, is broadcast to all connected players and saved between rounds.
-        /// May be requested by any player through use of the "get-motd" command.
-        /// </summary>
-        public static readonly CVarDef<string> MOTD =
-            CVarDef.Create("chat.motd", "", CVar.SERVER | CVar.SERVERONLY | CVar.ARCHIVE, "A message broadcast to each player that joins the lobby.");
-
-        /*
-         * AFK
-         */
-
-        /// <summary>
-        /// How long a client can go without any input before being considered AFK.
-        /// </summary>
-        public static readonly CVarDef<float> AfkTime =
-            CVarDef.Create("afk.time", 60f, CVar.SERVERONLY);
-
-        /*
-         * IC
-         */
-
-        /// <summary>
-        /// Restricts IC character names to alphanumeric chars.
-        /// </summary>
-        public static readonly CVarDef<bool> RestrictedNames =
-            CVarDef.Create("ic.restricted_names", true, CVar.SERVER | CVar.REPLICATED);
-
-        /// <summary>
-        /// Allows flavor text (character descriptions)
-        /// </summary>
-        public static readonly CVarDef<bool> FlavorText =
-            CVarDef.Create("ic.flavor_text", true, CVar.SERVER | CVar.REPLICATED);
-
-        /// <summary>
-        /// Adds a period at the end of a sentence if the sentence ends in a letter.
-        /// </summary>
-        public static readonly CVarDef<bool> ChatPunctuation =
-            CVarDef.Create("ic.punctuation", true, CVar.SERVER);
-
-        /// <summary>
-        /// Enables automatically forcing IC name rules. Uppercases the first letter of the first and last words of the name
-        /// </summary>
-        public static readonly CVarDef<bool> ICNameCase =
-            CVarDef.Create("ic.name_case", true, CVar.SERVER | CVar.REPLICATED);
-
-        /// <summary>
-        /// Whether or not players' characters are randomly generated rather than using their selected characters in the creator.
-        /// </summary>
-        public static readonly CVarDef<bool> ICRandomCharacters =
-            CVarDef.Create("ic.random_characters", false, CVar.SERVER);
-
-        /// <summary>
-        /// A weighted random prototype used to determine the species selected for random characters.
-        /// </summary>
-        public static readonly CVarDef<string> ICRandomSpeciesWeights =
-            CVarDef.Create("ic.random_species_weights", "SpeciesWeights", CVar.SERVER);
-
-        /// <summary>
-        /// Control displaying SSD indicators near players
-        /// </summary>
-        public static readonly CVarDef<bool> ICShowSSDIndicator =
-            CVarDef.Create("ic.show_ssd_indicator", true, CVar.CLIENTONLY);
-
-        /*
-         * Salvage
-         */
-
-        /// <summary>
-        /// Duration for missions
-        /// </summary>
-        public static readonly CVarDef<float>
-            SalvageExpeditionDuration = CVarDef.Create("salvage.expedition_duration", 660f, CVar.REPLICATED);
-
-        /// <summary>
-        /// Cooldown for missions.
-        /// </summary>
-        public static readonly CVarDef<float>
-            SalvageExpeditionCooldown = CVarDef.Create("salvage.expedition_cooldown", 780f, CVar.REPLICATED);
-
-        /*
-         * Flavor
-         */
-
-        /// <summary>
-        ///     Flavor limit. This is to ensure that having a large mass of flavors in
-        ///     some food object won't spam a user with flavors.
-        /// </summary>
-        public static readonly CVarDef<int>
-            FlavorLimit = CVarDef.Create("flavor.limit", 10, CVar.SERVERONLY);
-
-        /*
-         * Mapping
-         */
-
-        /// <summary>
-        ///     Will mapping mode enable autosaves when it's activated?
-        /// </summary>
-        public static readonly CVarDef<bool>
-            AutosaveEnabled = CVarDef.Create("mapping.autosave", true, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Autosave interval in seconds.
-        /// </summary>
-        public static readonly CVarDef<float>
-            AutosaveInterval = CVarDef.Create("mapping.autosave_interval", 600f, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Directory in server user data to save to. Saves will be inside folders in this directory.
-        /// </summary>
-        public static readonly CVarDef<string>
-            AutosaveDirectory = CVarDef.Create("mapping.autosave_dir", "Autosaves", CVar.SERVERONLY);
-
-
-        /*
-         * Rules
-         */
-
-        /// <summary>
-        /// Time that players have to wait before rules can be accepted.
-        /// </summary>
-        public static readonly CVarDef<float> RulesWaitTime =
-            CVarDef.Create("rules.time", 60f, CVar.SERVER | CVar.REPLICATED);
-
-        /// <summary>
-        /// Don't show rules to localhost/loopback interface.
-        /// </summary>
-        public static readonly CVarDef<bool> RulesExemptLocal =
-            CVarDef.Create("rules.exempt_local", false, CVar.SERVERONLY);
-
-
-        /*
-         * Autogeneration
-         */
-
-        public static readonly CVarDef<string> DestinationFile =
-            CVarDef.Create("autogen.destination_file", "", CVar.SERVER | CVar.SERVERONLY);
-
-        /*
-         * Network Resource Manager
-         */
-
-        /// <summary>
-        /// Whether uploaded files will be stored in the server's database.
-        /// This is useful to keep "logs" on what files admins have uploaded in the past.
-        /// </summary>
-        public static readonly CVarDef<bool> ResourceUploadingStoreEnabled =
-            CVarDef.Create("netres.store_enabled", true, CVar.SERVER | CVar.SERVERONLY);
-
-        /// <summary>
-        /// Numbers of days before stored uploaded files are deleted. Set to zero or negative to disable auto-delete.
-        /// This is useful to free some space automatically. Auto-deletion runs only on server boot.
-        /// </summary>
-        public static readonly CVarDef<int> ResourceUploadingStoreDeletionDays =
-            CVarDef.Create("netres.store_deletion_days", 30, CVar.SERVER | CVar.SERVERONLY);
-
-        /*
-         * Controls
-         */
-
-        /// <summary>
-        /// Deadzone for drag-drop interactions.
-        /// </summary>
-        public static readonly CVarDef<float> DragDropDeadZone =
-            CVarDef.Create("control.drag_dead_zone", 12f, CVar.CLIENTONLY | CVar.ARCHIVE);
-
-        /// <summary>
-        /// Toggles whether the walking key is a toggle or a held key.
-        /// </summary>
-        public static readonly CVarDef<bool> ToggleWalk =
-            CVarDef.Create("control.toggle_walk", false, CVar.CLIENTONLY | CVar.ARCHIVE);
-
-        /*
-         * Interactions
-         */
-
-        // The rationale behind the default limit is simply that I can easily get to 7 interactions per second by just
-        // trying to spam toggle a light switch or lever (though the UseDelay component limits the actual effect of the
-        // interaction).  I don't want to accidentally spam admins with alerts just because somebody is spamming a
-        // key manually, nor do we want to alert them just because the player is having network issues and the server
-        // receives multiple interactions at once. But we also want to try catch people with modified clients that spam
-        // many interactions on the same tick. Hence, a very short period, with a relatively high count.
-
-        /// <summary>
-        /// Maximum number of interactions that a player can perform within <see cref="InteractionRateLimitCount"/> seconds
-        /// </summary>
-        public static readonly CVarDef<int> InteractionRateLimitCount =
-            CVarDef.Create("interaction.rate_limit_count", 5, CVar.SERVER | CVar.REPLICATED);
-
-        /// <seealso cref="InteractionRateLimitCount"/>
-        public static readonly CVarDef<float> InteractionRateLimitPeriod =
-            CVarDef.Create("interaction.rate_limit_period", 0.5f, CVar.SERVER | CVar.REPLICATED);
-
-        /// <summary>
-        /// Minimum delay (in seconds) between notifying admins about interaction rate limit violations. A negative
-        /// value disables admin announcements.
-        /// </summary>
-        public static readonly CVarDef<int> InteractionRateLimitAnnounceAdminsDelay =
-            CVarDef.Create("interaction.rate_limit_announce_admins_delay", 120, CVar.SERVERONLY);
-
-        /*
-         * STORAGE
-         */
-
-        /// <summary>
-        /// Whether or not the storage UI is static and bound to the hotbar, or unbound and allowed to be dragged anywhere.
-        /// </summary>
-        public static readonly CVarDef<bool> StaticStorageUI =
-            CVarDef.Create("control.static_storage_ui", true, CVar.CLIENTONLY | CVar.ARCHIVE);
-
-        /// <summary>
-        /// Whether or not the storage window uses a transparent or opaque sprite.
-        /// </summary>
-        public static readonly CVarDef<bool> OpaqueStorageWindow =
-            CVarDef.Create("control.opaque_storage_background", false, CVar.CLIENTONLY | CVar.ARCHIVE);
-
-        /*
-         * UPDATE
-         */
-
-        /// <summary>
-        /// If a server update restart is pending, the delay after the last player leaves before we actually restart. In seconds.
-        /// </summary>
-        public static readonly CVarDef<float> UpdateRestartDelay =
-            CVarDef.Create("update.restart_delay", 20f, CVar.SERVERONLY);
-
-        /*
-         * Ghost
-         */
-
-        /// <summary>
-        /// The time you must spend reading the rules, before the "Request" button is enabled
-        /// </summary>
-        public static readonly CVarDef<float> GhostRoleTime =
-            CVarDef.Create("ghost.role_time", 3f, CVar.REPLICATED | CVar.SERVER);
-
-        /// <summary>
-        /// If ghost role lotteries should be made near-instanteous.
-        /// </summary>
-        public static readonly CVarDef<bool> GhostQuickLottery =
-            CVarDef.Create("ghost.quick_lottery", false, CVar.SERVERONLY);
-
-        /// <summary>
-        /// Whether or not to kill the player's mob on ghosting, when it is in a critical health state.
-        /// </summary>
-        public static readonly CVarDef<bool> GhostKillCrit =
-            CVarDef.Create("ghost.kill_crit", true, CVar.REPLICATED | CVar.SERVER);
-
-        /*
-         * Fire alarm
-         */
-
-        /// <summary>
-        ///     If fire alarms should have all access, or if activating/resetting these
-        ///     should be restricted to what is dictated on a player's access card.
-        ///     Defaults to true.
-        /// </summary>
-        public static readonly CVarDef<bool> FireAlarmAllAccess =
-            CVarDef.Create("firealarm.allaccess", true, CVar.SERVERONLY);
-
-        /*
-         * PLAYTIME
-         */
-
-        /// <summary>
-        /// Time between play time autosaves, in seconds.
-        /// </summary>
-        public static readonly CVarDef<float>
-            PlayTimeSaveInterval = CVarDef.Create("playtime.save_interval", 900f, CVar.SERVERONLY);
-
-        /*
-         * INFOLINKS
-         */
-
-        /// <summary>
-        /// Link to Discord server to show in the launcher.
-        /// </summary>
-        public static readonly CVarDef<string> InfoLinksDiscord =
-            CVarDef.Create("infolinks.discord", "", CVar.SERVER | CVar.REPLICATED);
-
-        /// <summary>
-        /// Link to website to show in the launcher.
-        /// </summary>
-        public static readonly CVarDef<string> InfoLinksForum =
-            CVarDef.Create("infolinks.forum", "", CVar.SERVER | CVar.REPLICATED);
-
-        /// <summary>
-        /// Link to GitHub page to show in the launcher.
-        /// </summary>
-        public static readonly CVarDef<string> InfoLinksGithub =
-            CVarDef.Create("infolinks.github", "", CVar.SERVER | CVar.REPLICATED);
-
-        /// <summary>
-        /// Link to website to show in the launcher.
-        /// </summary>
-        public static readonly CVarDef<string> InfoLinksWebsite =
-            CVarDef.Create("infolinks.website", "", CVar.SERVER | CVar.REPLICATED);
-
-        /// <summary>
-        /// Link to wiki to show in the launcher.
-        /// </summary>
-        public static readonly CVarDef<string> InfoLinksWiki =
-            CVarDef.Create("infolinks.wiki", "", CVar.SERVER | CVar.REPLICATED);
-
-        /// <summary>
-        /// Link to Patreon. Not shown in the launcher currently.
-        /// </summary>
-        public static readonly CVarDef<string> InfoLinksPatreon =
-            CVarDef.Create("infolinks.patreon", "", CVar.SERVER | CVar.REPLICATED);
-
-        /// <summary>
-        /// Link to the bug report form.
-        /// </summary>
-        public static readonly CVarDef<string> InfoLinksBugReport =
-            CVarDef.Create("infolinks.bug_report", "", CVar.SERVER | CVar.REPLICATED);
-
-        /// <summary>
-        /// Link to site handling ban appeals. Shown in ban disconnect messages.
-        /// </summary>
-        public static readonly CVarDef<string> InfoLinksAppeal =
-            CVarDef.Create("infolinks.appeal", "", CVar.SERVER | CVar.REPLICATED);
-
-        /*
-         * CONFIG
-         */
-
-        // These are server-only for now since I don't foresee a client use yet,
-        // and I don't wanna have to start coming up with like .client suffixes and stuff like that.
-
-        /// <summary>
-        /// Configuration presets to load during startup.
-        /// Multiple presets can be separated by comma and are loaded in order.
-        /// </summary>
-        /// <remarks>
-        /// Loaded presets must be located under the <c>ConfigPresets/</c> resource directory and end with the <c>.toml</c> extension.
-        /// Only the file name (without extension) must be given for this variable.
-        /// </remarks>
-        public static readonly CVarDef<string> ConfigPresets =
-            CVarDef.Create("config.presets", "", CVar.SERVERONLY);
-
-        /// <summary>
-        /// Whether to load the preset development CVars.
-        /// This disables some things like lobby to make development easier.
-        /// Even when true, these are only loaded if the game is compiled with <c>DEVELOPMENT</c> set.
-        /// </summary>
-        public static readonly CVarDef<bool> ConfigPresetDevelopment =
-            CVarDef.Create("config.preset_development", true, CVar.SERVERONLY);
-
-        /// <summary>
-        /// Whether to load the preset debug CVars.
-        /// Even when true, these are only loaded if the game is compiled with <c>DEBUG</c> set.
-        /// </summary>
-        public static readonly CVarDef<bool> ConfigPresetDebug =
-            CVarDef.Create("config.preset_debug", true, CVar.SERVERONLY);
-
-        /*
-         * World Generation
-         */
-        /// <summary>
-        ///     Whether or not world generation is enabled.
-        /// </summary>
-        public static readonly CVarDef<bool> WorldgenEnabled =
-            CVarDef.Create("worldgen.enabled", false, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     The worldgen config to use.
-        /// </summary>
-        public static readonly CVarDef<string> WorldgenConfig =
-            CVarDef.Create("worldgen.worldgen_config", "Default", CVar.SERVERONLY);
-
-        /// <summary>
-        ///     The maximum amount of time the entity GC can process, in ms.
-        /// </summary>
-        public static readonly CVarDef<int> GCMaximumTimeMs =
-            CVarDef.Create("entgc.maximum_time_ms", 5, CVar.SERVERONLY);
-
-        /*
-         * Replays
-         */
-
-        /// <summary>
-        ///     Whether or not to record admin chat. If replays are being publicly distributes, this should probably be
-        ///     false.
-        /// </summary>
-        public static readonly CVarDef<bool> ReplayRecordAdminChat =
-            CVarDef.Create("replay.record_admin_chat", false, CVar.ARCHIVE);
-
-        /// <summary>
-        /// Automatically record full rounds as replays.
-        /// </summary>
-        public static readonly CVarDef<bool> ReplayAutoRecord =
-            CVarDef.Create("replay.auto_record", false, CVar.SERVERONLY);
-
-        /// <summary>
-        /// The file name to record automatic replays to. The path is relative to <see cref="CVars.ReplayDirectory"/>.
-        /// </summary>
-        /// <remarks>
-        /// <para>
-        /// If the path includes slashes, directories will be automatically created if necessary.
-        /// </para>
-        /// <para>
-        /// A number of substitutions can be used to automatically fill in the file name: <c>{year}</c>, <c>{month}</c>, <c>{day}</c>, <c>{hour}</c>, <c>{minute}</c>, <c>{round}</c>.
-        /// </para>
-        /// </remarks>
-        public static readonly CVarDef<string> ReplayAutoRecordName =
-            CVarDef.Create("replay.auto_record_name", "{year}_{month}_{day}-{hour}_{minute}-round_{round}.zip", CVar.SERVERONLY);
-
-        /// <summary>
-        /// Path that, if provided, automatic replays are initially recorded in.
-        /// When the recording is done, the file is moved into its final destination.
-        /// Unless this path is rooted, it will be relative to <see cref="CVars.ReplayDirectory"/>.
-        /// </summary>
-        public static readonly CVarDef<string> ReplayAutoRecordTempDir =
-            CVarDef.Create("replay.auto_record_temp_dir", "", CVar.SERVERONLY);
-
-        /*
-         * Miscellaneous
-         */
-
-        public static readonly CVarDef<bool> GatewayGeneratorEnabled =
-            CVarDef.Create("gateway.generator_enabled", true);
-
-        // Clippy!
-        public static readonly CVarDef<string> TippyEntity =
-            CVarDef.Create("tippy.entity", "Tippy", CVar.SERVER | CVar.REPLICATED);
-
-        /// <summary>
-        ///     The number of seconds that must pass for a single entity to be able to point at something again.
-        /// </summary>
-        public static readonly CVarDef<float> PointingCooldownSeconds =
-            CVarDef.Create("pointing.cooldown_seconds", 0.5f, CVar.SERVERONLY);
-
-        /*
-         * DEBUG
-         */
-
-        /// <summary>
-        /// A simple toggle to test <c>OptionsVisualizerComponent</c>.
-        /// </summary>
-        public static readonly CVarDef<bool> DebugOptionVisualizerTest =
-            CVarDef.Create("debug.option_visualizer_test", false, CVar.CLIENTONLY);
-
-        /// <summary>
-        /// Set to true to disable parallel processing in the pow3r solver.
-        /// </summary>
-        public static readonly CVarDef<bool> DebugPow3rDisableParallel =
-            CVarDef.Create("debug.pow3r_disable_parallel", true, CVar.SERVERONLY);
-
-        /// DELTA-V CCVARS
-        /*
-         * Glimmer
-         */
-
-        /// <summary>
-        ///    Whether glimmer is enabled.
-        /// </summary>
-        public static readonly CVarDef<bool> GlimmerEnabled =
-            CVarDef.Create("glimmer.enabled", true, CVar.REPLICATED);
-
-        /// <summary>
-        ///     Passive glimmer drain per second.
-        ///     Note that this is randomized and this is an average value.
-        /// </summary>
-        public static readonly CVarDef<float> GlimmerLostPerSecond =
-            CVarDef.Create("glimmer.passive_drain_per_second", 0.1f, CVar.SERVERONLY);
-
-        /// <summary>
-        ///     Whether random rolls for psionics are allowed.
-        ///     Guaranteed psionics will still go through.
-        /// </summary>
-        public static readonly CVarDef<bool> PsionicRollsEnabled =
-            CVarDef.Create("psionics.rolls_enabled", true, CVar.SERVERONLY);
-    }
+/// <summary>
+/// Contains all the CVars used by content.
+/// </summary>
+/// <remarks>
+/// NOTICE FOR FORKS: Put your own CVars in a separate file with a different [CVarDefs] attribute. RT will automatically pick up on it.
+/// </remarks>
+[CVarDefs]
+public sealed partial class CCVars : CVars
+{
+    // Only debug stuff lives here.
+
+    /// <summary>
+    /// A simple toggle to test <c>OptionsVisualizerComponent</c>.
+    /// </summary>
+    public static readonly CVarDef<bool> DebugOptionVisualizerTest =
+        CVarDef.Create("debug.option_visualizer_test", false, CVar.CLIENTONLY);
+
+    /// <summary>
+    /// Set to true to disable parallel processing in the pow3r solver.
+    /// </summary>
+    public static readonly CVarDef<bool> DebugPow3rDisableParallel =
+        CVarDef.Create("debug.pow3r_disable_parallel", true, CVar.SERVERONLY);
 }
diff --git a/Content.Shared/CartridgeLoader/CartridgeUiMessage.cs b/Content.Shared/CartridgeLoader/CartridgeUiMessage.cs
index 1155030f938..31ac8bd2d06 100644
--- a/Content.Shared/CartridgeLoader/CartridgeUiMessage.cs
+++ b/Content.Shared/CartridgeLoader/CartridgeUiMessage.cs
@@ -17,4 +17,7 @@ public CartridgeUiMessage(CartridgeMessageEvent messageEvent)
 public abstract class CartridgeMessageEvent : EntityEventArgs
 {
     public NetEntity LoaderUid;
+
+    [NonSerialized]
+    public EntityUid Actor;
 }
diff --git a/Content.Shared/Chemistry/Components/InjectorComponent.cs b/Content.Shared/Chemistry/Components/InjectorComponent.cs
index 17a65ef1c17..ebd6654d9f5 100644
--- a/Content.Shared/Chemistry/Components/InjectorComponent.cs
+++ b/Content.Shared/Chemistry/Components/InjectorComponent.cs
@@ -45,6 +45,15 @@ public sealed partial class InjectorComponent : Component
     [DataField]
     public bool IgnoreMobs;
 
+    /// <summary>
+    /// Whether or not the injector is able to draw from or inject into containers that are closed/sealed
+    /// </summary>
+    /// <remarks>
+    ///     for example: droppers can not inject into cans, but syringes can
+    /// </remarks>
+    [DataField]
+    public bool IgnoreClosed = true;
+
     /// <summary>
     ///     The minimum amount of solution that can be transferred at once from this solution.
     /// </summary>
diff --git a/Content.Shared/DeltaV/CCVars/DCCVars.cs b/Content.Shared/DeltaV/CCVars/DCCVars.cs
index 893cc472f6f..984ff2778af 100644
--- a/Content.Shared/DeltaV/CCVars/DCCVars.cs
+++ b/Content.Shared/DeltaV/CCVars/DCCVars.cs
@@ -9,6 +9,30 @@ namespace Content.Shared.DeltaV.CCVars;
 // ReSharper disable once InconsistentNaming - Shush you
 public sealed class DCCVars
 {
+    /*
+     * Glimmer
+     */
+
+    /// <summary>
+    ///    Whether glimmer is enabled.
+    /// </summary>
+    public static readonly CVarDef<bool> GlimmerEnabled =
+        CVarDef.Create("glimmer.enabled", true, CVar.REPLICATED);
+
+    /// <summary>
+    ///     Passive glimmer drain per second.
+    ///     Note that this is randomized and this is an average value.
+    /// </summary>
+    public static readonly CVarDef<float> GlimmerLostPerSecond =
+        CVarDef.Create("glimmer.passive_drain_per_second", 0.1f, CVar.SERVERONLY);
+
+    /// <summary>
+    ///     Whether random rolls for psionics are allowed.
+    ///     Guaranteed psionics will still go through.
+    /// </summary>
+    public static readonly CVarDef<bool> PsionicRollsEnabled =
+        CVarDef.Create("psionics.rolls_enabled", true, CVar.SERVERONLY);
+
     /// <summary>
     /// Anti-EORG measure. Will add pacified to all players upon round end.
     /// Its not perfect, but gets the job done.
@@ -16,6 +40,10 @@ public sealed class DCCVars
     public static readonly CVarDef<bool> RoundEndPacifist =
         CVarDef.Create("game.round_end_pacifist", false, CVar.SERVERONLY);
 
+    /*
+     * No EORG
+     */
+
     /// <summary>
     /// Whether the no EORG popup is enabled.
     /// </summary>
@@ -34,6 +62,10 @@ public sealed class DCCVars
     public static readonly CVarDef<float> RoundEndNoEorgPopupTime =
         CVarDef.Create("game.round_end_eorg_popup_time", 5f, CVar.SERVER | CVar.REPLICATED);
 
+    /*
+     * Misc.
+     */
+
     /// <summary>
     /// Disables all vision filters for species like Vulpkanin or Harpies. There are good reasons someone might want to disable these.
     /// </summary>
diff --git a/Content.Shared/Intellicard/Components/IntellicardComponent.cs b/Content.Shared/Intellicard/Components/IntellicardComponent.cs
new file mode 100644
index 00000000000..e27174977fb
--- /dev/null
+++ b/Content.Shared/Intellicard/Components/IntellicardComponent.cs
@@ -0,0 +1,39 @@
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Intellicard;
+
+/// <summary>
+/// Allows this entity to download the station AI onto an AiHolderComponent.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class IntellicardComponent : Component
+{
+    /// <summary>
+    /// The duration it takes to download the AI from an AiHolder.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public int DownloadTime = 15;
+
+    /// <summary>
+    /// The duration it takes to upload the AI to an AiHolder.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public int UploadTime = 3;
+
+    /// <summary>
+    /// The sound that plays for the AI
+    /// when they are being downloaded
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public SoundSpecifier? WarningSound = new SoundPathSpecifier("/Audio/Misc/notice2.ogg");
+
+    /// <summary>
+    /// The delay before allowing the warning to play again in seconds.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan WarningDelay = TimeSpan.FromSeconds(8);
+
+    [ViewVariables]
+    public TimeSpan NextWarningAllowed = TimeSpan.Zero;
+}
diff --git a/Content.Shared/Interaction/InteractionPopupSystem.cs b/Content.Shared/Interaction/InteractionPopupSystem.cs
index 20c079dfd8c..8df0035fc98 100644
--- a/Content.Shared/Interaction/InteractionPopupSystem.cs
+++ b/Content.Shared/Interaction/InteractionPopupSystem.cs
@@ -159,4 +159,26 @@ private void SharedInteract(
             _audio.PlayEntity(sfx, Filter.Empty().FromEntities(target), target, false);
         }
     }
+
+    /// <summary>
+    /// Sets <see cref="InteractionPopupComponent.InteractSuccessString"/>.
+    /// </summary>
+    /// <para>
+    /// This field is not networked automatically, so this method must be called on both sides of the network.
+    /// </para>
+    public void SetInteractSuccessString(Entity<InteractionPopupComponent> ent, string str)
+    {
+        ent.Comp.InteractSuccessString = str;
+    }
+
+    /// <summary>
+    /// Sets <see cref="InteractionPopupComponent.InteractFailureString"/>.
+    /// </summary>
+    /// <para>
+    /// This field is not networked automatically, so this method must be called on both sides of the network.
+    /// </para>
+    public void SetInteractFailureString(Entity<InteractionPopupComponent> ent, string str)
+    {
+        ent.Comp.InteractFailureString = str;
+    }
 }
diff --git a/Content.Shared/Inventory/InventoryComponent.cs b/Content.Shared/Inventory/InventoryComponent.cs
index 629cf1169c4..61e0114ff24 100644
--- a/Content.Shared/Inventory/InventoryComponent.cs
+++ b/Content.Shared/Inventory/InventoryComponent.cs
@@ -7,10 +7,12 @@ namespace Content.Shared.Inventory;
 
 [RegisterComponent, NetworkedComponent]
 [Access(typeof(InventorySystem))]
+[AutoGenerateComponentState(true)]
 public sealed partial class InventoryComponent : Component
 {
     [DataField("templateId", customTypeSerializer: typeof(PrototypeIdSerializer<InventoryTemplatePrototype>))]
-    public string TemplateId { get; private set; } = "human";
+    [AutoNetworkedField]
+    public string TemplateId { get; set; } = "human";
 
     [DataField("speciesId")] public string? SpeciesId { get; set; }
 
@@ -32,3 +34,9 @@ public sealed partial class InventoryComponent : Component
     [DataField]
     public Dictionary<string, DisplacementData> MaleDisplacements = new();
 }
+
+/// <summary>
+/// Raised if the <see cref="InventoryComponent.TemplateId"/> of an inventory changed.
+/// </summary>
+[ByRefEvent]
+public struct InventoryTemplateUpdated;
diff --git a/Content.Shared/Inventory/InventorySystem.Slots.cs b/Content.Shared/Inventory/InventorySystem.Slots.cs
index 2522dd5d0a3..04d58c1cd52 100644
--- a/Content.Shared/Inventory/InventorySystem.Slots.cs
+++ b/Content.Shared/Inventory/InventorySystem.Slots.cs
@@ -1,4 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 using Content.Shared.Inventory.Events;
 using Content.Shared.Storage;
 using Robust.Shared.Containers;
@@ -19,6 +20,8 @@ private void InitializeSlots()
 
         _vvm.GetTypeHandler<InventoryComponent>()
             .AddHandler(HandleViewVariablesSlots, ListViewVariablesSlots);
+
+        SubscribeLocalEvent<InventoryComponent, AfterAutoHandleStateEvent>(AfterAutoState);
     }
 
     private void ShutdownSlots()
@@ -68,6 +71,27 @@ protected virtual void OnInit(EntityUid uid, InventoryComponent component, Compo
         }
     }
 
+    private void AfterAutoState(Entity<InventoryComponent> ent, ref AfterAutoHandleStateEvent args)
+    {
+        UpdateInventoryTemplate(ent);
+    }
+
+    protected virtual void UpdateInventoryTemplate(Entity<InventoryComponent> ent)
+    {
+        if (ent.Comp.LifeStage < ComponentLifeStage.Initialized)
+            return;
+
+        if (!_prototypeManager.TryIndex(ent.Comp.TemplateId, out InventoryTemplatePrototype? invTemplate))
+            return;
+
+        DebugTools.Assert(ent.Comp.Slots.Length == invTemplate.Slots.Length);
+
+        ent.Comp.Slots = invTemplate.Slots;
+
+        var ev = new InventoryTemplateUpdated();
+        RaiseLocalEvent(ent, ref ev);
+    }
+
     private void OnOpenSlotStorage(OpenSlotStorageNetworkMessage ev, EntitySessionEventArgs args)
     {
         if (args.SenderSession.AttachedEntity is not { Valid: true } uid)
@@ -170,6 +194,31 @@ private IEnumerable<string> ListViewVariablesSlots(EntityUid uid, InventoryCompo
         }
     }
 
+    /// <summary>
+    /// Change the inventory template ID an entity is using. The new template must be compatible.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// For an inventory template to be compatible with another, it must have exactly the same slot names.
+    /// All other changes are rejected.
+    /// </para>
+    /// </remarks>
+    /// <param name="ent">The entity to update.</param>
+    /// <param name="newTemplate">The ID of the new inventory template prototype.</param>
+    /// <exception cref="ArgumentException">
+    /// Thrown if the new template is not compatible with the existing one.
+    /// </exception>
+    public void SetTemplateId(Entity<InventoryComponent> ent, ProtoId<InventoryTemplatePrototype> newTemplate)
+    {
+        var newPrototype = _prototypeManager.Index(newTemplate);
+
+        if (!newPrototype.Slots.Select(x => x.Name).SequenceEqual(ent.Comp.Slots.Select(x => x.Name)))
+            throw new ArgumentException("Incompatible inventory template!");
+
+        ent.Comp.TemplateId = newTemplate;
+        Dirty(ent);
+    }
+
     /// <summary>
     /// Enumerator for iterating over an inventory's slot containers. Also has methods that skip empty containers.
     /// It should be safe to add or remove items while enumerating.
diff --git a/Content.Shared/Jaunt/JauntComponent.cs b/Content.Shared/Jaunt/JauntComponent.cs
new file mode 100644
index 00000000000..6d37ab4b322
--- /dev/null
+++ b/Content.Shared/Jaunt/JauntComponent.cs
@@ -0,0 +1,26 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Jaunt;
+
+/// <summary>
+///     Used to control various aspects of a Jaunt.
+///     Can be used in place of giving a jaunt-action directly.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class JauntComponent : Component
+{
+    /// <summary>
+    ///     Which Jaunt Action the component should grant.
+    /// </summary>
+    [DataField]
+    public EntProtoId JauntAction = "ActionPolymorphJaunt";
+
+    /// <summary>
+    ///     The jaunt action itself.
+    /// </summary>
+    public EntityUid? Action;
+
+    // TODO: Enter & Exit Times and Whitelist when Actions are reworked and can support it
+    // TODO: Cooldown pausing when Actions can support it
+}
diff --git a/Content.Shared/Jaunt/JauntSystem.cs b/Content.Shared/Jaunt/JauntSystem.cs
new file mode 100644
index 00000000000..d9263d000e4
--- /dev/null
+++ b/Content.Shared/Jaunt/JauntSystem.cs
@@ -0,0 +1,26 @@
+using Content.Shared.Actions;
+
+namespace Content.Shared.Jaunt;
+public sealed class JauntSystem : EntitySystem
+{
+    [Dependency] private readonly SharedActionsSystem _actions = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<JauntComponent, MapInitEvent>(OnInit);
+        SubscribeLocalEvent<JauntComponent, ComponentShutdown>(OnShutdown);
+    }
+
+    private void OnInit(Entity<JauntComponent> ent, ref MapInitEvent args)
+    {
+        _actions.AddAction(ent.Owner, ref ent.Comp.Action, ent.Comp.JauntAction);
+    }
+
+    private void OnShutdown(Entity<JauntComponent> ent, ref ComponentShutdown args)
+    {
+        _actions.RemoveAction(ent.Owner, ent.Comp.Action);
+    }
+
+}
+
diff --git a/Content.Shared/Movement/Systems/SharedMoverController.Input.cs b/Content.Shared/Movement/Systems/SharedMoverController.Input.cs
index 9dda249423e..c11df709f63 100644
--- a/Content.Shared/Movement/Systems/SharedMoverController.Input.cs
+++ b/Content.Shared/Movement/Systems/SharedMoverController.Input.cs
@@ -1,4 +1,5 @@
 using System.Numerics;
+using Content.Shared.Alert;
 using Content.Shared.CCVar;
 using Content.Shared.Follower.Components;
 using Content.Shared.Input;
@@ -8,6 +9,7 @@
 using Robust.Shared.Input;
 using Robust.Shared.Input.Binding;
 using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
@@ -21,6 +23,8 @@ public abstract partial class SharedMoverController
     {
         public bool CameraRotationLocked { get; set; }
 
+        public static ProtoId<AlertPrototype> WalkingAlert = "Walking";
+
         private void InitializeInput()
         {
             var moveUpCmdHandler = new MoverDirInputCmdHandler(this, Direction.North);
@@ -460,7 +464,7 @@ private void ResetSubtick(InputMoverComponent component)
             component.LastInputSubTick = 0;
         }
 
-        public void SetSprinting(Entity<InputMoverComponent> entity, ushort subTick, bool walking)
+        public virtual void SetSprinting(Entity<InputMoverComponent> entity, ushort subTick, bool walking)
         {
             // Logger.Info($"[{_gameTiming.CurTick}/{subTick}] Sprint: {enabled}");
 
diff --git a/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs b/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs
index 6196669c190..6a6dd7af782 100644
--- a/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs
@@ -33,18 +33,10 @@ public sealed class HungerSystem : EntitySystem
     [ValidatePrototypeId<SatiationIconPrototype>]
     private const string HungerIconStarvingId = "HungerIconStarving";
 
-    private SatiationIconPrototype? _hungerIconOverfed;
-    private SatiationIconPrototype? _hungerIconPeckish;
-    private SatiationIconPrototype? _hungerIconStarving;
-
     public override void Initialize()
     {
         base.Initialize();
 
-        DebugTools.Assert(_prototype.TryIndex(HungerIconOverfedId, out _hungerIconOverfed) &&
-                          _prototype.TryIndex(HungerIconPeckishId, out _hungerIconPeckish) &&
-                          _prototype.TryIndex(HungerIconStarvingId, out _hungerIconStarving));
-
         SubscribeLocalEvent<HungerComponent, MapInitEvent>(OnMapInit);
         SubscribeLocalEvent<HungerComponent, ComponentShutdown>(OnShutdown);
         SubscribeLocalEvent<HungerComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshMovespeed);
@@ -221,13 +213,13 @@ public bool TryGetStatusIconPrototype(HungerComponent component, [NotNullWhen(tr
         switch (component.CurrentThreshold)
         {
             case HungerThreshold.Overfed:
-                prototype = _hungerIconOverfed;
+                _prototype.TryIndex(HungerIconOverfedId, out prototype);
                 break;
             case HungerThreshold.Peckish:
-                prototype = _hungerIconPeckish;
+                _prototype.TryIndex(HungerIconPeckishId, out prototype);
                 break;
             case HungerThreshold.Starving:
-                prototype = _hungerIconStarving;
+                _prototype.TryIndex(HungerIconStarvingId, out prototype);
                 break;
             default:
                 prototype = null;
diff --git a/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs b/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs
index aa704354ba9..0b2bb2e0efa 100644
--- a/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs
@@ -9,6 +9,7 @@
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
+using System.Diagnostics.CodeAnalysis;
 
 namespace Content.Shared.Nutrition.EntitySystems;
 
@@ -31,18 +32,10 @@ public sealed class ThirstSystem : EntitySystem
     [ValidatePrototypeId<SatiationIconPrototype>]
     private const string ThirstIconParchedId = "ThirstIconParched";
 
-    private SatiationIconPrototype? _thirstIconOverhydrated = null;
-    private SatiationIconPrototype? _thirstIconThirsty = null;
-    private SatiationIconPrototype? _thirstIconParched = null;
-
     public override void Initialize()
     {
         base.Initialize();
 
-        DebugTools.Assert(_prototype.TryIndex(ThirstIconOverhydratedId, out _thirstIconOverhydrated) &&
-                          _prototype.TryIndex(ThirstIconThirstyId, out _thirstIconThirsty) &&
-                          _prototype.TryIndex(ThirstIconParchedId, out _thirstIconParched));
-
         SubscribeLocalEvent<ThirstComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshMovespeed);
         SubscribeLocalEvent<ThirstComponent, MapInitEvent>(OnMapInit);
         SubscribeLocalEvent<ThirstComponent, RejuvenateEvent>(OnRejuvenate);
@@ -128,26 +121,28 @@ private bool IsMovementThreshold(ThirstThreshold threshold)
         }
     }
 
-    public bool TryGetStatusIconPrototype(ThirstComponent component, out SatiationIconPrototype? prototype)
+    public bool TryGetStatusIconPrototype(ThirstComponent component, [NotNullWhen(true)] out SatiationIconPrototype? prototype)
     {
         switch (component.CurrentThirstThreshold)
         {
             case ThirstThreshold.OverHydrated:
-                prototype = _thirstIconOverhydrated;
-                return true;
+                _prototype.TryIndex(ThirstIconOverhydratedId, out prototype);
+                break;
 
             case ThirstThreshold.Thirsty:
-                prototype = _thirstIconThirsty;
-                return true;
+                _prototype.TryIndex(ThirstIconThirstyId, out prototype);
+                break;
 
             case ThirstThreshold.Parched:
-                prototype = _thirstIconParched;
-                return true;
+                _prototype.TryIndex(ThirstIconParchedId, out prototype);
+                break;
 
             default:
                 prototype = null;
-                return false;
+                break;
         }
+
+        return prototype != null;
     }
 
     private void UpdateEffects(EntityUid uid, ThirstComponent component)
diff --git a/Content.Shared/Nyanotrasen/Psionics/Glimmer/GlimmerSystem.cs b/Content.Shared/Nyanotrasen/Psionics/Glimmer/GlimmerSystem.cs
index 31af85bbb51..3fbb355ded1 100644
--- a/Content.Shared/Nyanotrasen/Psionics/Glimmer/GlimmerSystem.cs
+++ b/Content.Shared/Nyanotrasen/Psionics/Glimmer/GlimmerSystem.cs
@@ -1,6 +1,6 @@
 using Robust.Shared.Serialization;
 using Robust.Shared.Configuration;
-using Content.Shared.CCVar;
+using Content.Shared.DeltaV.CCVars;
 using Content.Shared.GameTicking;
 
 namespace Content.Shared.Psionics.Glimmer
@@ -22,8 +22,8 @@ public override void Initialize()
         {
             base.Initialize();
             SubscribeLocalEvent<RoundRestartCleanupEvent>(Reset);
-            _enabled = _cfg.GetCVar(CCVars.GlimmerEnabled);
-            _cfg.OnValueChanged(CCVars.GlimmerEnabled, value => _enabled = value, true);
+            _enabled = _cfg.GetCVar(DCCVars.GlimmerEnabled);
+            _cfg.OnValueChanged(DCCVars.GlimmerEnabled, value => _enabled = value, true);
         }
 
         private void Reset(RoundRestartCleanupEvent args)
diff --git a/Content.Shared/Overlays/ShowHealthBarsComponent.cs b/Content.Shared/Overlays/ShowHealthBarsComponent.cs
index 4642c5936a7..3f27885db18 100644
--- a/Content.Shared/Overlays/ShowHealthBarsComponent.cs
+++ b/Content.Shared/Overlays/ShowHealthBarsComponent.cs
@@ -2,7 +2,6 @@
 using Content.Shared.StatusIcon;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Shared.Overlays;
 
@@ -10,13 +9,18 @@ namespace Content.Shared.Overlays;
 /// This component allows you to see health bars above damageable mobs.
 /// </summary>
 [RegisterComponent, NetworkedComponent]
+[AutoGenerateComponentState(true)]
 public sealed partial class ShowHealthBarsComponent : Component
 {
     /// <summary>
     /// Displays health bars of the damage containers.
     /// </summary>
-    [DataField("damageContainers", customTypeSerializer: typeof(PrototypeIdListSerializer<DamageContainerPrototype>))]
-    public List<string> DamageContainers = new();
+    [DataField]
+    [AutoNetworkedField]
+    public List<ProtoId<DamageContainerPrototype>> DamageContainers = new()
+    {
+        "Biological"
+    };
 
     [DataField]
     public ProtoId<HealthIconPrototype>? HealthStatusIcon = "HealthIconFine";
diff --git a/Content.Shared/Overlays/ShowHealthIconsComponent.cs b/Content.Shared/Overlays/ShowHealthIconsComponent.cs
index c2526c2f401..bc8b5419d2a 100644
--- a/Content.Shared/Overlays/ShowHealthIconsComponent.cs
+++ b/Content.Shared/Overlays/ShowHealthIconsComponent.cs
@@ -1,6 +1,6 @@
 using Content.Shared.Damage.Prototypes;
 using Robust.Shared.GameStates;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Overlays;
 
@@ -8,11 +8,16 @@ namespace Content.Shared.Overlays;
 /// This component allows you to see health status icons above damageable mobs.
 /// </summary>
 [RegisterComponent, NetworkedComponent]
+[AutoGenerateComponentState(true)]
 public sealed partial class ShowHealthIconsComponent : Component
 {
     /// <summary>
     /// Displays health status icons of the damage containers.
     /// </summary>
-    [DataField("damageContainers", customTypeSerializer: typeof(PrototypeIdListSerializer<DamageContainerPrototype>))]
-    public List<string> DamageContainers = new();
+    [DataField]
+    [AutoNetworkedField]
+    public List<ProtoId<DamageContainerPrototype>> DamageContainers = new()
+    {
+        "Biological"
+    };
 }
diff --git a/Content.Shared/Polymorph/Components/ChameleonDisguiseComponent.cs b/Content.Shared/Polymorph/Components/ChameleonDisguiseComponent.cs
index f4a417c3714..282106b8f6f 100644
--- a/Content.Shared/Polymorph/Components/ChameleonDisguiseComponent.cs
+++ b/Content.Shared/Polymorph/Components/ChameleonDisguiseComponent.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Polymorph.Systems;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 
@@ -7,7 +8,8 @@ namespace Content.Shared.Polymorph.Components;
 /// Component added to disguise entities.
 /// Used by client to copy over appearance from the disguise's source entity.
 /// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
+[RegisterComponent, NetworkedComponent, Access(typeof(SharedChameleonProjectorSystem))]
+[AutoGenerateComponentState(true)]
 public sealed partial class ChameleonDisguiseComponent : Component
 {
     /// <summary>
diff --git a/Content.Shared/Polymorph/Components/ChameleonDisguisedComponent.cs b/Content.Shared/Polymorph/Components/ChameleonDisguisedComponent.cs
index e21f588544b..cd2e26c420a 100644
--- a/Content.Shared/Polymorph/Components/ChameleonDisguisedComponent.cs
+++ b/Content.Shared/Polymorph/Components/ChameleonDisguisedComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.FixedPoint;
+using Content.Shared.Polymorph.Systems;
 using Robust.Shared.GameStates;
 
 namespace Content.Shared.Polymorph.Components;
@@ -7,19 +7,14 @@ namespace Content.Shared.Polymorph.Components;
 /// Added to a player when they use a chameleon projector.
 /// Handles making them invisible and revealing when damaged enough or switching hands.
 /// </summary>
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, Access(typeof(SharedChameleonProjectorSystem))]
+[AutoGenerateComponentState]
 public sealed partial class ChameleonDisguisedComponent : Component
 {
-    /// <summary>
-    /// How much damage can be taken before revealing automatically.
-    /// </summary>
-    [DataField]
-    public FixedPoint2 Integrity = FixedPoint2.Zero;
-
     /// <summary>
     /// The disguise entity parented to the player.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public EntityUid Disguise;
 
     /// <summary>
diff --git a/Content.Shared/Polymorph/Components/ChameleonProjectorComponent.cs b/Content.Shared/Polymorph/Components/ChameleonProjectorComponent.cs
index 092109a933e..1b289c54fc7 100644
--- a/Content.Shared/Polymorph/Components/ChameleonProjectorComponent.cs
+++ b/Content.Shared/Polymorph/Components/ChameleonProjectorComponent.cs
@@ -1,4 +1,3 @@
-using Content.Shared.Polymorph;
 using Content.Shared.Polymorph.Systems;
 using Content.Shared.Whitelist;
 using Robust.Shared.Prototypes;
@@ -58,24 +57,6 @@ public sealed partial class ChameleonProjectorComponent : Component
     [DataField]
     public float MaxHealth = 100f;
 
-    /// <summary>
-    /// Popup shown to the user when they try to disguise as an entity inside a container.
-    /// </summary>
-    [DataField]
-    public LocId ContainerPopup = "chameleon-projector-inside-container";
-
-    /// <summary>
-    /// Popup shown to the user when they try to disguise as an invalid entity.
-    /// </summary>
-    [DataField]
-    public LocId InvalidPopup = "chameleon-projector-invalid";
-
-    /// <summary>
-    /// Popup shown to the user when they disguise as a valid entity.
-    /// </summary>
-    [DataField]
-    public LocId SuccessPopup = "chameleon-projector-success";
-
     /// <summary>
     /// User currently disguised by this projector, if any
     /// </summary>
diff --git a/Content.Shared/Polymorph/PolymorphPrototype.cs b/Content.Shared/Polymorph/PolymorphPrototype.cs
index 6d010711d2e..c0576694084 100644
--- a/Content.Shared/Polymorph/PolymorphPrototype.cs
+++ b/Content.Shared/Polymorph/PolymorphPrototype.cs
@@ -1,3 +1,4 @@
+using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Array;
 
@@ -115,6 +116,18 @@ public sealed partial record PolymorphConfiguration
     [DataField(serverOnly: true)]
     [ViewVariables(VVAccess.ReadWrite)]
     public TimeSpan Cooldown = TimeSpan.Zero;
+
+    /// <summary>
+    ///     If not null, this sound will be played when being polymorphed into something.
+    /// </summary>
+    [DataField]
+    public SoundSpecifier? PolymorphSound;
+
+    /// <summary>
+    ///     If not null, this sound will be played when being reverted from a polymorph.
+    /// </summary>
+    [DataField]
+    public SoundSpecifier? ExitPolymorphSound;
 }
 
 public enum PolymorphInventoryChange : byte
diff --git a/Content.Shared/Polymorph/Systems/SharedChameleonProjectorSystem.cs b/Content.Shared/Polymorph/Systems/SharedChameleonProjectorSystem.cs
index 829e10eddad..99737996b08 100644
--- a/Content.Shared/Polymorph/Systems/SharedChameleonProjectorSystem.cs
+++ b/Content.Shared/Polymorph/Systems/SharedChameleonProjectorSystem.cs
@@ -1,23 +1,19 @@
 using Content.Shared.Actions;
-using Content.Shared.Construction.Components;
+using Content.Shared.Coordinates;
 using Content.Shared.Damage;
 using Content.Shared.Hands;
 using Content.Shared.Interaction;
 using Content.Shared.Item;
-using Content.Shared.Mobs;
-using Content.Shared.Mobs.Components;
-using Content.Shared.Mobs.Systems;
-using Content.Shared.Polymorph;
 using Content.Shared.Polymorph.Components;
 using Content.Shared.Popups;
 using Content.Shared.Storage.Components;
+using Content.Shared.Verbs;
+using Content.Shared.Whitelist;
 using Robust.Shared.Containers;
 using Robust.Shared.Network;
-using Robust.Shared.Physics.Components;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager;
 using System.Diagnostics.CodeAnalysis;
-using Content.Shared.Whitelist;
 
 namespace Content.Shared.Polymorph.Systems;
 
@@ -27,29 +23,29 @@ namespace Content.Shared.Polymorph.Systems;
 /// </summary>
 public abstract class SharedChameleonProjectorSystem : EntitySystem
 {
+    [Dependency] private readonly DamageableSystem _damageable = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
     [Dependency] private readonly INetManager _net = default!;
     [Dependency] private readonly IPrototypeManager _proto = default!;
     [Dependency] private readonly ISerializationManager _serMan = default!;
     [Dependency] private readonly MetaDataSystem _meta = default!;
-    [Dependency] private readonly MobThresholdSystem _mobThreshold = default!;
     [Dependency] private readonly SharedActionsSystem _actions = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] private readonly SharedContainerSystem _container = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly SharedTransformSystem _xform = default!;
-    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<ChameleonDisguiseComponent, GotEquippedHandEvent>(OnDisguiseEquippedHand);
+        SubscribeLocalEvent<ChameleonDisguiseComponent, InteractHandEvent>(OnDisguiseInteractHand, before: [typeof(SharedItemSystem)]);
+        SubscribeLocalEvent<ChameleonDisguiseComponent, DamageChangedEvent>(OnDisguiseDamaged);
         SubscribeLocalEvent<ChameleonDisguiseComponent, InsertIntoEntityStorageAttemptEvent>(OnDisguiseInsertAttempt);
         SubscribeLocalEvent<ChameleonDisguiseComponent, ComponentShutdown>(OnDisguiseShutdown);
 
-        SubscribeLocalEvent<ChameleonDisguisedComponent, DamageChangedEvent>(OnDamageChanged);
-
         SubscribeLocalEvent<ChameleonProjectorComponent, AfterInteractEvent>(OnInteract);
+        SubscribeLocalEvent<ChameleonProjectorComponent, GetVerbsEvent<UtilityVerb>>(OnGetVerbs);
         SubscribeLocalEvent<ChameleonProjectorComponent, DisguiseToggleNoRotEvent>(OnToggleNoRot);
         SubscribeLocalEvent<ChameleonProjectorComponent, DisguiseToggleAnchoredEvent>(OnToggleAnchored);
         SubscribeLocalEvent<ChameleonProjectorComponent, HandDeselectedEvent>(OnDeselected);
@@ -59,12 +55,19 @@ public override void Initialize()
 
     #region Disguise entity
 
-    private void OnDisguiseEquippedHand(Entity<ChameleonDisguiseComponent> ent, ref GotEquippedHandEvent args)
+    private void OnDisguiseInteractHand(Entity<ChameleonDisguiseComponent> ent, ref InteractHandEvent args)
     {
         TryReveal(ent.Comp.User);
         args.Handled = true;
     }
 
+    private void OnDisguiseDamaged(Entity<ChameleonDisguiseComponent> ent, ref DamageChangedEvent args)
+    {
+        // this mirrors damage 1:1
+        if (args.DamageDelta is {} damage)
+            _damageable.TryChangeDamage(ent.Comp.User, damage);
+    }
+
     private void OnDisguiseInsertAttempt(Entity<ChameleonDisguiseComponent> ent, ref InsertIntoEntityStorageAttemptEvent args)
     {
         // stay parented to the user, not the storage
@@ -78,47 +81,51 @@ private void OnDisguiseShutdown(Entity<ChameleonDisguiseComponent> ent, ref Comp
 
     #endregion
 
-    #region Disguised player
+    #region Projector
 
-    private void OnDamageChanged(Entity<ChameleonDisguisedComponent> ent, ref DamageChangedEvent args)
+    private void OnInteract(Entity<ChameleonProjectorComponent> ent, ref AfterInteractEvent args)
     {
-        if (args.DamageDelta is not {} damage)
+        if (args.Handled || !args.CanReach || args.Target is not {} target)
             return;
 
-        // reveal once enough damage is taken for the disguise to reveal itself
-        var total = damage.GetTotal();
-        if (total > ent.Comp.Integrity)
-            TryReveal((ent, ent.Comp));
-        else
-            ent.Comp.Integrity -= total;
+        args.Handled = true;
+        TryDisguise(ent, args.User, target);
     }
 
-    #endregion
-
-    #region Projector
-
-    private void OnInteract(Entity<ChameleonProjectorComponent> ent, ref AfterInteractEvent args)
+    private void OnGetVerbs(Entity<ChameleonProjectorComponent> ent, ref GetVerbsEvent<UtilityVerb> args)
     {
-        if (!args.CanReach || args.Target is not {} target)
+        if (!args.CanAccess)
             return;
 
         var user = args.User;
-        args.Handled = true;
+        var target = args.Target;
+        args.Verbs.Add(new UtilityVerb()
+        {
+            Act = () =>
+            {
+                TryDisguise(ent, user, target);
+            },
+            Text = Loc.GetString("chameleon-projector-set-disguise")
+        });
+    }
 
+    public bool TryDisguise(Entity<ChameleonProjectorComponent> ent, EntityUid user, EntityUid target)
+    {
         if (_container.IsEntityInContainer(target))
         {
-            _popup.PopupClient(Loc.GetString(ent.Comp.ContainerPopup), target, user);
-            return;
+            _popup.PopupClient(Loc.GetString("chameleon-projector-inside-container"), target, user);
+            return false;
         }
 
         if (IsInvalid(ent.Comp, target))
         {
-            _popup.PopupClient(Loc.GetString(ent.Comp.InvalidPopup), target, user);
-            return;
+            _popup.PopupClient(Loc.GetString("chameleon-projector-invalid"), target, user);
+            return false;
         }
 
-        _popup.PopupClient(Loc.GetString(ent.Comp.SuccessPopup), target, user);
+        _popup.PopupClient(Loc.GetString("chameleon-projector-success"), target, user);
         Disguise(ent, user, target);
+        return true;
     }
 
     private void OnToggleNoRot(Entity<ChameleonProjectorComponent> ent, ref DisguiseToggleNoRotEvent args)
@@ -170,8 +177,8 @@ private void OnProjectorShutdown(Entity<ChameleonProjectorComponent> ent, ref Co
     /// </summary>
     public bool IsInvalid(ChameleonProjectorComponent comp, EntityUid target)
     {
-        return _whitelistSystem.IsWhitelistFail(comp.Whitelist, target)
-            || _whitelistSystem.IsBlacklistPass(comp.Blacklist, target);
+        return _whitelist.IsWhitelistFail(comp.Whitelist, target)
+            || _whitelist.IsBlacklistPass(comp.Blacklist, target);
     }
 
     /// <summary>
@@ -194,10 +201,7 @@ public void Disguise(Entity<ChameleonProjectorComponent> ent, EntityUid user, En
 
         proj.Disguised = user;
 
-        var xform = Transform(user);
-        var disguise = Spawn(proj.DisguiseProto, xform.Coordinates);
-        var disguiseXform = Transform(disguise);
-        _xform.SetParent(disguise, disguiseXform, user, xform);
+        var disguise = SpawnAttachedTo(proj.DisguiseProto, user.ToCoordinates());
 
         var disguised = AddComp<ChameleonDisguisedComponent>(user);
         disguised.Disguise = disguise;
@@ -219,19 +223,6 @@ public void Disguise(Entity<ChameleonProjectorComponent> ent, EntityUid user, En
         CopyComp<ItemComponent>((disguise, comp));
 
         _appearance.CopyData(entity, disguise);
-
-        var mass = CompOrNull<PhysicsComponent>(entity)?.Mass ?? 0f;
-
-        // let the disguise die when its taken enough damage, which then transfers to the player
-        // health is proportional to mass, and capped to not be insane
-        if (TryComp<MobThresholdsComponent>(disguise, out var thresholds) && TryComp<MobThresholdsComponent>(user, out var userThresholds))
-        {
-            // cap disguise integrity at max health so you dont have to kill beforeif the player is of flesh and blood, cap max health to theirs
-            // so that when reverting damage scales 1:1 and not round removing
-            var playerMax = _mobThreshold.GetThresholdForState(user, MobState.Dead, userThresholds).Float();
-            var max = playerMax == 0f ? proj.MaxHealth : Math.Max(proj.MaxHealth, playerMax);
-            disguised.Integrity = max;
-        }
     }
 
     /// <summary>
diff --git a/Content.Shared/Projectiles/ProjectileComponent.cs b/Content.Shared/Projectiles/ProjectileComponent.cs
index c24cf2b5ee5..8349252df2b 100644
--- a/Content.Shared/Projectiles/ProjectileComponent.cs
+++ b/Content.Shared/Projectiles/ProjectileComponent.cs
@@ -8,6 +8,12 @@ namespace Content.Shared.Projectiles;
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class ProjectileComponent : Component
 {
+    /// <summary>
+    ///     The angle of the fired projectile.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public Angle Angle;
+
     /// <summary>
     ///     The effect that appears when a projectile collides with an entity.
     /// </summary>
diff --git a/Content.Shared/Silicons/Borgs/BorgTypePrototype.cs b/Content.Shared/Silicons/Borgs/BorgTypePrototype.cs
new file mode 100644
index 00000000000..25190e09413
--- /dev/null
+++ b/Content.Shared/Silicons/Borgs/BorgTypePrototype.cs
@@ -0,0 +1,169 @@
+using Content.Shared.Interaction.Components;
+using Content.Shared.Inventory;
+using Content.Shared.Radio;
+using Content.Shared.Silicons.Borgs.Components;
+using Content.Shared.Silicons.Laws; // DeltaV
+using Content.Shared.Whitelist;
+using Robust.Shared.Audio;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Silicons.Borgs;
+
+/// <summary>
+/// Information for a borg type that can be selected by <see cref="BorgSwitchableTypeComponent"/>.
+/// </summary>
+/// <seealso cref="SharedBorgSwitchableTypeSystem"/>
+[Prototype(-5)] // DeltaV - force load after shaders
+public sealed partial class BorgTypePrototype : IPrototype
+{
+    [ValidatePrototypeId<SoundCollectionPrototype>]
+    private static readonly ProtoId<SoundCollectionPrototype> DefaultFootsteps = new("FootstepBorg");
+
+    [IdDataField]
+    public required string ID { get; init; }
+
+    //
+    // Description info (name/desc) is configured via localization strings directly.
+    //
+
+    /// <summary>
+    /// The prototype displayed in the selection menu for this type.
+    /// </summary>
+    [DataField]
+    public required EntProtoId DummyPrototype { get; init; }
+
+    //
+    // Functional information
+    //
+
+    /// <summary>
+    /// The amount of free module slots this borg type has.
+    /// </summary>
+    /// <remarks>
+    /// This count is on top of the modules specified in <see cref="DefaultModules"/>.
+    /// </remarks>
+    /// <seealso cref="BorgChassisComponent.ModuleCount"/>
+    [DataField]
+    public int ExtraModuleCount { get; set; } = 0;
+
+    /// <summary>
+    /// The whitelist for borg modules that can be inserted into this borg type.
+    /// </summary>
+    /// <seealso cref="BorgChassisComponent.ModuleWhitelist"/>
+    [DataField]
+    public EntityWhitelist? ModuleWhitelist { get; set; }
+
+    /// <summary>
+    /// Inventory template used by this borg.
+    /// </summary>
+    /// <remarks>
+    /// This template must be compatible with the normal borg templates,
+    /// so in practice it can only be used to differentiate the visual position of the slots on the character sprites.
+    /// </remarks>
+    /// <seealso cref="InventorySystem.SetTemplateId"/>
+    [DataField]
+    public ProtoId<InventoryTemplatePrototype> InventoryTemplateId { get; set; } = "borgShort";
+
+    /// <summary>
+    /// Radio channels that this borg will gain access to from this module.
+    /// </summary>
+    /// <remarks>
+    /// These channels are provided on top of the ones specified in
+    /// <see cref="BorgSwitchableTypeComponent.InherentRadioChannels"/>.
+    /// </remarks>
+    [DataField]
+    public ProtoId<RadioChannelPrototype>[] RadioChannels = [];
+
+    /// <summary>
+    /// Borg module types that are always available to borgs of this type.
+    /// </summary>
+    /// <remarks>
+    /// These modules still work like modules, although they cannot be removed from the borg.
+    /// </remarks>
+    /// <seealso cref="BorgModuleComponent.DefaultModule"/>
+    [DataField]
+    public EntProtoId[] DefaultModules = [];
+
+    /// <summary>
+    /// DeltaV: Lawset to use instead of crewsimov.
+    /// If the chassis is emagged or ion stormed this is ignored.
+    /// </summary>
+    [DataField]
+    public ProtoId<SiliconLawsetPrototype>? Lawset;
+
+    /// <summary>
+    /// Additional components to add to the borg entity when this type is selected.
+    /// </summary>
+    [DataField]
+    public ComponentRegistry? AddComponents { get; set; }
+
+    //
+    // Visual information
+    //
+
+    /// <summary>
+    /// DeltaV: Components only added on the client.
+    /// </summary>
+    [DataField]
+    public ComponentRegistry? ClientComponents;
+
+    /// <summary>
+    /// The sprite state for the main borg body.
+    /// </summary>
+    [DataField]
+    public string SpriteBodyState { get; set; } = "robot";
+
+    /// <summary>
+    /// An optional movement sprite state for the main borg body.
+    /// </summary>
+    [DataField]
+    public string? SpriteBodyMovementState { get; set; }
+
+    /// <summary>
+    /// Sprite state used to indicate that the borg has a mind in it.
+    /// </summary>
+    /// <seealso cref="BorgChassisComponent.HasMindState"/>
+    [DataField]
+    public string SpriteHasMindState { get; set; } = "robot_e";
+
+    /// <summary>
+    /// Sprite state used to indicate that the borg has no mind in it.
+    /// </summary>
+    /// <seealso cref="BorgChassisComponent.NoMindState"/>
+    [DataField]
+    public string SpriteNoMindState { get; set; } = "robot_e_r";
+
+    /// <summary>
+    /// Sprite state used when the borg's flashlight is on.
+    /// </summary>
+    [DataField]
+    public string SpriteToggleLightState { get; set; } = "robot_l";
+
+    //
+    // Minor information
+    //
+
+    /// <summary>
+    /// String to use on petting success.
+    /// </summary>
+    /// <seealso cref="InteractionPopupComponent"/>
+    [DataField]
+    public string PetSuccessString { get; set; } = "petting-success-generic-cyborg";
+
+    /// <summary>
+    /// String to use on petting failure.
+    /// </summary>
+    /// <seealso cref="InteractionPopupComponent"/>
+    [DataField]
+    public string PetFailureString { get; set; } = "petting-failure-generic-cyborg";
+
+    //
+    // Sounds
+    //
+
+    /// <summary>
+    /// Sound specifier for footstep sounds created by this borg.
+    /// </summary>
+    [DataField]
+    public SoundSpecifier FootstepCollection { get; set; } = new SoundCollectionSpecifier(DefaultFootsteps);
+}
diff --git a/Content.Shared/Silicons/Borgs/Components/BorgChassisComponent.cs b/Content.Shared/Silicons/Borgs/Components/BorgChassisComponent.cs
index de0fe0bce38..c2bf2b2801b 100644
--- a/Content.Shared/Silicons/Borgs/Components/BorgChassisComponent.cs
+++ b/Content.Shared/Silicons/Borgs/Components/BorgChassisComponent.cs
@@ -89,5 +89,18 @@ public enum BorgVisuals : byte
 [Serializable, NetSerializable]
 public enum BorgVisualLayers : byte
 {
-    Light
+    /// <summary>
+    /// Main borg body layer.
+    /// </summary>
+    Body,
+
+    /// <summary>
+    /// Layer for the borg's mind state.
+    /// </summary>
+    Light,
+
+    /// <summary>
+    /// Layer for the borg flashlight status.
+    /// </summary>
+    LightStatus,
 }
diff --git a/Content.Shared/Silicons/Borgs/Components/BorgModuleComponent.cs b/Content.Shared/Silicons/Borgs/Components/BorgModuleComponent.cs
index a7523c1ce70..e542a1e3e3e 100644
--- a/Content.Shared/Silicons/Borgs/Components/BorgModuleComponent.cs
+++ b/Content.Shared/Silicons/Borgs/Components/BorgModuleComponent.cs
@@ -7,6 +7,7 @@ namespace Content.Shared.Silicons.Borgs.Components;
 /// to give them unique abilities and attributes.
 /// </summary>
 [RegisterComponent, NetworkedComponent, Access(typeof(SharedBorgSystem))]
+[AutoGenerateComponentState]
 public sealed partial class BorgModuleComponent : Component
 {
     /// <summary>
@@ -16,6 +17,13 @@ public sealed partial class BorgModuleComponent : Component
     public EntityUid? InstalledEntity;
 
     public bool Installed => InstalledEntity != null;
+
+    /// <summary>
+    /// If true, this is a "default" module that cannot be removed from a borg.
+    /// </summary>
+    [DataField]
+    [AutoNetworkedField]
+    public bool DefaultModule;
 }
 
 /// <summary>
diff --git a/Content.Shared/Silicons/Borgs/Components/BorgSwitchableTypeComponent.cs b/Content.Shared/Silicons/Borgs/Components/BorgSwitchableTypeComponent.cs
new file mode 100644
index 00000000000..9a783d19aa7
--- /dev/null
+++ b/Content.Shared/Silicons/Borgs/Components/BorgSwitchableTypeComponent.cs
@@ -0,0 +1,72 @@
+using Content.Shared.Actions;
+using Content.Shared.Radio;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Silicons.Borgs.Components;
+
+/// <summary>
+/// Component for borgs that can switch their "type" after being created.
+/// </summary>
+/// <remarks>
+/// <para>
+/// This is used by all NT borgs, on construction and round-start spawn.
+/// Borgs are effectively useless until they have made their choice of type.
+/// Borg type selections are currently irreversible.
+/// </para>
+/// <para>
+/// Available types are specified in <see cref="BorgTypePrototype"/>s.
+/// </para>
+/// </remarks>
+/// <seealso cref="SharedBorgSwitchableTypeSystem"/>
+[RegisterComponent, NetworkedComponent]
+[AutoGenerateComponentState(raiseAfterAutoHandleState: true)]
+[Access(typeof(SharedBorgSwitchableTypeSystem))]
+public sealed partial class BorgSwitchableTypeComponent : Component
+{
+    /// <summary>
+    /// Action entity used by players to select their type.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public EntityUid? SelectTypeAction;
+
+    /// <summary>
+    /// The currently selected borg type, if any.
+    /// </summary>
+    /// <remarks>
+    /// This can be set in a prototype to immediately apply a borg type, and not have switching support.
+    /// </remarks>
+    [DataField, AutoNetworkedField]
+    public ProtoId<BorgTypePrototype>? SelectedBorgType;
+
+    /// <summary>
+    /// Radio channels that the borg will always have. These are added on top of the selected type's radio channels.
+    /// </summary>
+    [DataField]
+    public ProtoId<RadioChannelPrototype>[] InherentRadioChannels = [];
+}
+
+/// <summary>
+/// Action event used to open the selection menu of a <see cref="BorgSwitchableTypeComponent"/>.
+/// </summary>
+public sealed partial class BorgToggleSelectTypeEvent : InstantActionEvent;
+
+/// <summary>
+/// UI message used by a borg to select their type with <see cref="BorgSwitchableTypeComponent"/>.
+/// </summary>
+/// <param name="prototype">The borg type prototype that the user selected.</param>
+[Serializable, NetSerializable]
+public sealed class BorgSelectTypeMessage(ProtoId<BorgTypePrototype> prototype) : BoundUserInterfaceMessage
+{
+    public ProtoId<BorgTypePrototype> Prototype = prototype;
+}
+
+/// <summary>
+/// UI key used by the selection menu for <see cref="BorgSwitchableTypeComponent"/>.
+/// </summary>
+[NetSerializable, Serializable]
+public enum BorgSwitchableTypeUiKey : byte
+{
+    SelectBorgType,
+}
diff --git a/Content.Shared/Silicons/Borgs/SharedBorgSwitchableTypeSystem.cs b/Content.Shared/Silicons/Borgs/SharedBorgSwitchableTypeSystem.cs
new file mode 100644
index 00000000000..d9abeb2d326
--- /dev/null
+++ b/Content.Shared/Silicons/Borgs/SharedBorgSwitchableTypeSystem.cs
@@ -0,0 +1,125 @@
+using Content.Shared.Actions;
+using Content.Shared.Interaction;
+using Content.Shared.Interaction.Components;
+using Content.Shared.Movement.Components;
+using Content.Shared.Silicons.Borgs.Components;
+using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Silicons.Borgs;
+
+/// <summary>
+/// Implements borg type switching.
+/// </summary>
+/// <seealso cref="BorgSwitchableTypeComponent"/>
+public abstract class SharedBorgSwitchableTypeSystem : EntitySystem
+{
+    // TODO: Allow borgs to be reset to default configuration.
+
+    [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
+    [Dependency] private readonly SharedUserInterfaceSystem _userInterface = default!;
+    [Dependency] protected readonly IPrototypeManager Prototypes = default!;
+    [Dependency] private readonly InteractionPopupSystem _interactionPopup = default!;
+
+    [ValidatePrototypeId<EntityPrototype>]
+    public const string ActionId = "ActionSelectBorgType";
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<BorgSwitchableTypeComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<BorgSwitchableTypeComponent, ComponentShutdown>(OnShutdown);
+        SubscribeLocalEvent<BorgSwitchableTypeComponent, BorgToggleSelectTypeEvent>(OnSelectBorgTypeAction);
+
+        Subs.BuiEvents<BorgSwitchableTypeComponent>(BorgSwitchableTypeUiKey.SelectBorgType,
+            sub =>
+            {
+                sub.Event<BorgSelectTypeMessage>(SelectTypeMessageHandler);
+            });
+    }
+
+    //
+    // UI-adjacent code
+    //
+
+    private void OnMapInit(Entity<BorgSwitchableTypeComponent> ent, ref MapInitEvent args)
+    {
+        _actionsSystem.AddAction(ent, ref ent.Comp.SelectTypeAction, ActionId);
+        Dirty(ent);
+
+        if (ent.Comp.SelectedBorgType != null)
+        {
+            SelectBorgModule(ent, ent.Comp.SelectedBorgType.Value);
+        }
+    }
+
+    private void OnShutdown(Entity<BorgSwitchableTypeComponent> ent, ref ComponentShutdown args)
+    {
+        _actionsSystem.RemoveAction(ent, ent.Comp.SelectTypeAction);
+    }
+
+    private void OnSelectBorgTypeAction(Entity<BorgSwitchableTypeComponent> ent, ref BorgToggleSelectTypeEvent args)
+    {
+        if (args.Handled || !TryComp<ActorComponent>(ent, out var actor))
+            return;
+
+        args.Handled = true;
+
+        _userInterface.TryToggleUi((ent.Owner, null), BorgSwitchableTypeUiKey.SelectBorgType, actor.PlayerSession);
+    }
+
+    private void SelectTypeMessageHandler(Entity<BorgSwitchableTypeComponent> ent, ref BorgSelectTypeMessage args)
+    {
+        if (ent.Comp.SelectedBorgType != null)
+            return;
+
+        if (!Prototypes.HasIndex(args.Prototype))
+            return;
+
+        SelectBorgModule(ent, args.Prototype);
+    }
+
+    //
+    // Implementation
+    //
+
+    protected virtual void SelectBorgModule(
+        Entity<BorgSwitchableTypeComponent> ent,
+        ProtoId<BorgTypePrototype> borgType)
+    {
+        ent.Comp.SelectedBorgType = borgType;
+
+        _actionsSystem.RemoveAction(ent, ent.Comp.SelectTypeAction);
+        ent.Comp.SelectTypeAction = null;
+        Dirty(ent);
+
+        _userInterface.CloseUi((ent.Owner, null), BorgSwitchableTypeUiKey.SelectBorgType);
+
+        UpdateEntityAppearance(ent);
+    }
+
+    protected void UpdateEntityAppearance(Entity<BorgSwitchableTypeComponent> entity)
+    {
+        if (!Prototypes.TryIndex(entity.Comp.SelectedBorgType, out var proto))
+            return;
+
+        UpdateEntityAppearance(entity, proto);
+    }
+
+    protected virtual void UpdateEntityAppearance(
+        Entity<BorgSwitchableTypeComponent> entity,
+        BorgTypePrototype prototype)
+    {
+        if (TryComp(entity, out InteractionPopupComponent? popup))
+        {
+            _interactionPopup.SetInteractSuccessString((entity.Owner, popup), prototype.PetSuccessString);
+            _interactionPopup.SetInteractFailureString((entity.Owner, popup), prototype.PetFailureString);
+        }
+
+        if (TryComp(entity, out FootstepModifierComponent? footstepModifier))
+        {
+            footstepModifier.FootstepSoundCollection = prototype.FootstepCollection;
+        }
+    }
+}
diff --git a/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs b/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs
index c62e63481d6..827bb351b07 100644
--- a/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs
+++ b/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs
@@ -124,4 +124,13 @@ private void OnRefreshMovementSpeedModifiers(EntityUid uid, BorgChassisComponent
         var sprintDif = movement.BaseWalkSpeed / movement.BaseSprintSpeed;
         args.ModifySpeed(1f, sprintDif);
     }
+
+    /// <summary>
+    /// Sets <see cref="BorgModuleComponent.DefaultModule"/>.
+    /// </summary>
+    public void SetBorgModuleDefault(Entity<BorgModuleComponent> ent, bool newDefault)
+    {
+        ent.Comp.DefaultModule = newDefault;
+        Dirty(ent);
+    }
 }
diff --git a/Content.Shared/Silicons/Laws/Components/SiliconLawProviderComponent.cs b/Content.Shared/Silicons/Laws/Components/SiliconLawProviderComponent.cs
index 1c54938b8a4..4885bd0265c 100644
--- a/Content.Shared/Silicons/Laws/Components/SiliconLawProviderComponent.cs
+++ b/Content.Shared/Silicons/Laws/Components/SiliconLawProviderComponent.cs
@@ -24,7 +24,7 @@ public sealed partial class SiliconLawProviderComponent : Component
 
     /// <summary>
     /// The sound that plays for the Silicon player
-    /// when the particular lawboard has been inserted.
+    /// when the law change is processed for the provider.
     /// </summary>
     [DataField]
     public SoundSpecifier? LawUploadSound = new SoundPathSpecifier("/Audio/Misc/cryo_warning.ogg");
diff --git a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Held.cs b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Held.cs
index e067cf3efad..c9279b02151 100644
--- a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Held.cs
+++ b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Held.cs
@@ -54,7 +54,7 @@ private void OnCoreJump(Entity<StationAiHeldComponent> ent, ref JumpToCoreEvent
     }
 
     /// <summary>
-    /// Tries to get the entity held in the AI core.
+    /// Tries to get the entity held in the AI core using StationAiCore.
     /// </summary>
     private bool TryGetHeld(Entity<StationAiCoreComponent?> entity, out EntityUid held)
     {
@@ -71,6 +71,24 @@ private bool TryGetHeld(Entity<StationAiCoreComponent?> entity, out EntityUid he
         return true;
     }
 
+    /// <summary>
+    /// Tries to get the entity held in the AI using StationAiHolder.
+    /// </summary>
+    private bool TryGetHeldFromHolder(Entity<StationAiHolderComponent?> entity, out EntityUid held)
+    {
+        held = EntityUid.Invalid;
+
+        if (!Resolve(entity.Owner, ref entity.Comp))
+            return false;
+
+        if (!_containers.TryGetContainer(entity.Owner, StationAiHolderComponent.Container, out var container) ||
+            container.ContainedEntities.Count == 0)
+            return false;
+
+        held = container.ContainedEntities[0];
+        return true;
+    }
+
     private bool TryGetCore(EntityUid ent, out Entity<StationAiCoreComponent?> core)
     {
         if (!_containers.TryGetContainingContainer(ent, out var container) ||
diff --git a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs
index 7eef20cebd8..189515635a8 100644
--- a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs
+++ b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs
@@ -4,7 +4,9 @@
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Database;
 using Content.Shared.Doors.Systems;
+using Content.Shared.DoAfter;
 using Content.Shared.Electrocution;
+using Content.Shared.Intellicard;
 using Content.Shared.Interaction;
 using Content.Shared.Item.ItemToggle;
 using Content.Shared.Mind;
@@ -15,6 +17,7 @@
 using Content.Shared.Power.EntitySystems;
 using Content.Shared.StationAi;
 using Content.Shared.Verbs;
+using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.Map.Components;
@@ -40,6 +43,7 @@ public abstract partial class SharedStationAiSystem : EntitySystem
     [Dependency] private readonly   SharedAudioSystem _audio = default!;
     [Dependency] private readonly   SharedContainerSystem _containers = default!;
     [Dependency] private readonly   SharedDoorSystem _doors = default!;
+    [Dependency] private readonly   SharedDoAfterSystem _doAfter = default!;
     [Dependency] private readonly   SharedElectrocutionSystem _electrify = default!;
     [Dependency] private readonly   SharedEyeSystem _eye = default!;
     [Dependency] protected readonly SharedMapSystem Maps = default!;
@@ -87,6 +91,7 @@ public override void Initialize()
         SubscribeLocalEvent<StationAiHolderComponent, MapInitEvent>(OnHolderMapInit);
         SubscribeLocalEvent<StationAiHolderComponent, EntInsertedIntoContainerMessage>(OnHolderConInsert);
         SubscribeLocalEvent<StationAiHolderComponent, EntRemovedFromContainerMessage>(OnHolderConRemove);
+        SubscribeLocalEvent<StationAiHolderComponent, IntellicardDoAfterEvent>(OnIntellicardDoAfter);
 
         SubscribeLocalEvent<StationAiCoreComponent, EntInsertedIntoContainerMessage>(OnAiInsert);
         SubscribeLocalEvent<StationAiCoreComponent, EntRemovedFromContainerMessage>(OnAiRemove);
@@ -197,15 +202,22 @@ private void OnAiInRange(Entity<StationAiOverlayComponent> ent, ref InRangeOverr
         args.InRange = _vision.IsAccessible((targetXform.GridUid.Value, broadphase, grid), targetTile);
     }
 
-    private void OnHolderInteract(Entity<StationAiHolderComponent> ent, ref AfterInteractEvent args)
+
+    private void OnIntellicardDoAfter(Entity<StationAiHolderComponent> ent, ref IntellicardDoAfterEvent args)
     {
-        if (!TryComp(args.Target, out StationAiHolderComponent? targetHolder))
+        if (args.Cancelled)
+            return;
+
+        if (args.Handled)
+            return;
+
+        if (!TryComp(args.Args.Target, out StationAiHolderComponent? targetHolder))
             return;
 
         // Try to insert our thing into them
         if (_slots.CanEject(ent.Owner, args.User, ent.Comp.Slot))
         {
-            if (!_slots.TryInsert(args.Target.Value, targetHolder.Slot, ent.Comp.Slot.Item!.Value, args.User, excludeUserAudio: true))
+            if (!_slots.TryInsert(args.Args.Target.Value, targetHolder.Slot, ent.Comp.Slot.Item!.Value, args.User, excludeUserAudio: true))
             {
                 return;
             }
@@ -215,7 +227,7 @@ private void OnHolderInteract(Entity<StationAiHolderComponent> ent, ref AfterInt
         }
 
         // Otherwise try to take from them
-        if (_slots.CanEject(args.Target.Value, args.User, targetHolder.Slot))
+        if (_slots.CanEject(args.Args.Target.Value, args.User, targetHolder.Slot))
         {
             if (!_slots.TryInsert(ent.Owner, ent.Comp.Slot, targetHolder.Slot.Item!.Value, args.User, excludeUserAudio: true))
             {
@@ -226,6 +238,55 @@ private void OnHolderInteract(Entity<StationAiHolderComponent> ent, ref AfterInt
         }
     }
 
+    private void OnHolderInteract(Entity<StationAiHolderComponent> ent, ref AfterInteractEvent args)
+    {
+        if (args.Handled || !args.CanReach || args.Target == null)
+            return;
+
+        if (!TryComp(args.Target, out StationAiHolderComponent? targetHolder))
+            return;
+
+        //Don't want to download/upload between several intellicards. You can just pick it up at that point.
+        if (HasComp<IntellicardComponent>(args.Target))
+            return;
+
+        if (!TryComp(args.Used, out IntellicardComponent? intelliComp))
+            return;
+
+        var cardHasAi = _slots.CanEject(ent.Owner, args.User, ent.Comp.Slot);
+        var coreHasAi = _slots.CanEject(args.Target.Value, args.User, targetHolder.Slot);
+
+        if (cardHasAi && coreHasAi)
+        {
+            _popup.PopupClient(Loc.GetString("intellicard-core-occupied"), args.User, args.User, PopupType.Medium);
+            args.Handled = true;
+            return;
+        }
+        if (!cardHasAi && !coreHasAi)
+        {
+            _popup.PopupClient(Loc.GetString("intellicard-core-empty"), args.User, args.User, PopupType.Medium);
+            args.Handled = true;
+            return;
+        }
+
+        if (TryGetHeldFromHolder((args.Target.Value, targetHolder), out var held) && _timing.CurTime > intelliComp.NextWarningAllowed)
+        {
+            intelliComp.NextWarningAllowed = _timing.CurTime + intelliComp.WarningDelay;
+            AnnounceIntellicardUsage(held, intelliComp.WarningSound);
+        }
+
+        var doAfterArgs = new DoAfterArgs(EntityManager, args.User, cardHasAi ? intelliComp.UploadTime : intelliComp.DownloadTime, new IntellicardDoAfterEvent(), args.Target, ent.Owner)
+        {
+            BreakOnDamage = true,
+            BreakOnMove = true,
+            NeedHand = true,
+            BreakOnDropItem = true
+        };
+
+        _doAfter.TryStartDoAfter(doAfterArgs);
+        args.Handled = true;
+    }
+
     private void OnHolderInit(Entity<StationAiHolderComponent> ent, ref ComponentInit args)
     {
         _slots.AddItemSlot(ent.Owner, StationAiHolderComponent.Container, ent.Comp.Slot);
@@ -324,6 +385,7 @@ private void AttachEye(Entity<StationAiCoreComponent> ent)
 
         if (TryComp(user, out EyeComponent? eyeComp))
         {
+            _eye.SetDrawFov(user, false, eyeComp);
             _eye.SetTarget(user, ent.Comp.RemoteEntity.Value, eyeComp);
         }
 
@@ -356,6 +418,7 @@ private void OnAiRemove(Entity<StationAiCoreComponent> ent, ref EntRemovedFromCo
 
         if (TryComp(args.Entity, out EyeComponent? eyeComp))
         {
+            _eye.SetDrawFov(args.Entity, true, eyeComp);
             _eye.SetTarget(args.Entity, null, eyeComp);
         }
         ClearEye(ent);
@@ -376,6 +439,8 @@ private void UpdateAppearance(Entity<StationAiHolderComponent?> entity)
         _appearance.SetData(entity.Owner, StationAiVisualState.Key, StationAiState.Occupied);
     }
 
+    public virtual void AnnounceIntellicardUsage(EntityUid uid, SoundSpecifier? cue = null) { }
+
     public virtual bool SetVisionEnabled(Entity<StationAiVisionComponent> entity, bool enabled, bool announce = false)
     {
         if (entity.Comp.Enabled == enabled)
@@ -417,6 +482,10 @@ public sealed partial class JumpToCoreEvent : InstantActionEvent
 
 }
 
+[Serializable, NetSerializable]
+public sealed partial class IntellicardDoAfterEvent : SimpleDoAfterEvent;
+
+
 [Serializable, NetSerializable]
 public enum StationAiVisualState : byte
 {
diff --git a/Content.Shared/Weapons/Ranged/Components/ChamberMagazineAmmoProviderComponent.cs b/Content.Shared/Weapons/Ranged/Components/ChamberMagazineAmmoProviderComponent.cs
index 37517c13711..cdcf1a7b31b 100644
--- a/Content.Shared/Weapons/Ranged/Components/ChamberMagazineAmmoProviderComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Components/ChamberMagazineAmmoProviderComponent.cs
@@ -22,6 +22,12 @@ public sealed partial class ChamberMagazineAmmoProviderComponent : MagazineAmmoP
     [ViewVariables(VVAccess.ReadWrite), DataField("autoCycle"), AutoNetworkedField]
     public bool AutoCycle = true;
 
+    /// <summary>
+    /// Can the gun be racked, which opens and then instantly closes the bolt to cycle a round.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite), DataField("canRack"), AutoNetworkedField]
+    public bool CanRack = true;
+
     [ViewVariables(VVAccess.ReadWrite), DataField("soundBoltClosed"), AutoNetworkedField]
     public SoundSpecifier? BoltClosedSound = new SoundPathSpecifier("/Audio/Weapons/Guns/Bolt/rifle_bolt_closed.ogg");
 
diff --git a/Content.Shared/Weapons/Ranged/Components/GunComponent.cs b/Content.Shared/Weapons/Ranged/Components/GunComponent.cs
index 18fe4d4baa2..569e8390700 100644
--- a/Content.Shared/Weapons/Ranged/Components/GunComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Components/GunComponent.cs
@@ -1,4 +1,5 @@
-using Content.Shared.Nyanotrasen.Abilities.Oni;
+using System.Numerics;
+using Content.Shared.Nyanotrasen.Abilities.Oni; // DeltaV: Make Oni shooting guns less accurate
 using Content.Shared.Weapons.Ranged.Events;
 using Content.Shared.Weapons.Ranged.Systems;
 using Robust.Shared.Audio;
@@ -157,6 +158,30 @@ public sealed partial class GunComponent : Component
     [AutoNetworkedField, ViewVariables(VVAccess.ReadWrite)]
     public int ShotsPerBurstModified = 3;
 
+    /// <summary>
+    /// How long time must pass between burstfire shots.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float BurstCooldown = 0.25f;
+
+    /// <summary>
+    /// The fire rate of the weapon in burst fire mode.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float BurstFireRate = 8f;
+
+    /// <summary>
+    /// Whether the burst fire mode has been activated.
+    /// </summary>
+    [AutoNetworkedField, ViewVariables(VVAccess.ReadWrite)]
+    public bool BurstActivated = false;
+
+    /// <summary>
+    /// The burst fire bullet count.
+    /// </summary>
+    [AutoNetworkedField, ViewVariables(VVAccess.ReadWrite)]
+    public int BurstShotsCount = 0;
+
     /// <summary>
     /// Used for tracking semi-auto / burst
     /// </summary>
@@ -233,6 +258,12 @@ public sealed partial class GunComponent : Component
     /// </summary>
     [DataField]
     public bool ClumsyProof = false;
+
+    /// <summary>
+    /// Firing direction for an item not being held (e.g. shuttle cannons, thrown guns still firing).
+    /// </summary>
+    [DataField]
+    public Vector2 DefaultDirection = new Vector2(0, -1);
 }
 
 [Flags]
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs
index d6f45ba77df..3060e2c1a93 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs
@@ -67,7 +67,10 @@ private void OnChamberUse(EntityUid uid, ChamberMagazineAmmoProviderComponent co
             return;
 
         args.Handled = true;
-        UseChambered(uid, component, args.User);
+        if (component.CanRack)
+            UseChambered(uid, component, args.User);
+        else
+            ToggleBolt(uid, component, args.User);
     }
 
     /// <summary>
@@ -75,7 +78,7 @@ private void OnChamberUse(EntityUid uid, ChamberMagazineAmmoProviderComponent co
     /// </summary>
     private void OnChamberActivationVerb(EntityUid uid, ChamberMagazineAmmoProviderComponent component, GetVerbsEvent<ActivationVerb> args)
     {
-        if (!args.CanAccess || !args.CanInteract || component.BoltClosed == null)
+        if (!args.CanAccess || !args.CanInteract || component.BoltClosed == null || !component.CanRack)
             return;
 
         args.Verbs.Add(new ActivationVerb()
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
index 2ba462008cb..de61ff90fbe 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
@@ -220,7 +220,7 @@ public void AttemptShoot(EntityUid user, EntityUid gunUid, GunComponent gun, Ent
     /// </summary>
     public void AttemptShoot(EntityUid gunUid, GunComponent gun)
     {
-        var coordinates = new EntityCoordinates(gunUid, new Vector2(0, -1));
+        var coordinates = new EntityCoordinates(gunUid, gun.DefaultDirection);
         gun.ShootCoordinates = coordinates;
         AttemptShoot(gunUid, gunUid, gun);
         gun.ShotCounter = 0;
@@ -263,6 +263,9 @@ private void AttemptShoot(EntityUid user, EntityUid gunUid, GunComponent gun)
 
         var fireRate = TimeSpan.FromSeconds(1f / gun.FireRateModified);
 
+        if (gun.SelectedMode == SelectiveFire.Burst || gun.BurstActivated)
+            fireRate = TimeSpan.FromSeconds(1f / gun.BurstFireRate);
+
         // First shot
         // Previously we checked shotcounter but in some cases all the bullets got dumped at once
         // curTime - fireRate is insufficient because if you time it just right you can get a 3rd shot out slightly quicker.
@@ -283,18 +286,24 @@ private void AttemptShoot(EntityUid user, EntityUid gunUid, GunComponent gun)
 
         // Get how many shots we're actually allowed to make, due to clip size or otherwise.
         // Don't do this in the loop so we still reset NextFire.
-        switch (gun.SelectedMode)
+        if (!gun.BurstActivated)
+        {
+            switch (gun.SelectedMode)
+            {
+                case SelectiveFire.SemiAuto:
+                    shots = Math.Min(shots, 1 - gun.ShotCounter);
+                    break;
+                case SelectiveFire.Burst:
+                    shots = Math.Min(shots, gun.ShotsPerBurstModified - gun.ShotCounter);
+                    break;
+                case SelectiveFire.FullAuto:
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException($"No implemented shooting behavior for {gun.SelectedMode}!");
+            }
+        } else
         {
-            case SelectiveFire.SemiAuto:
-                shots = Math.Min(shots, 1 - gun.ShotCounter);
-                break;
-            case SelectiveFire.Burst:
-                shots = Math.Min(shots, gun.ShotsPerBurstModified - gun.ShotCounter);
-                break;
-            case SelectiveFire.FullAuto:
-                break;
-            default:
-                throw new ArgumentOutOfRangeException($"No implemented shooting behavior for {gun.SelectedMode}!");
+            shots = Math.Min(shots, gun.ShotsPerBurstModified - gun.ShotCounter);
         }
 
         var attemptEv = new AttemptShootEvent(user, null);
@@ -306,7 +315,8 @@ private void AttemptShoot(EntityUid user, EntityUid gunUid, GunComponent gun)
             {
                 PopupSystem.PopupClient(attemptEv.Message, gunUid, user);
             }
-
+            gun.BurstActivated = false;
+            gun.BurstShotsCount = 0;
             gun.NextFire = TimeSpan.FromSeconds(Math.Max(lastFire.TotalSeconds + SafetyNextFire, gun.NextFire.TotalSeconds));
             return;
         }
@@ -333,6 +343,10 @@ private void AttemptShoot(EntityUid user, EntityUid gunUid, GunComponent gun)
             var emptyGunShotEvent = new OnEmptyGunShotEvent();
             RaiseLocalEvent(gunUid, ref emptyGunShotEvent);
 
+            gun.BurstActivated = false;
+            gun.BurstShotsCount = 0;
+            gun.NextFire += TimeSpan.FromSeconds(gun.BurstCooldown);
+
             // Play empty gun sounds if relevant
             // If they're firing an existing clip then don't play anything.
             if (shots > 0)
@@ -352,6 +366,22 @@ private void AttemptShoot(EntityUid user, EntityUid gunUid, GunComponent gun)
             return;
         }
 
+        // Handle burstfire
+        if (gun.SelectedMode == SelectiveFire.Burst)
+        {
+            gun.BurstActivated = true;
+        }
+        if (gun.BurstActivated)
+        {
+            gun.BurstShotsCount += shots;
+            if (gun.BurstShotsCount >= gun.ShotsPerBurstModified)
+            {
+                gun.NextFire += TimeSpan.FromSeconds(gun.BurstCooldown);
+                gun.BurstActivated = false;
+                gun.BurstShotsCount = 0;
+            }
+        }
+
         // Shoot confirmed - sounds also played here in case it's invalid (e.g. cartridge already spent).
         Shoot(gunUid, gun, ev.Ammo, fromCoordinates, toCoordinates.Value, out var userImpulse, user, throwItems: attemptEv.ThrowItems);
         var shotEv = new GunShotEvent(user, ev.Ammo);
@@ -404,7 +434,7 @@ public void ShootProjectile(EntityUid uid, Vector2 direction, Vector2 gunVelocit
         Projectiles.SetShooter(uid, projectile, user ?? gunUid);
         projectile.Weapon = gunUid;
 
-        TransformSystem.SetWorldRotation(uid, direction.ToWorldAngle());
+        TransformSystem.SetWorldRotation(uid, direction.ToWorldAngle() + projectile.Angle);
     }
 
     protected abstract void Popup(string message, EntityUid? uid, EntityUid? user);
diff --git a/Content.Shared/Wieldable/WieldableSystem.cs b/Content.Shared/Wieldable/WieldableSystem.cs
index d76876c0cff..0a193576bfd 100644
--- a/Content.Shared/Wieldable/WieldableSystem.cs
+++ b/Content.Shared/Wieldable/WieldableSystem.cs
@@ -3,6 +3,7 @@
 using Content.Shared.Hands;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
+using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Inventory.VirtualItem;
 using Content.Shared.Item;
@@ -125,7 +126,7 @@ private void OnExamineRequires(Entity<GunRequiresWieldComponent> entity, ref Exa
 
     private void OnExamine(EntityUid uid, GunWieldBonusComponent component, ref ExaminedEvent args)
     {
-        if (HasComp<GunRequiresWieldComponent>(uid)) 
+        if (HasComp<GunRequiresWieldComponent>(uid))
             return;
 
         if (component.WieldBonusExamineMessage != null)
@@ -253,7 +254,7 @@ public bool TryWield(EntityUid used, WieldableComponent component, EntityUid use
             return false;
 
         var selfMessage = Loc.GetString("wieldable-component-successful-wield", ("item", used));
-        var othersMessage = Loc.GetString("wieldable-component-successful-wield-other", ("user", user), ("item", used));
+        var othersMessage = Loc.GetString("wieldable-component-successful-wield-other", ("user", Identity.Entity(user, EntityManager)), ("item", used));
         _popupSystem.PopupPredicted(selfMessage, othersMessage, user, user);
 
         var targEv = new ItemWieldedEvent();
@@ -298,7 +299,7 @@ private void OnItemUnwielded(EntityUid uid, WieldableComponent component, ItemUn
                 _audioSystem.PlayPredicted(component.UnwieldSound, uid, args.User);
 
             var selfMessage = Loc.GetString("wieldable-component-failed-wield", ("item", uid));
-            var othersMessage = Loc.GetString("wieldable-component-failed-wield-other", ("user", args.User.Value), ("item", uid));
+            var othersMessage = Loc.GetString("wieldable-component-failed-wield-other", ("user", Identity.Entity(args.User.Value, EntityManager)), ("item", uid));
             _popupSystem.PopupPredicted(selfMessage, othersMessage, args.User.Value, args.User.Value);
         }
 
diff --git a/Resources/Audio/Magic/attributions.yml b/Resources/Audio/Magic/attributions.yml
index cedda322862..bfbe4d6ec24 100644
--- a/Resources/Audio/Magic/attributions.yml
+++ b/Resources/Audio/Magic/attributions.yml
@@ -17,6 +17,8 @@
   - forcewall.ogg
   - knock.ogg
   - blink.ogg
-  copyright: '"ForceWall.ogg", "Knock.ogg", and "blink.ogg" by Citadel Station 13'
+  - ethereal_enter.ogg
+  - ethereal_exit.ogg
+  copyright: '"forcewall.ogg", "knock.ogg", "blink.ogg", "ethereal_enter.ogg", and "ethereal_exit.ogg" by Citadel Station 13'
   license: CC-BY-SA-3.0
   source: https://github.com/Citadel-Station-13/Citadel-Station-13/commit/35a1723e98a60f375df590ca572cc90f1bb80bd5
diff --git a/Resources/Audio/Magic/ethereal_enter.ogg b/Resources/Audio/Magic/ethereal_enter.ogg
new file mode 100644
index 00000000000..a0c7222c167
Binary files /dev/null and b/Resources/Audio/Magic/ethereal_enter.ogg differ
diff --git a/Resources/Audio/Magic/ethereal_exit.ogg b/Resources/Audio/Magic/ethereal_exit.ogg
new file mode 100644
index 00000000000..bd60ca8c695
Binary files /dev/null and b/Resources/Audio/Magic/ethereal_exit.ogg differ
diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml
index 6defd76e971..824a6577b85 100644
--- a/Resources/Changelog/Admin.yml
+++ b/Resources/Changelog/Admin.yml
@@ -590,5 +590,27 @@ Entries:
   id: 73
   time: '2024-11-02T13:21:10.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/32461
+- author: Repo
+  changes:
+  - message: All role bans in a set are updated on edits now.
+    type: Fix
+  id: 74
+  time: '2024-11-12T21:03:13.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30659
+- author: Aquif
+  changes:
+  - message: tag:with toolshed command. It takes in a list of entities via pipe and
+      returns the entities from the list with the given tag.
+    type: Add
+  id: 75
+  time: '2024-11-13T23:27:31.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/31751
+- author: Beck Thompson
+  changes:
+  - message: Notes now use duration instead of timestamps for note expiry times.
+    type: Tweak
+  id: 76
+  time: '2024-11-15T03:24:27.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33262
 Name: Admin
 Order: 3
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 155dbacf061..82896471192 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,229 +1,4 @@
 Entries:
-- author: Flareguy
-  changes:
-  - message: Added vox sprites for most of the remaining common mask items.
-    type: Add
-  id: 7085
-  time: '2024-08-10T21:06:50.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30838
-- author: Scribbles0, Plykiya, nikthechampiongr
-  changes:
-  - message: You can now execute incapacitated/cuffed entities or yourself with certain
-      sharp weapons. Executions require a do-after, deal 9x the damage of a normal
-      attack, and ignore damage resistances.
-    type: Add
-  id: 7086
-  time: '2024-08-11T03:05:54.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30104
-- author: Plykiya
-  changes:
-  - message: Cooking shelves have been renamed to Kitchen shelves, you can now put
-      more drinks and cutlery in them.
-    type: Tweak
-  id: 7087
-  time: '2024-08-11T06:21:34.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30858
-- author: BombasterDS
-  changes:
-  - message: You can now change the suit's sensors on incapacitated people without
-      taking it off
-    type: Tweak
-  id: 7088
-  time: '2024-08-11T09:04:43.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29668
-- author: lzk228
-  changes:
-  - message: RCD UI can be activated only in hand.
-    type: Tweak
-  id: 7089
-  time: '2024-08-11T09:15:28.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30861
-- author: TokenStyle
-  changes:
-  - message: Pax reagent now refresh pacified.
-    type: Tweak
-  - message: Pax reagent pacified duration has been changed from 2 seconds to 4 seconds.
-    type: Tweak
-  id: 7090
-  time: '2024-08-11T09:19:01.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30778
-- author: osjarw
-  changes:
-  - message: You can once again pull and buckle pets.
-    type: Fix
-  id: 7091
-  time: '2024-08-11T09:22:46.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30066
-- author: slarticodefast
-  changes:
-  - message: The sentient plant mutation can no longer be propagated to other trays
-      via seeds or swabs. It has also been made more rare.
-    type: Tweak
-  id: 7092
-  time: '2024-08-11T09:23:14.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29133
-- author: Moomoobeef
-  changes:
-  - message: Added The Throngler (Plushie) to the grand lottery!!
-    type: Add
-  id: 7093
-  time: '2024-08-11T10:26:37.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29978
-- author: Plykiya
-  changes:
-  - message: Energy sword weapons are now execution-capable.
-    type: Add
-  id: 7094
-  time: '2024-08-11T22:12:31.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30909
-- author: Blackern5000
-  changes:
-  - message: Added diamond-tipped mining drills, a science printed item found under
-      T2 industrial.
-    type: Add
-  - message: Standard mining drills now attack faster and break rocks in two hits.
-    type: Tweak
-  - message: Moved ore bags of holding to T2 industrial tech.
-    type: Tweak
-  - message: Grappling guns are now researched with Salvage Equipment.
-    type: Tweak
-  - message: Diamonds are now worth 2,000 spesos each.
-    type: Tweak
-  id: 7095
-  time: '2024-08-12T01:49:09.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30814
-- author: mirrorcult
-  changes:
-  - message: With space law being overhauled, you can now examine items to see their
-      contraband status, and whether with your current access you'd be accosted by
-      Security for owning it. This will also clearly show non-stealth syndicate items.
-    type: Add
-  id: 7096
-  time: '2024-08-12T03:57:50.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28688
-- author: DieselMohawk
-  changes:
-  - message: Resprited Security vest and helmet
-    type: Tweak
-  id: 7097
-  time: '2024-08-12T06:20:56.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30291
-- author: Ubaser
-  changes:
-  - message: Mantles are now available in loadouts, requiring 20 hours of that head
-      of department's time.
-    type: Add
-  - message: Mantles are no longer spawned in dressers or able to be printed at uniform
-      lathes.
-    type: Remove
-  id: 7098
-  time: '2024-08-12T07:14:46.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30929
-- author: LeoSantich
-  changes:
-  - message: Updated 'narsie' and 'ratvar' to 'Nar'Sie' and 'Ratvar' in randomly generated
-      storybook content.
-    type: Tweak
-  id: 7099
-  time: '2024-08-12T23:20:53.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30954
-- author: pigeonpeas
-  changes:
-  - message: Added non command mantle into the winterdrobe
-    type: Add
-  id: 7100
-  time: '2024-08-13T09:20:12.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29774
-- author: TheShuEd
-  changes:
-  - message: change the way food is sliced - food is now sliced whole after a small
-      doafter than requires multiple clicks on a single entity
-    type: Tweak
-  id: 7101
-  time: '2024-08-13T10:54:00.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30824
-- author: Ubaser
-  changes:
-  - message: Add two gatfruit mutations, one fake and one real capfruit which spawns
-      cap guns when eaten.
-    type: Add
-  id: 7102
-  time: '2024-08-13T11:08:40.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30850
-- author: slarticodefast
-  changes:
-  - message: Added new keybindings for rotating and flipping objects. The defaults
-      are R for clockwise, Shift+R for counterclockwise and F for flipping.
-    type: Add
-  id: 7103
-  time: '2024-08-13T13:36:45.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30540
-- author: Cojoke-dot
-  changes:
-  - message: Borg's names are now displayed when they make an announcement on the
-      Communications Console.
-    type: Tweak
-  id: 7104
-  time: '2024-08-13T18:31:33.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30107
-- author: Spessmann
-  changes:
-  - message: Added Cog, a new midpop map based on Cogmap from ss13
-    type: Add
-  id: 7105
-  time: '2024-08-13T19:27:25.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30840
-- author: PoorMansDreams
-  changes:
-  - message: Throngler Plushie looks like a plushie
-    type: Tweak
-  id: 7106
-  time: '2024-08-13T20:32:53.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30969
-- author: IProduceWidgets
-  changes:
-  - message: shuttle events have been separated from other midround events and can
-      now happen concurrently.
-    type: Tweak
-  - message: Cargo Gift events should be less likely.
-    type: Tweak
-  - message: meteors have been changed to be more responsive to player count.
-    type: Tweak
-  - message: 'Game mode: Kessler syndrome - What if survival but also the apocalypse?'
-    type: Add
-  - message: 'Game mode: Zombeteors - Zombies and a meteor shower all at once!'
-    type: Add
-  id: 7107
-  time: '2024-08-14T05:21:02.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29320
-- author: Blackern5000
-  changes:
-  - message: Combat medical kits now contain saline syringes.
-    type: Add
-  id: 7108
-  time: '2024-08-14T06:25:54.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29954
-- author: TheShuEd
-  changes:
-  - message: added morbilliard variants of procedural tacos and kebabs
-    type: Add
-  - message: removed all microwave taco and kebabs recipes (except for the taco shell
-      itself)
-    type: Remove
-  - message: you can fight with a skewer (even if it has food on it)
-    type: Tweak
-  - message: now you can't put more than 10 layers on a burger. (20 before)
-    type: Tweak
-  id: 7109
-  time: '2024-08-14T13:04:00.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30905
-- author: themias
-  changes:
-  - message: Fixed lizards being unable to eat custom burgers
-    type: Fix
-  id: 7110
-  time: '2024-08-14T19:47:04.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31005
 - author: Erisfiregamer1
   changes:
   - message: New chemical, Sedin. It restores seeds on plants 20% of the time with
@@ -3921,3 +3696,220 @@
   id: 7584
   time: '2024-11-02T15:12:26.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/33067
+- author: Plykiya
+  changes:
+  - message: Wielding weapons no longer displays your character's real identity when
+      your identity is hidden.
+    type: Fix
+  id: 7585
+  time: '2024-11-03T11:25:30.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33134
+- author: MilenVolf
+  changes:
+  - message: Ghost roles menu is now collapsible! This makes it much easier to find
+      a specific role that you want.
+    type: Tweak
+  id: 7586
+  time: '2024-11-04T00:49:42.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32717
+- author: Tr1bute
+  changes:
+  - message: A popup now appears when attempting to harvest mutated plants that require
+      sharp tools.
+    type: Add
+  id: 7587
+  time: '2024-11-04T00:56:41.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33136
+- author: Boolean-Buckeye
+  changes:
+  - message: Emergency lights can be constructed and deconstructed
+    type: Add
+  id: 7588
+  time: '2024-11-04T03:24:22.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32945
+- author: thetolbean
+  changes:
+  - message: The web coat and boots can now be broken down into silk.
+    type: Fix
+  id: 7589
+  time: '2024-11-04T03:33:51.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33121
+- author: Kickguy223
+  changes:
+  - message: Ion Storms now notify a Borg that their laws have changed via a sound
+      cue.
+    type: Add
+  id: 7590
+  time: '2024-11-04T11:23:12.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32887
+- author: DrSmugleaf
+  changes:
+  - message: Fixed not being able to see vote counts for non-votekick votes.
+    type: Fix
+  id: 7591
+  time: '2024-11-05T00:12:29.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33170
+- author: kirus59
+  changes:
+  - message: Fixed display of icons when using hunger or thirst huds
+    type: Fix
+  - message: Fixed errors spam when using beer goggles
+    type: Fix
+  id: 7592
+  time: '2024-11-05T16:58:23.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32832
+- author: Errant
+  changes:
+  - message: Syndicate Reinforcements no longer list their (hidden and unused) codewords
+      on the Round End window.
+    type: Fix
+  id: 7593
+  time: '2024-11-05T18:18:28.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33181
+- author: Baptr0b0t
+  changes:
+  - message: Fixed Intelicard can see through walls.
+    type: Fix
+  id: 7594
+  time: '2024-11-06T03:28:58.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33177
+- author: slarticodefast
+  changes:
+  - message: Removed the wanted list cartridge from the captain's PDA.
+    type: Remove
+  id: 7595
+  time: '2024-11-06T13:20:05.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33084
+- author: BramvanZijp
+  changes:
+  - message: Flare guns have been reworked to no longer automatically eject shells
+      after firing, and must now be opened manually to insert or eject shells. A safety
+      feature has also been added to prevent loading lethal shells into them.
+    type: Tweak
+  - message: Flare guns are twice as likely to appear in emergency closets, with the
+      same rarity as MRE's.
+    type: Tweak
+  - message: Added the security shell gun, a modified flare gun which is capable of
+      handling both nonlethal and lethal shotgun shells. It is able to be crafted
+      in the security techfab without needing any research.
+    type: Add
+  id: 7596
+  time: '2024-11-06T14:27:11.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32829
+- author: SlamBamActionman
+  changes:
+  - message: WT550 and C20-r's "burst" firemodes are now actual bursts.
+    type: Tweak
+  - message: Drozd is now a burst-only weapon (DPS remains unchanged!).
+    type: Tweak
+  id: 7597
+  time: '2024-11-06T14:39:16.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/31292
+- author: PopGamer46
+  changes:
+  - message: Fixed Lambordeere (botany shuttle) bolt buttons not being connected
+    type: Fix
+  id: 7598
+  time: '2024-11-07T22:02:25.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33065
+- author: Boaz1111
+  changes:
+  - message: Added casual green jumpsuits and skirts to the clothesmate.
+    type: Add
+  id: 7599
+  time: '2024-11-08T14:50:17.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/31710
+- author: ScarKy0
+  changes:
+  - message: Intellicarding the AI is now a doAfter.
+    type: Tweak
+  - message: AI now gets notified when someone tries to intellicard it.
+    type: Add
+  - message: You can no longer exchange the AI between intellicards.
+    type: Fix
+  id: 7600
+  time: '2024-11-09T19:29:29.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33198
+- author: IProduceWidgets
+  changes:
+  - message: weather now has a completion result for how to unset the weather.
+    type: Tweak
+  id: 7601
+  time: '2024-11-10T04:26:51.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33130
+- author: BramvanZijp
+  changes:
+  - message: The Flare Gun & Security Shell Gun now start in their open/unbolted state.
+    type: Tweak
+  id: 7602
+  time: '2024-11-11T16:12:36.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33248
+- author: AndrewMontagne
+  changes:
+  - message: APEs could be powered on without local power
+    type: Fix
+  id: 7603
+  time: '2024-11-11T22:58:31.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32493
+- author: thetolbean
+  changes:
+  - message: Droppers can no longer inject or draw from closed containers.
+    type: Fix
+  id: 7604
+  time: '2024-11-12T12:06:43.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33011
+- author: august-sun
+  changes:
+  - message: The inert flesh anomaly core can now be microwaved to turn into an anomalous
+      meat mass.
+    type: Tweak
+  id: 7605
+  time: '2024-11-13T02:59:47.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33223
+- author: Ubaser
+  changes:
+  - message: Window sprites are now slightly more transparent.
+    type: Tweak
+  id: 7606
+  time: '2024-11-13T12:30:40.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33282
+- author: keronshb
+  changes:
+  - message: Added Ethereal Jaunt! A Wizard Spell that turns you invisible and into
+      a ghost-like creature for escaping!
+    type: Add
+  id: 7607
+  time: '2024-11-13T23:36:37.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33201
+- author: CheddaCheez
+  changes:
+  - message: Fixed mimes being unable to break their vow more than once. Despicable!
+    type: Fix
+  id: 7608
+  time: '2024-11-14T16:56:22.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33303
+- author: PJB3005
+  changes:
+  - message: Borgs can now select their chassis type upon creation (construction or
+      job spawn), immediately giving borgs access to all chassis types.
+    type: Add
+  - message: Borg chassis types now come with built-in modules depending on the type,
+      so you can immediately do your job without help from science. Some upgrade modules
+      must still be installed later however.
+    type: Add
+  - message: Specialized chassis types have been removed from construction, as they
+      are no longer necessary.
+    type: Remove
+  - message: Borg unlock access is no longer determined by their chassis, it's always
+      science or command. This means the janitor can't unlock jani borgs anymore.
+    type: Remove
+  id: 7609
+  time: '2024-11-14T17:08:35.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32586
+- author: thetolbean
+  changes:
+  - message: The Quartermaster's requisition digi-board can no longer be recycled.
+    type: Fix
+  id: 7610
+  time: '2024-11-15T06:54:53.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33315
diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
index 42753b973b5..359afc9a53a 100644
--- a/Resources/Changelog/DeltaVChangelog.yml
+++ b/Resources/Changelog/DeltaVChangelog.yml
@@ -1,135 +1,4 @@
 Entries:
-- author: Adrian16199
-  changes:
-  - message: 'Added maiden outfits into janidrobe. '
-    type: Add
-  id: 199
-  time: '2024-01-07T14:57:38.0000000+00:00'
-- author: Adrian16199
-  changes:
-  - message: Prison guards are now mindshielded and have a security playtime requirement.
-    type: Fix
-  id: 200
-  time: '2024-01-07T18:20:45.0000000+00:00'
-- author: DebugOk
-  changes:
-  - message: Atmos hopefully shouldn't break anymore
-    type: Fix
-  id: 201
-  time: '2024-01-07T22:10:36.0000000+00:00'
-- author: Bribrooo
-  changes:
-  - message: 'added a ChemVend inside of Chemistry on Pebble Station '
-    type: Add
-  id: 202
-  time: '2024-01-11T06:14:27.0000000+00:00'
-- author: Adrian
-  changes:
-  - message: Shoukou has maintenance now in logistics and in security
-    type: Tweak
-  id: 203
-  time: '2024-01-12T22:08:47.0000000+00:00'
-- author: DebugOk
-  changes:
-  - message: Added the spare ID safe
-    type: Add
-  - message: The captain's locker no longer starts with a spare ID card
-    type: Remove
-  id: 204
-  time: '2024-01-14T23:48:30.0000000+00:00'
-- author: Velcroboy
-  changes:
-  - message: Added Hammurabi Prison Station. Crime must be punished!
-    type: Add
-  id: 205
-  time: '2024-01-17T03:53:36.0000000+00:00'
-- author: Gregg
-  changes:
-  - message: Adjusted the rules in regards to PDA confiscation and borg memory.
-    type: Tweak
-  id: 206
-  time: '2024-01-19T10:30:34.0000000+00:00'
-- author: DebugOk
-  changes:
-  - message: Zombies can no longer be psionic
-    type: Remove
-  id: 207
-  time: '2024-01-19T20:53:05.0000000+00:00'
-- author: Adrian16199
-  changes:
-  - message: Fixes mantis and them not be able to spawn with duffelbags and satchels.
-    type: Fix
-  id: 208
-  time: '2024-01-19T20:54:29.0000000+00:00'
-- author: Adrian16199
-  changes:
-  - message: Laika no longer takes 200 damage before dying from critical.
-    type: Fix
-  id: 209
-  time: '2024-01-19T20:57:11.0000000+00:00'
-- author: lleftTheDragon
-  changes: []
-  id: 210
-  time: '2024-01-19T21:06:32.0000000+00:00'
-- author: DebugOk
-  changes:
-  - message: Enabled gamerule voting on periapsis
-    type: Tweak
-  - message: Enabled map voting on periapsis
-    type: Tweak
-  id: 211
-  time: '2024-01-19T22:33:21.0000000+00:00'
-- author: DebugOk
-  changes:
-  - message: Added gridinv, sorry.
-    type: Add
-  id: 212
-  time: '2024-01-21T18:58:28.0000000+00:00'
-- author: TadJohnson00
-  changes:
-  - message: Pride vend has received an adjusted inventory. Make sure to check out
-      the new cloaks available!
-    type: Tweak
-  id: 213
-  time: '2024-01-30T14:22:13.0000000+00:00'
-- author: Colin-Tel
-  changes:
-  - message: Updated Asterisk Station.
-    type: Tweak
-  id: 214
-  time: '2024-01-30T21:09:41.0000000+00:00'
-- author: DebugOk
-  changes:
-  - message: You should be able to exit cryo even after leaving now, meaning it just
-      keeps your body safe?
-    type: Tweak
-  id: 215
-  time: '2024-01-31T07:41:58.0000000+00:00'
-- author: DebugOk
-  changes:
-  - message: Prisoners will no longer spawn in cryopods instead of in the brig.
-    type: Fix
-  id: 216
-  time: '2024-01-31T09:42:57.0000000+00:00'
-- author: leonardo-dabepis
-  changes:
-  - message: Made HCV cocktail less immediately lethal (damnation!!!)
-    type: Tweak
-  id: 217
-  time: '2024-01-31T10:34:16.0000000+00:00'
-- author: Adrian16199
-  changes:
-  - message: Shoukou has received the cryopods.
-    type: Tweak
-  id: 218
-  time: '2024-01-31T15:34:32.0000000+00:00'
-- author: DebugOk
-  changes:
-  - message: Prisoners can now spawn from a special cryopod that can be put in security,
-      instead of magically appearing in a cell.
-    type: Tweak
-  id: 219
-  time: '2024-01-31T22:02:05.0000000+00:00'
 - author: DangerRevolution
   changes:
   - message: Added sprites for Syndicate Listener's Headsets
@@ -3753,3 +3622,168 @@
   id: 698
   time: '2024-11-22T22:51:40.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/2254
+- author: pontaoski
+  changes:
+  - message: Characters with the "chronic pain" trait now spawn with 5 pills of 10u
+      soretizone to tide them over at the start of a shift
+    type: Add
+  id: 699
+  time: '2024-11-24T03:47:54.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2259
+- author: deltanedas
+  changes:
+  - message: Merged upstream changes from the last 2 weeks.
+    type: Add
+  - message: Security borgs have baton, seclite and holoprojector modules when a chassis
+      switches to it.
+    type: Tweak
+  - message: Removed the security borg wood baton module, they get real batongs now.
+    type: Remove
+  id: 700
+  time: '2024-11-24T04:37:29.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2205
+- author: deltanedas
+  changes:
+  - message: Fixed borgs not having names.
+    type: Fix
+  id: 701
+  time: '2024-11-24T10:06:56.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2276
+- author: dotCatshark
+  changes:
+  - message: Resprited EE sprites for corpse dragging.
+    type: Tweak
+  id: 702
+  time: '2024-11-24T10:07:37.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2255
+- author: Yule&
+  changes:
+  - message: NukeOps are 3% less valid.
+    type: Tweak
+  id: 703
+  time: '2024-11-24T10:08:19.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2208
+- author: deltanedas
+  changes:
+  - message: Re-enabled the portable recharger Tier 3 Arsenal tech.
+    type: Add
+  id: 704
+  time: '2024-11-24T10:09:31.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2206
+- author: moth
+  changes:
+  - message: Made moth's heat damage less insane.
+    type: Tweak
+  id: 705
+  time: '2024-11-24T10:15:12.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2277
+- author: Big Orthagonal
+  changes:
+  - message: Diagonal secborgs are not real and were never real.
+    type: Fix
+  id: 706
+  time: '2024-11-24T11:57:37.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2278
+- author: deltanedas
+  changes:
+  - message: Fixed salvage debris not having anything.
+    type: Fix
+  id: 707
+  time: '2024-11-24T20:25:25.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2280
+- author: DisposableCrewmember42
+  changes:
+  - message: Hungry? Stuff your face with cream from an emergency pie delivery for
+      a change!
+    type: Add
+  id: 708
+  time: '2024-11-25T05:30:25.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2211
+- author: deltanedas
+  changes:
+  - message: Initial Infecteds now get radio implants to communicate thanks to the
+      Syndicate.
+    type: Tweak
+  - message: Initial Infecteds now have to wait 5 minutes before they can turn, form
+      a plan!
+    type: Tweak
+  id: 709
+  time: '2024-11-26T12:23:26.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2194
+- author: Stop-Signs
+  changes:
+  - message: Omega particles are more deadly, Mystagogues beware!
+    type: Tweak
+  id: 710
+  time: '2024-11-26T18:19:14.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2292
+- author: Stop-Signs
+  changes:
+  - message: psych chems are no longer stronger nocturine
+    type: Tweak
+  id: 711
+  time: '2024-11-27T20:22:30.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2302
+- author: deltanedas
+  changes:
+  - message: Fixed borgs with special lawsets fixing their emag laws when switched
+      to.
+    type: Fix
+  id: 712
+  time: '2024-11-28T07:22:06.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2299
+- author: Kr8art
+  changes:
+  - message: Added customizable dogtags from Cosmatic Drift to the trinket loadout!
+    type: Add
+  id: 713
+  time: '2024-11-28T12:04:17.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2301
+- author: Kr8art
+  changes:
+  - message: The nuke core container now displays an appropriate message when hasty
+      syndicate agents try to insert the nuke core while it is still closed!
+    type: Fix
+  id: 714
+  time: '2024-11-28T19:36:26.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2309
+- author: Kr8art
+  changes:
+  - message: Added a restock for the sustenance vendor to end the ongoing involuntary
+      hunger strikes in perma.
+    type: Add
+  id: 715
+  time: '2024-11-29T01:27:57.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2307
+- author: Emily9031
+  changes:
+  - message: Felinids, vulpkanin, harpies, and rodentia now have gasping sounds.
+    type: Fix
+  id: 716
+  time: '2024-11-29T06:35:24.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2313
+- author: DisposableCrewmember42
+  changes:
+  - message: NanoTrasen has established business relations with HydroCo! You can now
+      order powdered milk and juice via your Logistics department and bet on the growth
+      of the HYD stock.
+    type: Add
+  id: 717
+  time: '2024-11-29T09:51:20.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2210
+- author: Stop-Signs
+  changes:
+  - message: Meatspike will now take longer to construct
+    type: Tweak
+  id: 718
+  time: '2024-11-29T17:08:03.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2319
+- author: CheddaCheez
+  changes:
+  - message: Made grilled cheese, scrambled eggs, and buttered baked corn recipes
+      use less butter. Grilled cheese and scrambled eggs are more efficiently nutritious,
+      and scrambled eggs use one less egg.
+    type: Tweak
+  id: 719
+  time: '2024-11-29T19:23:49.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2321
diff --git a/Resources/ConfigPresets/DeltaV/deltav.toml b/Resources/ConfigPresets/DeltaV/deltav.toml
index 8b98868b7d7..a09d5807546 100644
--- a/Resources/ConfigPresets/DeltaV/deltav.toml
+++ b/Resources/ConfigPresets/DeltaV/deltav.toml
@@ -21,6 +21,7 @@ tickrate = 30
 
 [vote]
 restart_required_ratio = 0.7
+preset_enabled = false
 
 [netres]
 limit    = 10.0
@@ -38,12 +39,18 @@ uptime_restart_minutes = 2880 # 48h
 [discord]
 rich_main_icon_id = "deltav"
 
+# general mrp stuff
 [ic]
 flavor_text = true
+punctuation = true
 
+# Disabled because it causes giga lag
 #[worldgen]
 #enabled = true
 
+[rules]
+time = 60
+
 [ahelp]
 admin_prefix = false
 admin_prefix_webhook = false
@@ -53,3 +60,16 @@ enabled = false # only enabled on periapsis
 eligible_number = 5
 initiator_ghost_requirement = false
 voter_ghost_requirement = false
+
+[atmos]
+space_wind = true
+
+[shuttle]
+arrivals = false
+emergency_dock_time = 240 # an extra minute over the default
+emergency_transit_time_min = 90
+auto_call_time = 120 # rounds are longer
+auto_call_extension_time = 30 # next auto call at 2h30
+
+[biomass]
+easy_mode = false # reclaimer can work on soul-ful bodies, mrp server
diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt
index d63e8432bfe..6eb1f944d31 100644
--- a/Resources/Credits/GitHub.txt
+++ b/Resources/Credits/GitHub.txt
@@ -1 +1 @@
-0x6273, 12rabbits, 13spacemen, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 2digitman, 3nderall, 4310v343k, 4dplanner, 612git, 778b, Ablankmann, abregado, Absolute-Potato, Acruid, actioninja, actually-reb, ada-please, adamsong, Adeinitas, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, afrokada, Agoichi, Ahion, aiden, Aikakakah, aitorlogedo, AJCM-git, AjexRose, Alekshhh, alexkar598, AlexMorgan3817, alexumandxgabriel08x, Alithsko, ALMv1, Alpha-Two, AlphaQwerty, Altoids1, amylizzle, ancientpower, Andre19926, AndrewEyeke, AndreyCamper, angelofallars, Anzarot121, Appiah, ar4ill, ArchPigeon, ArchRBX, areitpog, Arendian, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, AruMoon, ArZarLordOfMango, as334, AsikKEsel, AsnDen, asperger-sind, aspiringLich, astriloqua, august-sun, AutoOtter, Avalon-Proto, avghdev, Awlod, azzy, AzzyIsNotHere, BackeTako, BananaFlambe, Baptr0b0t, BasedPugilist, BasedUser, Batuh1n, beck-thompson, BellwetherLogic, benev0, benjamin-burges, BGare, bhespiritu, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, BlitzTheSquishy, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, BombasterDS, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, Bribrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, bvelliquette, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, capnsockless, CaptainSqrBeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, Catofquestionableethics, CatTheSystem, Centronias, chairbender, Charlese2, charlie, ChaseFlorom, chavonadelal, Cheackraze, cheesePizza2, cheeseplated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbygummibear, Ciac32, civilCornball, Clement-O, clyf, Clyybber, CMDR-Piboy314, CodedCrow, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, CookieMasterT, coolboy911, coolmankid12345, Coolsurf6, corentt, CormosLemming, crazybrain23, creadth, CrigCrag, croilbird, Crotalus, CrudeWax, CrzyPotato, cutemoongod, Cyberboss, d34d10cc, dabigoose, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, DangerRevolution, daniel-cr, DanSAussieITS, Daracke, DarkenedSynergy, Darkenson, DawBla, Daxxi3, dch-GH, de0rix, Deahaka, dean, DEATHB4DEFEAT, DeathCamel58, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, DefinitelyNotFurryXD, degradka, Delete69, deltanedas, DeltaV-Bot, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, dexlerxd, dffdff2423, dge21, DieselMohawk, digitalic, Dimastra, DinoWattz, DisposableCrewmember42, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DoctorBeard, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, dootythefrooty, Dorragon, Doru991, DoubleRiceEddiedd, DoutorWhite, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, Dynexust, Easypoller, eclips_e, eden077, EEASAS, Efruit, efzapa, ElectroSR, elsie, elthundercloud, Elysium206, Emisse, emmafornash, EmoGarbage404, Endecc, eoineoineoin, eris, erohrs2, ERORR404V1, Errant-4, esguard, estacaoespacialpirata, Eternally-Confused, eugene, ewokswagger, exincore, exp111, f0x-n3rd, FacePluslll, Fahasor, FairlySadPanda, FATFSAAM2, Feluk6174, ficcialfaint, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, FirinMaLazors, Fishfish458, FL-OZ, Flareguy, flashgnash, FluffiestFloof, FluffMe, FluidRock, flyingkarii, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, Fouin, foxhorn, freeman2651, freeze2222, Froffy025, Fromoriss, froozigiusz, FrostMando, FryOfDestiny, FungiFellow, FunTust, Futuristic-OK, GalacticChimp, gamer3107, Gaxeer, gbasood, Geekyhobo, genderGeometries, GeneralGaws, Genkail, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, gituhabu, GlassEclipse, GNF54, godisdeadLOL, goet, Goldminermac, Golinth, GoodWheatley, Gorox221, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, greggthefather, GreyMario, GTRsound, Guess-My-Name, gusxyz, Gyrandola, h3half, Haltell, Hanzdegloker, HappyRoach, Hardly3D, harikattar, HawkeyeBlade, he1acdvv, Hebi, Henry, HerCoyote23, HighTechPuddle, hitomishirichan, hiucko, Hmeister-fake, Hmeister-real, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, Hreno, htmlsystem, hubismal, Hugal31, Huxellberger, Hyenh, hyphenationc, i-justuser-i, iacore, IamVelcroboy, ian, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imrenq, imweax, indeano, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, itsmethom, Itzbenz, iztokbajcar, Jackal298, Jackrost, jacksonzck, Jackw2As, jacob, jamessimo, janekvap, Jark255, Jaskanbe, JasperJRoth, jerryimmouse, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, jmcb, JoeHammad1844, JohnGinnane, johnku1, Jophire, joshepvodka, Jrpl, juliangiebel, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, KaiShibaa, kalane15, kalanosh, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, Kimpes, KingFroozy, kira-er, Kirillcas, Kirus59, Kistras, Kit0vras, KittenColony, klaypexx, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, kosticia, koteq, KrasnoshchekovPavel, Krunklehorn, Kupie, Kurzaen, kxvvv, kyupolaris, kzhanik, lajolico, Lamrr, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leander-0, leonardo-dabepis, leonsfriedrich, lettern, LetterN, Level10Cybermancer, LEVELcat, lever1209, Lgibb18, lgruthes, LightVillet, liltenhead, LinkUyx, LittleBuilderJane, LittleNyanCat, lizelive, lleftTheDragon, localcc, lokachop, Lomcastar, LordCarve, LordEclipse, lucas, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luizwritescode, Lukasz825700516, luminight, lunarcomets, luringens, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M3739, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, MagnusCrowe, malchanceux, MaloTV, manelnavola, ManelNavola, Mangohydra, marboww, Markek1, Matz05, max, MaxNox7, maylokana, MehimoNemo, MeltedPixel, MemeProof, memoblob, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, MilenVolf, MilonPL, Minemoder5000, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterMecky, Mith-randalf, MjrLandWhale, mkanke-real, MLGTASTICa, mnemotechnician, moderatelyaware, modern-nm, mokiros, Moneyl, Monotheonist, Moomoobeef, moony, Morb0, mr-bo-jangles, Mr0maks, MrFippik, mrrobdemo, muburu, MureixloI, musicmanvr, MWKane, Myakot, Myctai, N3X15, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neutrino-laser, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, NIXC, NkoKirkto, nmajask, noctyrnal, noelkathegod, nok-ko, NonchalantNoob, NoobyLegion, Nopey, not-gavnaed, notafet, notquitehadouken, notsodana, noudoit, noverd, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, NullWanderer, nyeogmi, Nylux, Nyranu, och-och, ocotheomega, OctoRocket, OldDanceJacket, OnyxTheBrave, OrangeMoronage9622, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paigemaeforrest, pali6, Pangogie, panzer-iv1, paolordls, partyaddict, patrikturi, PaulRitter, peccneck, Peptide90, peptron1, PeterFuto, PetMudstone, pewter-wiz, Pgriha, Phantom-Lily, PHCodes, pheenty, Phill101, phunnyguy, PilgrimViis, Pill-U, Pireax, pissdemon, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, pofitlo, pointer-to-null, pok27, PolterTzi, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, PPooch, ProfanedBane, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykzz, PuceTint, PuroSlavKing, PursuitInAshes, Putnam3145, qrtDaniil, quatre, QueerNB, QuietlyWhisper, qwerltaz, Radezolid, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, RemberBM, RemieRichards, RemTim, Remuchi, rene-descartes2021, Renlou, retequizzle, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, RobbyTheFish, Rockdtben, Rohesie, rok-povsic, rolfero, RomanNovo, rosieposieeee, Roudenn, router, RumiTiger, S1rFl0, S1ss3l, Saakra, Sadie-silly, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, Samsterious, SaphireLattice, SapphicOverload, sarahon, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, scrato, Scribbles0, scrivoy, scruq445, scuffedjays, ScumbagDog, Segonist, sephtasm, Serkket, sewerpig, sh18rw, ShadeAware, ShadowCommander, Shadowtheprotogen546, shadowwailker, shaeone, shampunj, shariathotpatrol, ShatteredSwords, SignalWalker, siigiil, SimpleStation14, Simyon264, sirdragooon, Sirionaut, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, Slyfox333, snebl, sniperchance, Snowni, snowsignal, solaris7518, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, southbridge-fur, Soydium, SpaceLizardSky, SpaceManiac, SpaceRox1244, SpaceyLady, spartak, SpartanKadence, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, sporkyz, Squishy77, SsalamethVersaach, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, Stealthbomber16, stellar-novas, stomf, Stop-Signs, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, superjj18, Supernorn, SweptWasTaken, Sybil, SYNCHRONIC, Szunti, TadJohnson00, Tainakov, takemysoult, TaralGit, Taran, taurie, Tayrtahn, tday93, teamaki, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, TGRCdev, tgrkzus, ThataKat, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, theashtronaut, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, TheIntoxicatedCat, thekilk, themias, theomund, TheOneWhoIsManyFrame, theOperand, TherapyGoth, therealDLondon, TheShuEd, thetolbean, thevinter, TheWaffleJesus, Thinbug0, ThunderBear2006, Timemaster99, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, Titian3, tk-a369, tkdrg, tmtmtl30, toasterpm87, TokenStyle, Tollhouse, Toly65, tom-leys, tomasalves8, Tomce795, Tomeno, Tonydatguy, topy, Tornado-Technology, tosatur, TotallyLemon, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, tyashley, Tyler-IN, Tyzemol, UbaserB, ubis1, UBlueberry, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, Unkn0wnGh0st333, unusualcrow, Uriende, UristMcDorf, user424242420, Vaaankas, valentfingerov, Varen, Vasilis, VasilisThePikachu, Velcroboy, veliebm, VelonacepsCalyxEggs, venn, veprolet, veritable-calamity, Veritius, Vermidia, vero5123, Verslebas, VigersRay, violet754, Visne, vitalvitriol, VMSolidus, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, vulppine, wafehling, Warentan, WarMechanic, Watermelon914, weaversam8, wertanchik, whateverusername0, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, wrexbe, wtcwr68, xkreksx, xprospero, xRiriq, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, Yousifb26, youtissoum, yunii, YuriyKiss, yuriykiss, zach-hill, Zadeon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, ZeWaka, zionnBE, ZNixian, ZoldorfTheWizard, zonespace27, ZweiHawke, Zylofan, Zymem, zzylex
+0x6273, 12rabbits, 13spacemen, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 2digitman, 3nderall, 4310v343k, 4dplanner, 612git, 778b, Ablankmann, abregado, Absolute-Potato, Acruid, actioninja, actually-reb, ada-please, adamsong, Adeinitas, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, afrokada, Agoichi, Ahion, aiden, Aikakakah, aitorlogedo, AJCM-git, AjexRose, Alekshhh, alexkar598, AlexMorgan3817, alexumandxgabriel08x, Alithsko, ALMv1, Alpha-Two, AlphaQwerty, Altoids1, amylizzle, ancientpower, Andre19926, AndrewEyeke, AndreyCamper, angelofallars, Anzarot121, Appiah, ar4ill, ArchPigeon, ArchRBX, areitpog, Arendian, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, AruMoon, ArZarLordOfMango, as334, AsikKEsel, AsnDen, asperger-sind, aspiringLich, astriloqua, august-sun, AutoOtter, Avalon-Proto, avghdev, Awlod, azzy, AzzyIsNotHere, BackeTako, BananaFlambe, Baptr0b0t, BasedPugilist, BasedUser, Batuh1n, beck-thompson, BellwetherLogic, benev0, benjamin-burges, BGare, bhespiritu, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, BlitzTheSquishy, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, BombasterDS, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, Bribrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, bvelliquette, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, capnsockless, CaptainSqrBeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, Catofquestionableethics, CatTheSystem, Centronias, chairbender, Charlese2, charlie, ChaseFlorom, chavonadelal, Cheackraze, cheesePizza2, cheeseplated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbygummibear, Ciac32, civilCornball, Clement-O, clyf, Clyybber, CMDR-Piboy314, CodedCrow, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, CookieMasterT, coolboy911, coolmankid12345, Coolsurf6, corentt, CormosLemming, CrafterKolyan, crazybrain23, creadth, CrigCrag, croilbird, Crotalus, CrudeWax, CrzyPotato, cutemoongod, Cyberboss, d34d10cc, dabigoose, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, DangerRevolution, daniel-cr, DanSAussieITS, Daracke, DarkenedSynergy, Darkenson, DawBla, Daxxi3, dch-GH, de0rix, Deahaka, dean, DEATHB4DEFEAT, DeathCamel58, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, DefinitelyNotFurryXD, degradka, Delete69, deltanedas, DeltaV-Bot, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, dexlerxd, dffdff2423, dge21, DieselMohawk, digitalic, Dimastra, DinoWattz, DisposableCrewmember42, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DoctorBeard, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, dootythefrooty, Dorragon, Doru991, DoubleRiceEddiedd, DoutorWhite, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, dylanstrategie, Dynexust, Easypoller, eclips_e, eden077, EEASAS, Efruit, efzapa, ElectroSR, elsie, elthundercloud, Elysium206, Emisse, emmafornash, EmoGarbage404, Endecc, eoineoineoin, eris, erohrs2, ERORR404V1, Errant-4, esguard, estacaoespacialpirata, Eternally-Confused, eugene, ewokswagger, exincore, exp111, f0x-n3rd, FacePluslll, Fahasor, FairlySadPanda, FATFSAAM2, Feluk6174, ficcialfaint, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, FirinMaLazors, Fishfish458, FL-OZ, Flareguy, flashgnash, FluffiestFloof, FluffMe, FluidRock, flyingkarii, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, Fouin, foxhorn, freeman2651, freeze2222, Froffy025, Fromoriss, froozigiusz, FrostMando, FryOfDestiny, FungiFellow, FunTust, Futuristic-OK, GalacticChimp, gamer3107, Gaxeer, gbasood, Geekyhobo, genderGeometries, GeneralGaws, Genkail, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, gituhabu, GlassEclipse, GNF54, godisdeadLOL, goet, Goldminermac, Golinth, GoodWheatley, Gorox221, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, greggthefather, GreyMario, GTRsound, Guess-My-Name, gusxyz, Gyrandola, h3half, Haltell, Hanzdegloker, HappyRoach, Hardly3D, harikattar, HawkeyeBlade, he1acdvv, Hebi, Henry, HerCoyote23, HighTechPuddle, hitomishirichan, hiucko, Hmeister-fake, Hmeister-real, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, Hreno, htmlsystem, hubismal, Hugal31, Huxellberger, Hyenh, hyphenationc, i-justuser-i, iacore, IamVelcroboy, ian, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imrenq, imweax, indeano, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, itsmethom, Itzbenz, iztokbajcar, Jackal298, Jackrost, jacksonzck, Jackw2As, jacob, jamessimo, janekvap, Jark255, Jaskanbe, JasperJRoth, JerryImMouse, jerryimmouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, jmcb, JoeHammad1844, JohnGinnane, johnku1, Jophire, joshepvodka, Jrpl, juliangiebel, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, KaiShibaa, kalane15, kalanosh, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, Kimpes, KingFroozy, kira-er, Kirillcas, Kirus59, Kistras, Kit0vras, KittenColony, klaypexx, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, kosticia, koteq, Kr8art, KrasnoshchekovPavel, Krunklehorn, Kupie, Kurzaen, kxvvv, kyupolaris, kzhanik, lajolico, Lamrr, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leander-0, leonardo-dabepis, leonsfriedrich, LetterN, lettern, Level10Cybermancer, LEVELcat, lever1209, Lgibb18, lgruthes, LightVillet, liltenhead, LinkUyx, LittleBuilderJane, LittleNyanCat, lizelive, lleftTheDragon, localcc, lokachop, Lomcastar, LordCarve, LordEclipse, lucas, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luizwritescode, Lukasz825700516, luminight, lunarcomets, luringens, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M3739, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, MagnusCrowe, malchanceux, MaloTV, ManelNavola, manelnavola, Mangohydra, marboww, Markek1, Matz05, max, MaxNox7, maylokana, MehimoNemo, MeltedPixel, MemeProof, memoblob, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, MilenVolf, MilonPL, Minemoder5000, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterMecky, Mith-randalf, MjrLandWhale, mkanke-real, MLGTASTICa, mnemotechnician, moderatelyaware, modern-nm, mokiros, Moneyl, Monotheonist, Moomoobeef, moony, Morb0, mr-bo-jangles, Mr0maks, MrFippik, mrrobdemo, muburu, MureixloI, musicmanvr, MWKane, Myakot, Myctai, N3X15, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neutrino-laser, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, NIXC, NkoKirkto, nmajask, noctyrnal, noelkathegod, nok-ko, NonchalantNoob, NoobyLegion, Nopey, not-gavnaed, notafet, notquitehadouken, notsodana, noudoit, noverd, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, NullWanderer, nyeogmi, Nylux, Nyranu, och-och, ocotheomega, OctoRocket, OldDanceJacket, OnyxTheBrave, OrangeMoronage9622, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paigemaeforrest, pali6, Pangogie, panzer-iv1, paolordls, partyaddict, patrikturi, PaulRitter, peccneck, Peptide90, peptron1, PeterFuto, PetMudstone, pewter-wiz, Pgriha, Phantom-Lily, PHCodes, pheenty, Phill101, phunnyguy, PilgrimViis, Pill-U, Pireax, pissdemon, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, pofitlo, pointer-to-null, pok27, PolterTzi, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, PPooch, ProfanedBane, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykzz, PuceTint, PuroSlavKing, PursuitInAshes, Putnam3145, qrtDaniil, quatre, QueerNB, QuietlyWhisper, qwerltaz, Radezolid, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, RemberBM, RemieRichards, RemTim, Remuchi, rene-descartes2021, Renlou, retequizzle, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, RobbyTheFish, Rockdtben, Rohesie, rok-povsic, rolfero, RomanNovo, rosieposieeee, Roudenn, router, RumiTiger, S1rFl0, S1ss3l, Saakra, Sadie-silly, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, Samsterious, SaphireLattice, SapphicOverload, sarahon, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, scrato, Scribbles0, scrivoy, scruq445, scuffedjays, ScumbagDog, Segonist, sephtasm, Serkket, sewerpig, sh18rw, ShadeAware, ShadowCommander, Shadowtheprotogen546, shadowwailker, shaeone, shampunj, shariathotpatrol, ShatteredSwords, SignalWalker, siigiil, SimpleStation14, Simyon264, sirdragooon, Sirionaut, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, Slyfox333, snebl, sniperchance, Snowni, snowsignal, solaris7518, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, southbridge-fur, Soydium, SpaceLizardSky, SpaceManiac, SpaceRox1244, SpaceyLady, spartak, SpartanKadence, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, sporkyz, Squishy77, SsalamethVersaach, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, Stealthbomber16, stellar-novas, stomf, Stop-Signs, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, superjj18, Supernorn, SweptWasTaken, Sybil, SYNCHRONIC, Szunti, TadJohnson00, Tainakov, takemysoult, TaralGit, Taran, taurie, Tayrtahn, tday93, teamaki, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, TGRCdev, tgrkzus, ThataKat, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, theashtronaut, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, TheIntoxicatedCat, thekilk, themias, theomund, TheOneWhoIsManyFrame, theOperand, TherapyGoth, therealDLondon, TheShuEd, thetolbean, thevinter, TheWaffleJesus, Thinbug0, ThunderBear2006, Timemaster99, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, Titian3, tk-a369, tkdrg, tmtmtl30, toasterpm87, TokenStyle, Tollhouse, Toly65, tom-leys, tomasalves8, Tomce795, Tomeno, Tonydatguy, topy, Tornado-Technology, tosatur, TotallyLemon, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, tyashley, Tyler-IN, Tyzemol, UbaserB, ubis1, UBlueberry, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, Unkn0wnGh0st333, unusualcrow, Uriende, UristMcDorf, user424242420, Vaaankas, valentfingerov, Varen, Vasilis, VasilisThePikachu, Velcroboy, veliebm, VelonacepsCalyxEggs, venn, veprolet, veritable-calamity, Veritius, Vermidia, vero5123, Verslebas, VigersRay, violet754, Visne, vitalvitriol, VMSolidus, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, vulppine, wafehling, Warentan, WarMechanic, Watermelon914, weaversam8, wertanchik, whateverusername0, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, wrexbe, wtcwr68, xkreksx, xprospero, xRiriq, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, Yousifb26, youtissoum, yunii, yuriykiss, YuriyKiss, zach-hill, Zadeon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, ZeWaka, zionnBE, ZNixian, ZoldorfTheWizard, zonespace27, ZweiHawke, Zylofan, Zymem, zzylex
diff --git a/Resources/Locale/en-US/_CD/engraving/engraving.ftl b/Resources/Locale/en-US/_CD/engraving/engraving.ftl
new file mode 100644
index 00000000000..fc6ca919ead
--- /dev/null
+++ b/Resources/Locale/en-US/_CD/engraving/engraving.ftl
@@ -0,0 +1,6 @@
+engraving-verb-engrave = Engrave
+engraving-popup-ui-message = Description
+
+engraving-dogtags-no-message = The dogtags don't seem to have any kind of engraving.
+engraving-dogtags-has-message = The dogtags are engraved with a message that reads:{" "}
+engraving-dogtags-succeed = You successfully engrave the dogtags with your message.
diff --git a/Resources/Locale/en-US/administration/ui/admin-notes.ftl b/Resources/Locale/en-US/administration/ui/admin-notes.ftl
index 03e12902576..c8da267e058 100644
--- a/Resources/Locale/en-US/administration/ui/admin-notes.ftl
+++ b/Resources/Locale/en-US/administration/ui/admin-notes.ftl
@@ -57,13 +57,23 @@ admin-note-editor-severity-medium = Medium
 admin-note-editor-severity-high = High
 admin-note-editor-expiry-checkbox = Permanent?
 admin-note-editor-expiry-checkbox-tooltip = Check this to make it expire
-admin-note-editor-expiry-label = Expires on:
+admin-note-editor-expiry-label = Expires in:
 admin-note-editor-expiry-label-params = Expires on: {$date} (in {$expiresIn})
 admin-note-editor-expiry-label-expired = Expired
-admin-note-editor-expiry-placeholder = Enter expiration date (yyyy-MM-dd HH:mm:ss)
+admin-note-editor-expiry-placeholder = Enter expiration time (integer).
 admin-note-editor-submit = Submit
 admin-note-editor-submit-confirm = Are you sure?
 
+# Time
+admin-note-button-minutes = Minutes
+admin-note-button-hours = Hours
+admin-note-button-days = Days
+admin-note-button-weeks = Weeks
+admin-note-button-months = Months
+admin-note-button-years = Years
+admin-note-button-centuries = Centuries
+
+
 # Verb
 admin-notes-verb-text = Open Admin Notes
 
diff --git a/Resources/Locale/en-US/alerts/alerts.ftl b/Resources/Locale/en-US/alerts/alerts.ftl
index 37af416c3a1..1748798beae 100644
--- a/Resources/Locale/en-US/alerts/alerts.ftl
+++ b/Resources/Locale/en-US/alerts/alerts.ftl
@@ -27,6 +27,9 @@ alerts-weightless-desc =
     Gravity has ceased affecting you, and you're floating around aimlessly. Find something sturdy to hold onto, or throw or shoot something in a direction opposite of you.
     Mag-boots or jetpacks would help you move with more control.
 
+alerts-walking-name = Walking
+alerts-walking-desc = You are walking, moving at a slow pace.
+
 alerts-stunned-name = [color=yellow]Stunned[/color]
 alerts-stunned-desc = You're [color=yellow]stunned[/color]! Something is impairing your ability to move or interact with objects.
 
diff --git a/Resources/Locale/en-US/borg/borg.ftl b/Resources/Locale/en-US/borg/borg.ftl
index 6c495510b05..9c9dc71069a 100644
--- a/Resources/Locale/en-US/borg/borg.ftl
+++ b/Resources/Locale/en-US/borg/borg.ftl
@@ -25,3 +25,40 @@ borg-transponder-disabling-popup = Your transponder begins to lock you out of th
 borg-transponder-destroying-popup = The self destruct of {$name} starts beeping!
 borg-transponder-emagged-disabled-popup = Your transponder's lights go out!
 borg-transponder-emagged-destroyed-popup = Your transponder's fuse blows!
+
+## Borg type selection UI.
+borg-select-type-menu-title = Select Chassis Type
+borg-select-type-menu-bottom-text = Chassis selection is irreversible
+borg-select-type-menu-available = Available types
+borg-select-type-menu-information = Information
+borg-select-type-menu-select-type = Select type to view information
+borg-select-type-menu-confirm = Confirm selection
+borg-select-type-menu-guidebook = Guidebook
+
+## Borg type information
+
+borg-type-generic-name = Generic
+borg-type-generic-desc = Jack of all trades, master of none. Do various random station tasks, or maybe help out the science department that built you.
+borg-type-generic-transponder = generic cyborg
+
+borg-type-engineering-name = Engineering
+borg-type-engineering-desc = Assist the engineering team in station construction, repairing damage, or fixing electrical and atmospheric issues.
+borg-type-engineering-transponder = engineering cyborg
+
+borg-type-mining-name = Salvage
+borg-type-mining-desc = Join salvage and help them mine for materials, scavenge wrecks, and fight off hostile wildlife.
+borg-type-mining-transponder = salvage cyborg
+
+borg-type-janitor-name = Janitor
+borg-type-janitor-desc = Keep the station nice and tidy, clean up spills, collect and properly dispose of trash left around by lazy crewmembers.
+borg-type-janitor-transponder = janitor cyborg
+
+borg-type-medical-name = Medical
+borg-type-medical-desc = Provide medical attention to crew who need it, either in medbay or in hazardous areas conventional paramedics cannot reach.
+borg-type-medical-transponder = medical cyborg
+
+borg-type-service-name = Service
+borg-type-service-desc = Help out with a wide range of crew services, ranging from serving snacks and drinks to botany to entertainment.
+borg-type-service-transponder = service cyborg
+
+
diff --git a/Resources/Locale/en-US/botany/components/plant-holder-component.ftl b/Resources/Locale/en-US/botany/components/plant-holder-component.ftl
index ca20c277f53..0f416455c7e 100644
--- a/Resources/Locale/en-US/botany/components/plant-holder-component.ftl
+++ b/Resources/Locale/en-US/botany/components/plant-holder-component.ftl
@@ -31,3 +31,4 @@ plant-holder-component-heat-improper-warning = The [color=orange]improper temper
 plant-holder-component-pressure-improper-warning = The [color=lightblue]improper environment pressure alert[/color] is blinking.
 plant-holder-component-gas-missing-warning = The [color=cyan]improper gas environment alert[/color] is blinking.
 plant-holder-component-early-sample-message = The plant hasn't grown enough to take a sample yet.
+plant-holder-component-ligneous-cant-harvest-message = The plant is too tough to harvest with your bare hands.
diff --git a/Resources/Locale/en-US/chameleon-projector/chameleon-projector.ftl b/Resources/Locale/en-US/chameleon-projector/chameleon-projector.ftl
index 2c622b1400b..b525c9da1a3 100644
--- a/Resources/Locale/en-US/chameleon-projector/chameleon-projector.ftl
+++ b/Resources/Locale/en-US/chameleon-projector/chameleon-projector.ftl
@@ -1,3 +1,4 @@
 chameleon-projector-inside-container = There's no room to scan that!
 chameleon-projector-invalid = You can't disguise as that!
 chameleon-projector-success = Projected new disguise.
+chameleon-projector-set-disguise = Set Disguise
diff --git a/Resources/Locale/en-US/commands/toolshed-commands.ftl b/Resources/Locale/en-US/commands/toolshed-commands.ftl
index e2536f6781b..c53c825eb3e 100644
--- a/Resources/Locale/en-US/commands/toolshed-commands.ftl
+++ b/Resources/Locale/en-US/commands/toolshed-commands.ftl
@@ -1,4 +1,4 @@
-command-description-visualize =
+command-description-visualize =
     Takes the input list of entities and puts them into a UI window for easy browsing.
 command-description-runverbas =
     Runs a verb over the input entities with the given user.
@@ -58,6 +58,8 @@ command-description-rejuvenate =
     Rejuvenates the given entities, restoring them to full health, clearing status effects, etc.
 command-description-tag-list =
     Lists tags on the given entities.
+command-description-tag-with =
+    Returns only the entities with the given tag from the piped list of entities.
 command-description-tag-add =
     Adds a tag to the given entities.
 command-description-tag-rm =
diff --git a/Resources/Locale/en-US/deltav/borg/borg.ftl b/Resources/Locale/en-US/deltav/borg/borg.ftl
new file mode 100644
index 00000000000..22c7e3850c6
--- /dev/null
+++ b/Resources/Locale/en-US/deltav/borg/borg.ftl
@@ -0,0 +1,3 @@
+borg-type-security-name = Security
+borg-type-security-desc = Assist security in the fight for justice by detaining dangerous criminals.
+borg-type-security-transponder = security cyborg
diff --git a/Resources/Locale/en-US/deltav/cargo/stocks-comapnies.ftl b/Resources/Locale/en-US/deltav/cargo/stocks-comapnies.ftl
index 69ef7330a56..09067ec1d57 100644
--- a/Resources/Locale/en-US/deltav/cargo/stocks-comapnies.ftl
+++ b/Resources/Locale/en-US/deltav/cargo/stocks-comapnies.ftl
@@ -4,3 +4,4 @@ stock-trading-company-gorlex = Gorlex [GRX]
 stock-trading-company-interdyne = Interdyne Pharmaceuticals [INTP]
 stock-trading-company-fishinc = Fish Inc. [FIN]
 stock-trading-company-donk = Donk Co. [DONK]
+stock-trading-company-hydroco = HydroCo [HYD]
diff --git a/Resources/Locale/en-US/deltav/communications/communications-console-component.ftl b/Resources/Locale/en-US/deltav/communications/communications-console-component.ftl
new file mode 100644
index 00000000000..a08029af6bd
--- /dev/null
+++ b/Resources/Locale/en-US/deltav/communications/communications-console-component.ftl
@@ -0,0 +1 @@
+comms-console-announcement-title-unauthorized = Unauthorized
diff --git a/Resources/Locale/en-US/deltav/game-ticking/game-presets/preset-zombies.ftl b/Resources/Locale/en-US/deltav/game-ticking/game-presets/preset-zombies.ftl
new file mode 100644
index 00000000000..1bc0332154b
--- /dev/null
+++ b/Resources/Locale/en-US/deltav/game-ticking/game-presets/preset-zombies.ftl
@@ -0,0 +1,2 @@
+zombie-bioterrorist-role-greeting = You are a syndicate sponsored bioterrorist sent to overtake the station by use of the Romerol virus. Coordinate with your team, get supplies and prepare for your eventual transformation. Death to nanotrasen!
+zombie-bioterrorist-romerol-active = The romerol in your blood is now active, you are ready to transform!
diff --git a/Resources/Locale/en-US/deltav/interaction/interaction-popup-component.ftl b/Resources/Locale/en-US/deltav/interaction/interaction-popup-component.ftl
index 38422195679..65c783d7a73 100644
--- a/Resources/Locale/en-US/deltav/interaction/interaction-popup-component.ftl
+++ b/Resources/Locale/en-US/deltav/interaction/interaction-popup-component.ftl
@@ -3,4 +3,7 @@
 ## Petting animals
 
 petting-success-nukie-mouse = You pet {THE($target)} on {POSS-ADJ($target)} little blood-red syndicate mouse head.
-petting-failure-nukie-mouse = You reach out to pet {THE($target)}, but {SUBJECT($target)} attempts to slice your finger with a mouse-sized e-dagger and only your quick reflexes save you from an almost fatal injury.
\ No newline at end of file
+petting-failure-nukie-mouse = You reach out to pet {THE($target)}, but {SUBJECT($target)} attempts to slice your finger with a mouse-sized e-dagger and only your quick reflexes save you from an almost fatal injury.
+
+petting-success-security-cyborg = You pet {THE($target)} on {POSS-ADJ($target)} bald, robust head.
+petting-failure-security-cyborg = You reach out to pet {THE($target)}, but {POSS_ADJ($target)} baton lights up!
diff --git a/Resources/Locale/en-US/deltav/prototypes/catalog/fills/crates/vending-crates.ftl b/Resources/Locale/en-US/deltav/prototypes/catalog/fills/crates/vending-crates.ftl
index c85296a6497..c962f83e877 100644
--- a/Resources/Locale/en-US/deltav/prototypes/catalog/fills/crates/vending-crates.ftl
+++ b/Resources/Locale/en-US/deltav/prototypes/catalog/fills/crates/vending-crates.ftl
@@ -1,2 +1,5 @@
 ent-CrateVendingMachineRestockPrideFilled = Pride-O-Mat restock crate
-    .desc = Contains a restock box for the Pride-O-Mat.
\ No newline at end of file
+    .desc = Contains a restock box for the Pride-O-Mat.
+
+ent-CrateVendingMachineRestockSustenanceFilled = Sustenance vendor restock crate
+    .desc = Contains a restock box for the sustenance vendor.
diff --git a/Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/powdered_drinks.ftl b/Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/powdered_drinks.ftl
new file mode 100644
index 00000000000..aaed484c664
--- /dev/null
+++ b/Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/powdered_drinks.ftl
@@ -0,0 +1,41 @@
+reagent-name-powdered-milk = powdered milk
+reagent-desc-powdered-milk = A powder-based milk substitute that can be reconstituted with water.
+
+reagent-name-powdered-milk-soy = powdered soy milk
+reagent-desc-powdered-milk-soy = A powder-based dairy-free milk substitute that can be reconstituted with water.
+
+reagent-name-powdered-juice-orange = powdered orange juice
+reagent-desc-powdered-juice-orange = A powder-based orange juice substitute that can be reconstituted with water.
+
+reagent-name-powdered-juice-lime = powdered lime juice
+reagent-desc-powdered-juice-lime = A powder-based lime juice substitute that can be reconstituted with water.
+
+reagent-name-powdered-juice-lemon = powdered lemon juice
+reagent-desc-powdered-juice-lemon = A powder-based lemon juice substitute that can be reconstituted with water.
+
+reagent-name-powdered-juice-pineapple = powdered pineapple juice
+reagent-desc-powdered-juice-pineapple = A powder-based pineapple juice substitute that can be reconstituted with water.
+
+reagent-name-powdered-juice-banana = powdered banana juice
+reagent-desc-powdered-juice-banana = A powder-based banana juice substitute that can be reconstituted with water.
+
+reagent-name-powdered-juice-berry = powdered berry juice
+reagent-desc-powdered-juice-berry = A powder-based berry juice substitute that can be reconstituted with water.
+
+reagent-name-powdered-juice-watermelon = powdered melon juice
+reagent-desc-powdered-juice-watermelon = A powder-based watermelon juice substitute that can be reconstituted with water.
+
+reagent-name-powdered-juice-grape = powdered grape juice
+reagent-desc-powdered-juice-grape = A powder-based grape juice substitute that can be reconstituted with water.
+
+reagent-name-powdered-juice-apple = powdered apple juice
+reagent-desc-powdered-juice-apple = A powder-based apple juice substitute that can be reconstituted with water.
+
+reagent-name-powdered-juice-cherry = powdered cherry juice
+reagent-desc-powdered-juice-cherry = A powder-based cherry juice substitute that can be reconstituted with water.
+
+reagent-name-powdered-juice-carrot = powdered carrot juice
+reagent-desc-powdered-juice-carrot = A powder-based carrot juice substitute that can be reconstituted with water.
+
+reagent-name-powdered-juice-tomato = powdered tomato juice
+reagent-desc-powdered-juice-tomato = A powder-based tomato juice substitute that can be reconstituted with water.
diff --git a/Resources/Locale/en-US/ghost/ghost-gui.ftl b/Resources/Locale/en-US/ghost/ghost-gui.ftl
index cd6c2f02706..5b19c73ea38 100644
--- a/Resources/Locale/en-US/ghost/ghost-gui.ftl
+++ b/Resources/Locale/en-US/ghost/ghost-gui.ftl
@@ -13,6 +13,7 @@ ghost-target-window-current-button = Warp: {$name}
 ghost-target-window-warp-to-most-followed = Warp to Most Followed
 
 ghost-roles-window-title = Ghost Roles
+ghost-roles-window-available-button = Available ({$rolesCount})
 ghost-roles-window-join-raffle-button = Join raffle
 ghost-roles-window-raffle-in-progress-button =
     Join raffle ({$time} left, { $players ->
diff --git a/Resources/Locale/en-US/intellicard/intellicard.ftl b/Resources/Locale/en-US/intellicard/intellicard.ftl
new file mode 100644
index 00000000000..aed155a1202
--- /dev/null
+++ b/Resources/Locale/en-US/intellicard/intellicard.ftl
@@ -0,0 +1,3 @@
+# General
+intellicard-core-occupied = The AI core is already occupied by another digital consciousness.
+intellicard-core-empty = The AI core has no digital consciousness to download.
\ No newline at end of file
diff --git a/Resources/Locale/en-US/nuke/nuke-core-container.ftl b/Resources/Locale/en-US/nuke/nuke-core-container.ftl
index 47ea15a8316..bbed978bd7e 100644
--- a/Resources/Locale/en-US/nuke/nuke-core-container.ftl
+++ b/Resources/Locale/en-US/nuke/nuke-core-container.ftl
@@ -1,2 +1,3 @@
 nuke-core-container-whitelist-fail-popup = That doesn't fit into the container.
 nuke-core-container-sealed-popup = The {$container} is sealed shut!
+nuke-core-container-closed-fail-popup = You need to open the container first!
diff --git a/Resources/Locale/en-US/silicons/station-ai.ftl b/Resources/Locale/en-US/silicons/station-ai.ftl
index 7d9db3f6dc5..76c30eb1018 100644
--- a/Resources/Locale/en-US/silicons/station-ai.ftl
+++ b/Resources/Locale/en-US/silicons/station-ai.ftl
@@ -20,3 +20,5 @@ electrify-door-off = Disable overcharge
 toggle-light = Toggle light
 
 ai-device-not-responding = Device is not responding
+
+ai-consciousness-download-warning = Your consciousness is being downloaded.
diff --git a/Resources/Locale/en-US/store/spellbook-catalog.ftl b/Resources/Locale/en-US/store/spellbook-catalog.ftl
index 457f02916f9..1d970f6e3ac 100644
--- a/Resources/Locale/en-US/store/spellbook-catalog.ftl
+++ b/Resources/Locale/en-US/store/spellbook-catalog.ftl
@@ -17,6 +17,9 @@ spellbook-polymorph-rod-desc = Change into an Immovable Rod with limited movemen
 spellbook-charge-name = Charge
 spellbook-charge-desc = Adds a charge back to your wand!
 
+spellbook-ethereal-jaunt-name = Ethereal Jaunt
+spellbook-ethereal-jaunt-description = Slip into the ethereal plane to slip away from your enemies!
+
 # Equipment
 
 spellbook-wand-polymorph-door-name = Wand of Entrance
@@ -33,3 +36,6 @@ spellbook-event-summon-ghosts-description = Who ya gonna call?
 # Upgrades
 spellbook-upgrade-fireball-name = Upgrade Fireball
 spellbook-upgrade-fireball-description = Upgrades Fireball to a maximum of level 3!
+
+spellbook-upgrade-jaunt-name = Upgrade Ethereal Jaunt
+spellbook-upgrade-jaunt-description = Upgrades Jaunt to a maximum of level 3!
diff --git a/Resources/Locale/en-US/weather/weather.ftl b/Resources/Locale/en-US/weather/weather.ftl
index 67e6eec35f2..0c67b6f66bf 100644
--- a/Resources/Locale/en-US/weather/weather.ftl
+++ b/Resources/Locale/en-US/weather/weather.ftl
@@ -1,6 +1,7 @@
 cmd-weather-desc = Sets the weather for the current map.
 cmd-weather-help = weather <mapId> <prototype / null>
 cmd-weather-hint = Weather prototype
+cmd-weather-null = Clears the weather
 
 cmd-weather-error-no-arguments = Not enough arguments!
 cmd-weather-error-unknown-proto = Unknown Weather prototype!
diff --git a/Resources/Maps/Ruins/abandoned_outpost.yml b/Resources/Maps/Ruins/abandoned_outpost.yml
new file mode 100644
index 00000000000..3c091f7dc67
--- /dev/null
+++ b/Resources/Maps/Ruins/abandoned_outpost.yml
@@ -0,0 +1,2786 @@
+meta:
+  format: 6
+  postmapinit: false
+tilemap:
+  0: Space
+  18: FloorBlueCircuit
+  32: FloorDark
+  37: FloorDarkMono
+  68: FloorMetalDiamond
+  83: FloorReinforced
+  97: FloorSteel
+  1: FloorSteelBurnt
+  4: FloorSteelDamaged
+  108: FloorSteelMono
+  116: FloorWhite
+  121: FloorWhiteMono
+  3: Lattice
+  130: Plating
+  5: PlatingBurnt
+  2: PlatingDamaged
+entities:
+- proto: ""
+  entities:
+  - uid: 2
+    components:
+    - type: MetaData
+      name: grid
+    - type: Transform
+      pos: 6.7773275,4.1394477
+      parent: invalid
+    - type: MapGrid
+      chunks:
+        0,0:
+          ind: 0,0
+          tiles: YQAAAAADbAAAAAADAQAAAAABYQAAAAABYQAAAAACbAAAAAABggAAAAAAggAAAAAAYQAAAAACggAAAAAAggAAAAAAggAAAAAAggAAAAAABQAAAAAAAwAAAAAAAwAAAAAAAQAAAAABBAAAAAABYQAAAAABYQAAAAAAeQAAAAACeQAAAAACggAAAAAAeQAAAAAAdAAAAAACeQAAAAACggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAgAAAAABYQAAAAAAeQAAAAADdAAAAAAAdAAAAAACggAAAAAAeQAAAAABdAAAAAABeQAAAAADggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAABBQAAAAAAYQAAAAACggAAAAAAdAAAAAACdAAAAAADggAAAAAAdAAAAAABeQAAAAABggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAABQAAAAAAAQAAAAABggAAAAAAeQAAAAACdAAAAAAAdAAAAAACdAAAAAADdAAAAAABeQAAAAADggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAggAAAAAABAAAAAAEggAAAAAAeQAAAAADdAAAAAADdAAAAAAAdAAAAAAAdAAAAAAAeQAAAAABggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAwAAAAAAAgAAAAACggAAAAAAdAAAAAABdAAAAAADdAAAAAACdAAAAAACdAAAAAACdAAAAAACggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAABQAAAAAAggAAAAAAdAAAAAAAdAAAAAADdAAAAAABdAAAAAACdAAAAAADdAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAwAAAAAAAwAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        0,-1:
+          ind: 0,-1
+          tiles: AAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAABQAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAABQAAAAAAAgAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAACBAAAAAAEAQAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAgAAAAAAYQAAAAAAggAAAAAAYQAAAAADYQAAAAADYQAAAAABYQAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAAAAAAAAAYQAAAAADBAAAAAAAYQAAAAACggAAAAAAYQAAAAADYQAAAAACYQAAAAABYQAAAAAAggAAAAAAYQAAAAABggAAAAAAYQAAAAADYQAAAAADYQAAAAAAggAAAAAAAAAAAAAAYQAAAAAAYQAAAAADAQAAAAABggAAAAAAYQAAAAACYQAAAAABYQAAAAAAYQAAAAABggAAAAAAYQAAAAACggAAAAAAYQAAAAADJQAAAAAAYQAAAAADggAAAAAAAAAAAAAAYQAAAAADYQAAAAABYQAAAAACggAAAAAAYQAAAAADYQAAAAABYQAAAAABYQAAAAADYQAAAAACYQAAAAACggAAAAAAYQAAAAACYQAAAAADYQAAAAACggAAAAAAAAAAAAAAYQAAAAAAYQAAAAADYQAAAAACYQAAAAADYQAAAAABYQAAAAADYQAAAAACYQAAAAACYQAAAAACYQAAAAABYQAAAAACYQAAAAAAYQAAAAAAYQAAAAAAggAAAAAAAAAAAAAAYQAAAAAAbAAAAAADYQAAAAADYQAAAAADYQAAAAACYQAAAAAAYQAAAAADYQAAAAAAYQAAAAACYQAAAAACggAAAAAAYQAAAAADYQAAAAABYQAAAAABggAAAAAAAAAAAAAAYQAAAAADbAAAAAACYQAAAAABYQAAAAABYQAAAAACbAAAAAACggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAAAAAAAAAYQAAAAABbAAAAAAAYQAAAAAAYQAAAAABYQAAAAADYQAAAAABYQAAAAAAYQAAAAADAQAAAAABAgAAAAACggAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAbAAAAAAAbAAAAAACbAAAAAADbAAAAAACYQAAAAACYQAAAAAAAQAAAAAAYQAAAAAABAAAAAABAgAAAAABggAAAAAAggAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAYQAAAAAAbAAAAAABYQAAAAADYQAAAAADYQAAAAADYQAAAAADAQAAAAAAYQAAAAAABAAAAAACAwAAAAAABQAAAAAABQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAA
+          version: 6
+        -1,-1:
+          ind: -1,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAYQAAAAACYQAAAAADYQAAAAAAYQAAAAABggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAgAAAAACBAAAAAABAQAAAAAAggAAAAAAYQAAAAADggAAAAAAYQAAAAADYQAAAAADYQAAAAAAYQAAAAABggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAQAAAAAABQAAAAAAYQAAAAABggAAAAAAYQAAAAACggAAAAAAYQAAAAABYQAAAAADYQAAAAAAYQAAAAACggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAYQAAAAABYQAAAAABBAAAAAAEggAAAAAAYQAAAAADYQAAAAACYQAAAAABYQAAAAABYQAAAAACYQAAAAADggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAYQAAAAABYQAAAAADYQAAAAACYQAAAAACYQAAAAADYQAAAAAAYQAAAAAAYQAAAAACYQAAAAACYQAAAAADYQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAYQAAAAADYQAAAAACYQAAAAABggAAAAAAYQAAAAABYQAAAAAAYQAAAAADYQAAAAABYQAAAAAAYQAAAAAAYQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAbAAAAAAAYQAAAAACYQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAwAAAAAAAwAAAAAABQAAAAAAAgAAAAABAQAAAAABYQAAAAABYQAAAAADYQAAAAABYQAAAAACYQAAAAADYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAggAAAAAABQAAAAAAAgAAAAAABAAAAAADAQAAAAABAQAAAAAAYQAAAAACAQAAAAAAYQAAAAAAbAAAAAABbAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAABQAAAAAAAwAAAAAAAgAAAAAAYQAAAAACBAAAAAAAYQAAAAACYQAAAAACYQAAAAACYQAAAAAA
+          version: 6
+        -1,0:
+          ind: -1,0
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAJQAAAAADIAAAAAAAIAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAJQAAAAAAJQAAAAABJQAAAAADggAAAAAAJQAAAAADJQAAAAADIAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAJQAAAAADJQAAAAAAJQAAAAAAggAAAAAAIAAAAAADIAAAAAACJQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAJQAAAAAAggAAAAAAggAAAAAAIAAAAAAAIAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAJQAAAAACIAAAAAABJQAAAAADJQAAAAAAIAAAAAABJQAAAAABggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAIAAAAAABIAAAAAABIAAAAAABIAAAAAACIAAAAAACIAAAAAABggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAUwAAAAAAUwAAAAAAIAAAAAADIAAAAAABIAAAAAABEgAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARAAAAAAAUwAAAAAAUwAAAAAAIAAAAAACIAAAAAABIAAAAAABEgAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        1,0:
+          ind: 1,0
+          tiles: AwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        1,-1:
+          ind: 1,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+    - type: Broadphase
+    - type: Physics
+      bodyStatus: InAir
+      angularDamping: 0.05
+      linearDamping: 0.05
+      fixedRotation: False
+      bodyType: Dynamic
+    - type: Fixtures
+      fixtures: {}
+    - type: OccluderTree
+    - type: SpreaderGrid
+    - type: Shuttle
+    - type: GridPathfinding
+    - type: Gravity
+      gravityShakeSound: !type:SoundPathSpecifier
+        path: /Audio/Effects/alert.ogg
+    - type: DecalGrid
+      chunkCollection:
+        version: 2
+        nodes:
+        - node:
+            angle: -1.5707963267948966 rad
+            color: '#FFFFFFFF'
+            id: Arrows
+          decals:
+            29: -5,7
+        - node:
+            color: '#FFFFFFFF'
+            id: Bot
+          decals:
+            14: -5,4
+            15: -4,4
+            16: -2,4
+            17: -7,4
+            145: 12,-8
+        - node:
+            angle: 3.141592653589793 rad
+            color: '#52B4E996'
+            id: BotGreyscale
+          decals:
+            130: 4,4
+            131: 4,5
+            132: 9,7
+            133: 9,6
+        - node:
+            angle: 3.141592653589793 rad
+            color: '#EFB34196'
+            id: BotGreyscale
+          decals:
+            136: 7,2
+            137: 7,1
+        - node:
+            color: '#D381C996'
+            id: BrickTileWhiteCornerNw
+          decals:
+            7: -5,7
+            8: -7,5
+        - node:
+            color: '#D381C996'
+            id: BrickTileWhiteInnerNw
+          decals:
+            2: -5,5
+        - node:
+            color: '#EFB34196'
+            id: BrickTileWhiteInnerSe
+          decals:
+            97: 6,4
+        - node:
+            color: '#52B4E996'
+            id: BrickTileWhiteInnerSw
+          decals:
+            109: 6,4
+        - node:
+            color: '#D381C996'
+            id: BrickTileWhiteLineE
+          decals:
+            13: -2,5
+        - node:
+            color: '#52B4E996'
+            id: BrickTileWhiteLineN
+          decals:
+            110: 4,6
+            111: 5,6
+            112: 6,6
+            113: 7,6
+        - node:
+            color: '#D381C915'
+            id: BrickTileWhiteLineN
+          decals:
+            64: -5,2
+            65: -6,2
+            66: -6,2
+            67: -5,2
+        - node:
+            color: '#D381C996'
+            id: BrickTileWhiteLineN
+          decals:
+            3: -6,5
+            11: -3,7
+            12: -4,7
+        - node:
+            color: '#52B4E996'
+            id: BrickTileWhiteLineS
+          decals:
+            107: 4,4
+            108: 5,4
+        - node:
+            color: '#D381C996'
+            id: BrickTileWhiteLineS
+          decals:
+            9: -6,4
+            10: -3,4
+        - node:
+            color: '#EFB34196'
+            id: BrickTileWhiteLineS
+          decals:
+            94: 7,4
+            95: 8,4
+            96: 9,4
+        - node:
+            color: '#D381C996'
+            id: BrickTileWhiteLineW
+          decals:
+            5: -5,6
+        - node:
+            color: '#52B4E996'
+            id: CheckerNESW
+          decals:
+            103: 4,2
+            104: 5,2
+            105: 5,3
+            106: 4,3
+            114: 4,7
+            115: 5,7
+            116: 6,7
+            117: 7,7
+            124: 8,6
+            125: 8,7
+            126: 9,7
+            127: 9,6
+        - node:
+            color: '#D381C915'
+            id: CheckerNESW
+          decals:
+            60: -2,2
+            61: -2,3
+            62: -3,3
+            63: -3,2
+        - node:
+            color: '#EFB34196'
+            id: CheckerNESW
+          decals:
+            89: 8,2
+            90: 8,1
+        - node:
+            color: '#FFFFFFFF'
+            id: Delivery
+          decals:
+            26: -7,1
+            27: -7,2
+            98: -3,0
+            99: -3,-4
+            100: 5,-4
+            101: 5,0
+        - node:
+            angle: 3.141592653589793 rad
+            color: '#FFFFFFFF'
+            id: Delivery
+          decals:
+            73: 2,3
+            75: 6,-1
+            76: 6,-2
+            77: 6,-3
+            78: -4,-1
+            79: -4,-2
+            80: -4,-3
+            81: 0,-7
+            82: 1,-7
+            83: 2,-7
+        - node:
+            cleanable: True
+            color: '#FFFFFFFF'
+            id: DirtHeavy
+          decals:
+            154: -7,-5
+            155: -6,-7
+            156: -3,-6
+            157: -3,-8
+            158: -4,-8
+            159: -3,-9
+            160: -7,-9
+            161: -9,-8
+            162: -11,-7
+            163: -9,-5
+            164: -9,-9
+            165: -11,-8
+            166: -7,-2
+            167: -5,-2
+            168: -5,-3
+            169: -1,-1
+            170: -1,-3
+            173: 2,-1
+            175: 5,-3
+            176: 7,-1
+            177: 7,-3
+            178: 9,-2
+            179: 2,-5
+            180: 0,-6
+            181: 2,-10
+            182: 2,-11
+            183: 0,-9
+            184: -1,-6
+            185: -1,-4
+            186: 3,-5
+            187: 3,-4
+            188: 5,2
+            189: 5,3
+            190: 5,5
+            191: 4,7
+            192: 7,5
+            193: 8,7
+            194: 8,4
+            195: 8,1
+            196: 8,2
+            197: -2,2
+            198: -3,3
+            199: -3,5
+            200: -4,6
+            201: -4,5
+            202: -6,5
+            203: -6,5
+            241: 8,-7
+            242: 6,-6
+            243: 4,-4
+            244: 5,-9
+            245: 4,-9
+            317: 11,-8
+            318: 11,-9
+            319: 12,-9
+            320: 12,-7
+        - node:
+            cleanable: True
+            color: '#FFFFFFFF'
+            id: DirtHeavyMonotile
+          decals:
+            204: -6,-1
+            205: -4,-3
+            206: -3,-2
+            207: 0,-2
+            208: 3,-2
+            209: 4,-2
+            210: 0,-1
+            211: 2,1
+            212: 2,3
+            213: 2,4
+            214: 8,-2
+            215: 6,-3
+            216: 6,-1
+            217: 2,-3
+            218: 0,-4
+            219: 2,-6
+            220: 1,-6
+            221: 0,-8
+            222: 2,-9
+            223: 2,-11
+            224: 4,-10
+            225: 6,-10
+            226: 6,-9
+            227: 5,-9
+            228: 5,-7
+            229: 5,-6
+            230: 7,-5
+            231: 7,-7
+            232: 9,-6
+            233: 9,-8
+            234: 9,-9
+            237: 12,-8
+            239: 13,-5
+            248: -6,-6
+            249: -10,-7
+            250: -9,-6
+            251: -6,-1
+            252: -5,1
+            253: -6,2
+            254: -6,1
+            255: -6,1
+            256: -5,2
+            257: -4,5
+            258: -4,7
+            259: -3,6
+            260: -3,5
+            261: -8,7
+            262: -8,7
+            263: -3,1
+            264: -2,1
+            265: 5,1
+            266: 4,1
+            267: 2,-2
+            268: 2,0
+            269: 0,-3
+            270: 2,4
+            271: 0,3
+            272: 1,4
+            273: 2,6
+            274: 2,7
+            275: 7,5
+            276: 8,5
+            277: 8,2
+            278: 9,1
+            279: 9,2
+            280: 12,-2
+            281: 11,-2
+            282: 9,-7
+            283: 9,-9
+            284: 4,-10
+            312: 12,-8
+            313: 12,-8
+            314: 11,-7
+            315: 13,-7
+            316: 13,-9
+            338: 1,-5
+            339: 1,-3
+            340: 1,-1
+            341: 1,0
+            342: 1,0
+            343: 6,4
+            344: 5,4
+            345: 4,5
+            346: 4,4
+            347: 4,4
+            348: 9,2
+            349: 9,2
+            350: 9,5
+            351: 8,7
+            352: 9,7
+        - node:
+            cleanable: True
+            color: '#FFFFFFFF'
+            id: DirtMedium
+          decals:
+            285: 2,-4
+            286: 4,-3
+            287: 4,-1
+            288: -2,-1
+            289: -2,-3
+            290: -6,-5
+            291: -3,-7
+            292: -3,-9
+            293: -3,-10
+            294: -3,-10
+            295: -9,-8
+            296: -9,-5
+            297: -6,4
+            298: -3,6
+            299: 5,2
+            300: 5,6
+            301: 5,6
+            302: 8,5
+            303: 8,1
+            304: 9,-5
+            305: 5,-6
+            306: 5,-5
+            307: 5,-9
+            308: 4,-10
+            309: 11,-6
+            310: 11,-5
+            311: 11,-6
+            321: 11,-9
+            322: 13,-8
+        - node:
+            color: '#52B4E996'
+            id: FullTileOverlayGreyscale
+          decals:
+            118: 5,5
+            119: 6,5
+        - node:
+            angle: -1.5707963267948966 rad
+            color: '#FFFFFFFF'
+            id: LoadingArea
+          decals:
+            28: -5,6
+        - node:
+            color: '#FFFFFFFF'
+            id: LoadingArea
+          decals:
+            102: -3,1
+        - node:
+            angle: 3.141592653589793 rad
+            color: '#FFFFFFFF'
+            id: LoadingArea
+          decals:
+            68: -2,3
+        - node:
+            color: '#52B4E996'
+            id: LoadingAreaGreyscale
+          decals:
+            128: 5,1
+        - node:
+            angle: 3.141592653589793 rad
+            color: '#52B4E996'
+            id: LoadingAreaGreyscale
+          decals:
+            129: 4,3
+        - node:
+            color: '#52B4E996'
+            id: QuarterTileOverlayGreyscale
+          decals:
+            122: 6,4
+        - node:
+            color: '#52B4E996'
+            id: QuarterTileOverlayGreyscale180
+          decals:
+            121: 5,6
+        - node:
+            color: '#52B4E996'
+            id: QuarterTileOverlayGreyscale270
+          decals:
+            120: 6,6
+        - node:
+            color: '#52B4E996'
+            id: QuarterTileOverlayGreyscale90
+          decals:
+            123: 5,4
+        - node:
+            color: '#FFFFFFFF'
+            id: SpaceStationSign1
+          decals:
+            331: -2,-2
+        - node:
+            color: '#FFFFFFFF'
+            id: SpaceStationSign2
+          decals:
+            332: -1,-2
+        - node:
+            color: '#FFFFFFFF'
+            id: SpaceStationSign3
+          decals:
+            333: 0,-2
+        - node:
+            color: '#FFFFFFFF'
+            id: SpaceStationSign4
+          decals:
+            334: 1,-2
+        - node:
+            color: '#FFFFFFFF'
+            id: SpaceStationSign5
+          decals:
+            335: 2,-2
+        - node:
+            color: '#FFFFFFFF'
+            id: SpaceStationSign6
+          decals:
+            336: 3,-2
+        - node:
+            color: '#FFFFFFFF'
+            id: SpaceStationSign7
+          decals:
+            337: 4,-2
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerSmallNE
+          decals:
+            21: -3,5
+            329: 11,-9
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerSmallNW
+          decals:
+            330: 13,-9
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerSmallSE
+          decals:
+            328: 11,-7
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerSmallSW
+          decals:
+            327: 13,-7
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineE
+          decals:
+            19: -3,6
+            20: -3,7
+            324: 11,-8
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineN
+          decals:
+            0: -7,-9
+            1: 9,-9
+            325: 12,-7
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineS
+          decals:
+            24: -7,6
+            25: -7,7
+            323: 13,-8
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineW
+          decals:
+            18: -2,5
+            326: 12,-9
+    - type: GridAtmosphere
+      version: 2
+      data:
+        chunkSize: 4
+    - type: GasTileOverlay
+    - type: RadiationGridResistance
+- proto: AirlockAssemblyCargo
+  entities:
+  - uid: 331
+    components:
+    - type: Transform
+      pos: -0.5,-5.5
+      parent: 2
+- proto: AirlockAssemblyEngineering
+  entities:
+  - uid: 1
+    components:
+    - type: Transform
+      pos: 9.5,-7.5
+      parent: 2
+  - uid: 6
+    components:
+    - type: Transform
+      pos: 10.5,-5.5
+      parent: 2
+- proto: AirlockAssemblyMedical
+  entities:
+  - uid: 25
+    components:
+    - type: Transform
+      pos: 3.5,2.5
+      parent: 2
+- proto: AirlockAssemblyScienceGlass
+  entities:
+  - uid: 31
+    components:
+    - type: Transform
+      pos: -5.5,3.5
+      parent: 2
+- proto: AirlockAssemblyShuttle
+  entities:
+  - uid: 10
+    components:
+    - type: Transform
+      pos: -11.5,-7.5
+      parent: 2
+- proto: AirlockCargoLocked
+  entities:
+  - uid: 175
+    components:
+    - type: Transform
+      pos: -7.5,-5.5
+      parent: 2
+  - uid: 201
+    components:
+    - type: Transform
+      pos: -6.5,-7.5
+      parent: 2
+- proto: AirlockChemistryGlassLocked
+  entities:
+  - uid: 219
+    components:
+    - type: Transform
+      pos: 8.5,3.5
+      parent: 2
+- proto: AirlockEngineeringLocked
+  entities:
+  - uid: 38
+    components:
+    - type: Transform
+      pos: 3.5,-5.5
+      parent: 2
+- proto: AirlockExternalShuttleLocked
+  entities:
+  - uid: 192
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -11.5,-5.5
+      parent: 2
+- proto: AirlockScienceLocked
+  entities:
+  - uid: 36
+    components:
+    - type: Transform
+      pos: -0.5,2.5
+      parent: 2
+- proto: Bed
+  entities:
+  - uid: 131
+    components:
+    - type: Transform
+      pos: 4.5,7.5
+      parent: 2
+  - uid: 190
+    components:
+    - type: Transform
+      pos: 8.5,7.5
+      parent: 2
+- proto: BlastDoorOpen
+  entities:
+  - uid: 41
+    components:
+    - type: Transform
+      pos: -7.5,7.5
+      parent: 2
+- proto: BluespaceBeaker
+  entities:
+  - uid: 112
+    components:
+    - type: Transform
+      parent: 111
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: BrokenBottle
+  entities:
+  - uid: 42
+    components:
+    - type: Transform
+      pos: -3.2567945,-8.612661
+      parent: 2
+- proto: CablecuffsBroken
+  entities:
+  - uid: 107
+    components:
+    - type: Transform
+      pos: 6.54331,-5.628286
+      parent: 2
+- proto: CargoPallet
+  entities:
+  - uid: 302
+    components:
+    - type: Transform
+      pos: -6.5,-9.5
+      parent: 2
+  - uid: 316
+    components:
+    - type: Transform
+      pos: 9.5,-9.5
+      parent: 2
+- proto: Chair
+  entities:
+  - uid: 280
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,6.5
+      parent: 2
+- proto: ChairOfficeDark
+  entities:
+  - uid: 262
+    components:
+    - type: Transform
+      pos: -1.5,1.5
+      parent: 2
+  - uid: 263
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-4.5
+      parent: 2
+  - uid: 264
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-4.5
+      parent: 2
+  - uid: 265
+    components:
+    - type: Transform
+      pos: 4.5,1.5
+      parent: 2
+  - uid: 309
+    components:
+    - type: Transform
+      pos: 8.5,1.5
+      parent: 2
+- proto: ClosetWallEmergencyFilledRandom
+  entities:
+  - uid: 357
+    components:
+    - type: Transform
+      pos: 8.5,8.5
+      parent: 2
+  - uid: 358
+    components:
+    - type: Transform
+      pos: -5.5,8.5
+      parent: 2
+- proto: ClosetWallFireFilledRandom
+  entities:
+  - uid: 359
+    components:
+    - type: Transform
+      pos: -6.5,8.5
+      parent: 2
+  - uid: 360
+    components:
+    - type: Transform
+      pos: 9.5,8.5
+      parent: 2
+- proto: ComputerBroken
+  entities:
+  - uid: 49
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,6.5
+      parent: 2
+  - uid: 54
+    components:
+    - type: Transform
+      pos: 4.5,3.5
+      parent: 2
+  - uid: 103
+    components:
+    - type: Transform
+      pos: -3.5,-4.5
+      parent: 2
+  - uid: 106
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-7.5
+      parent: 2
+  - uid: 373
+    components:
+    - type: Transform
+      pos: -9.5,-4.5
+      parent: 2
+- proto: ComputerFrame
+  entities:
+  - uid: 55
+    components:
+    - type: Transform
+      pos: -1.5,3.5
+      parent: 2
+  - uid: 370
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-6.5
+      parent: 2
+- proto: ComputerTechnologyDiskTerminal
+  entities:
+  - uid: 288
+    components:
+    - type: Transform
+      pos: -1.5,6.5
+      parent: 2
+- proto: CrateArtifactContainer
+  entities:
+  - uid: 281
+    components:
+    - type: Transform
+      pos: -6.5,4.5
+      parent: 2
+- proto: CrateFilledSpawner
+  entities:
+  - uid: 57
+    components:
+    - type: Transform
+      pos: -9.5,-5.5
+      parent: 2
+- proto: DefibrillatorCabinetFilled
+  entities:
+  - uid: 346
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,4.5
+      parent: 2
+- proto: DisposalMachineFrame
+  entities:
+  - uid: 371
+    components:
+    - type: Transform
+      pos: 6.5,-4.5
+      parent: 2
+- proto: ExtinguisherCabinetFilled
+  entities:
+  - uid: 356
+    components:
+    - type: Transform
+      pos: -6.5,3.5
+      parent: 2
+- proto: FirelockFrame
+  entities:
+  - uid: 171
+    components:
+    - type: Transform
+      pos: 6.5,-0.5
+      parent: 2
+  - uid: 172
+    components:
+    - type: Transform
+      pos: -2.5,-1.5
+      parent: 2
+- proto: FirelockGlass
+  entities:
+  - uid: 39
+    components:
+    - type: Transform
+      pos: -3.5,-0.5
+      parent: 2
+  - uid: 46
+    components:
+    - type: Transform
+      pos: 6.5,-1.5
+      parent: 2
+  - uid: 47
+    components:
+    - type: Transform
+      pos: 6.5,-2.5
+      parent: 2
+  - uid: 48
+    components:
+    - type: Transform
+      pos: 2.5,-6.5
+      parent: 2
+  - uid: 50
+    components:
+    - type: Transform
+      pos: 0.5,-6.5
+      parent: 2
+  - uid: 51
+    components:
+    - type: Transform
+      pos: -1.5,0.5
+      parent: 2
+  - uid: 52
+    components:
+    - type: Transform
+      pos: -0.5,0.5
+      parent: 2
+  - uid: 53
+    components:
+    - type: Transform
+      pos: -0.5,1.5
+      parent: 2
+  - uid: 235
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,0.5
+      parent: 2
+- proto: FloodlightBroken
+  entities:
+  - uid: 124
+    components:
+    - type: Transform
+      pos: 1.7209082,4.5385127
+      parent: 2
+- proto: FloorDrain
+  entities:
+  - uid: 336
+    components:
+    - type: Transform
+      pos: 8.5,2.5
+      parent: 2
+    - type: Fixtures
+      fixtures: {}
+- proto: FoodBowlBigTrash
+  entities:
+  - uid: 194
+    components:
+    - type: Transform
+      pos: 4.691658,6.395677
+      parent: 2
+- proto: FoodPlateSmallTrash
+  entities:
+  - uid: 317
+    components:
+    - type: Transform
+      pos: -4.4774685,2.551927
+      parent: 2
+- proto: GasCanisterBrokenBase
+  entities:
+  - uid: 191
+    components:
+    - type: Transform
+      pos: -2.5,7.5
+      parent: 2
+- proto: GasOutletInjector
+  entities:
+  - uid: 290
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,7.5
+      parent: 2
+- proto: GasPipeStraight
+  entities:
+  - uid: 291
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,7.5
+      parent: 2
+- proto: GasPort
+  entities:
+  - uid: 304
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,7.5
+      parent: 2
+- proto: GasVolumePump
+  entities:
+  - uid: 289
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,7.5
+      parent: 2
+- proto: Girder
+  entities:
+  - uid: 246
+    components:
+    - type: Transform
+      pos: 8.5,-3.5
+      parent: 2
+  - uid: 286
+    components:
+    - type: Transform
+      pos: -11.5,-3.5
+      parent: 2
+  - uid: 305
+    components:
+    - type: Transform
+      pos: -9.5,-9.5
+      parent: 2
+  - uid: 314
+    components:
+    - type: Transform
+      pos: 11.5,-3.5
+      parent: 2
+  - uid: 315
+    components:
+    - type: Transform
+      pos: 12.5,-3.5
+      parent: 2
+- proto: Grille
+  entities:
+  - uid: 8
+    components:
+    - type: Transform
+      pos: 3.5,-9.5
+      parent: 2
+  - uid: 33
+    components:
+    - type: Transform
+      pos: -0.5,-9.5
+      parent: 2
+  - uid: 60
+    components:
+    - type: Transform
+      pos: 11.5,0.5
+      parent: 2
+  - uid: 97
+    components:
+    - type: Transform
+      pos: -0.5,-8.5
+      parent: 2
+  - uid: 99
+    components:
+    - type: Transform
+      pos: 3.5,-8.5
+      parent: 2
+  - uid: 104
+    components:
+    - type: Transform
+      pos: 3.5,6.5
+      parent: 2
+  - uid: 105
+    components:
+    - type: Transform
+      pos: -0.5,5.5
+      parent: 2
+  - uid: 127
+    components:
+    - type: Transform
+      pos: 6.5,2.5
+      parent: 2
+  - uid: 130
+    components:
+    - type: Transform
+      pos: -3.5,2.5
+      parent: 2
+  - uid: 237
+    components:
+    - type: Transform
+      pos: -6.5,0.5
+      parent: 2
+  - uid: 238
+    components:
+    - type: Transform
+      pos: -5.5,0.5
+      parent: 2
+  - uid: 240
+    components:
+    - type: Transform
+      pos: 7.5,0.5
+      parent: 2
+  - uid: 241
+    components:
+    - type: Transform
+      pos: 9.5,0.5
+      parent: 2
+  - uid: 278
+    components:
+    - type: Transform
+      pos: -7.5,6.5
+      parent: 2
+  - uid: 294
+    components:
+    - type: Transform
+      pos: -4.5,3.5
+      parent: 2
+- proto: GrilleBroken
+  entities:
+  - uid: 59
+    components:
+    - type: Transform
+      pos: 3.5,-11.5
+      parent: 2
+  - uid: 67
+    components:
+    - type: Transform
+      pos: -0.5,10.5
+      parent: 2
+  - uid: 334
+    components:
+    - type: Transform
+      pos: -11.5,-2.5
+      parent: 2
+  - uid: 369
+    components:
+    - type: Transform
+      pos: 13.5,0.5
+      parent: 2
+- proto: GrilleSpawner
+  entities:
+  - uid: 70
+    components:
+    - type: Transform
+      pos: 12.5,0.5
+      parent: 2
+- proto: KitchenReagentGrinder
+  entities:
+  - uid: 332
+    components:
+    - type: Transform
+      pos: 9.5,5.5
+      parent: 2
+- proto: LockerChemistry
+  entities:
+  - uid: 111
+    components:
+    - type: Transform
+      pos: 4.5,5.5
+      parent: 2
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 112
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+- proto: LockerMedical
+  entities:
+  - uid: 114
+    components:
+    - type: Transform
+      pos: 4.5,4.5
+      parent: 2
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 116
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+- proto: LockerScientist
+  entities:
+  - uid: 120
+    components:
+    - type: Transform
+      pos: -4.5,1.5
+      parent: 2
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 225
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+- proto: LockerWallMedicalFilled
+  entities:
+  - uid: 355
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,4.5
+      parent: 2
+- proto: LootSpawnerRandomCrateEngineering
+  entities:
+  - uid: 58
+    components:
+    - type: Transform
+      pos: 7.5,-7.5
+      parent: 2
+- proto: MachineAnomalyVessel
+  entities:
+  - uid: 223
+    components:
+    - type: Transform
+      pos: -6.5,2.5
+      parent: 2
+- proto: MachineFrame
+  entities:
+  - uid: 37
+    components:
+    - type: Transform
+      pos: -3.5,4.5
+      parent: 2
+  - uid: 40
+    components:
+    - type: Transform
+      pos: -6.5,1.5
+      parent: 2
+  - uid: 44
+    components:
+    - type: Transform
+      pos: 7.5,2.5
+      parent: 2
+  - uid: 372
+    components:
+    - type: Transform
+      pos: -10.5,-4.5
+      parent: 2
+- proto: MachineFrameDestroyed
+  entities:
+  - uid: 43
+    components:
+    - type: Transform
+      pos: 7.5,1.5
+      parent: 2
+  - uid: 45
+    components:
+    - type: Transform
+      pos: -1.5,4.5
+      parent: 2
+  - uid: 136
+    components:
+    - type: Transform
+      pos: 9.5,6.5
+      parent: 2
+  - uid: 173
+    components:
+    - type: Transform
+      pos: -1.5,7.5
+      parent: 2
+- proto: MedicalBed
+  entities:
+  - uid: 321
+    components:
+    - type: Transform
+      pos: 6.5,7.5
+      parent: 2
+- proto: MedkitFilled
+  entities:
+  - uid: 138
+    components:
+    - type: Transform
+      pos: 9.52752,4.7223573
+      parent: 2
+- proto: PlasmaReinforcedWindowDirectional
+  entities:
+  - uid: 165
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,5.5
+      parent: 2
+  - uid: 274
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -6.5,5.5
+      parent: 2
+  - uid: 275
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,6.5
+      parent: 2
+- proto: PlasticFlapsAirtightClear
+  entities:
+  - uid: 23
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-3.5
+      parent: 2
+  - uid: 26
+    components:
+    - type: Transform
+      pos: 5.5,0.5
+      parent: 2
+  - uid: 27
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-3.5
+      parent: 2
+  - uid: 29
+    components:
+    - type: Transform
+      pos: -2.5,0.5
+      parent: 2
+- proto: PlushieLizardMirrored
+  entities:
+  - uid: 125
+    components:
+    - type: MetaData
+      desc: Something about this lizard plushie feels off...
+    - type: Transform
+      pos: 12.5,-7.5
+      parent: 2
+- proto: PosterBroken
+  entities:
+  - uid: 167
+    components:
+    - type: Transform
+      pos: -2.5,8.5
+      parent: 2
+  - uid: 169
+    components:
+    - type: Transform
+      pos: -3.5,8.5
+      parent: 2
+  - uid: 176
+    components:
+    - type: Transform
+      pos: 6.5,3.5
+      parent: 2
+  - uid: 182
+    components:
+    - type: Transform
+      pos: 3.5,-6.5
+      parent: 2
+  - uid: 185
+    components:
+    - type: Transform
+      pos: -0.5,3.5
+      parent: 2
+  - uid: 189
+    components:
+    - type: Transform
+      pos: 3.5,3.5
+      parent: 2
+- proto: PosterContrabandWehWatches
+  entities:
+  - uid: 347
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,-3.5
+      parent: 2
+- proto: PosterLegitScience
+  entities:
+  - uid: 178
+    components:
+    - type: Transform
+      pos: -3.5,3.5
+      parent: 2
+- proto: PottedPlantRandom
+  entities:
+  - uid: 319
+    components:
+    - type: Transform
+      pos: 7.5,6.5
+      parent: 2
+- proto: Poweredlight
+  entities:
+  - uid: 242
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-2.5
+      parent: 2
+  - uid: 247
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,4.5
+      parent: 2
+  - uid: 249
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-7.5
+      parent: 2
+  - uid: 250
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-7.5
+      parent: 2
+  - uid: 251
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,4.5
+      parent: 2
+  - uid: 253
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,-6.5
+      parent: 2
+  - uid: 254
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-7.5
+      parent: 2
+  - uid: 255
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 9.5,5.5
+      parent: 2
+  - uid: 257
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,5.5
+      parent: 2
+- proto: PoweredlightEmpty
+  entities:
+  - uid: 144
+    components:
+    - type: Transform
+      pos: 7.5,-0.5
+      parent: 2
+  - uid: 147
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,-2.5
+      parent: 2
+  - uid: 150
+    components:
+    - type: Transform
+      pos: -4.5,-0.5
+      parent: 2
+  - uid: 152
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,4.5
+      parent: 2
+  - uid: 156
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-7.5
+      parent: 2
+  - uid: 158
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,-6.5
+      parent: 2
+  - uid: 159
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,4.5
+      parent: 2
+- proto: PoweredSmallLight
+  entities:
+  - uid: 258
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 9.5,2.5
+      parent: 2
+  - uid: 259
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,2.5
+      parent: 2
+  - uid: 261
+    components:
+    - type: Transform
+      pos: 12.5,-4.5
+      parent: 2
+- proto: PoweredSmallLightEmpty
+  entities:
+  - uid: 160
+    components:
+    - type: Transform
+      pos: -9.5,-4.5
+      parent: 2
+- proto: Rack
+  entities:
+  - uid: 224
+    components:
+    - type: Transform
+      pos: -4.5,2.5
+      parent: 2
+- proto: RandomArtifactSpawner20
+  entities:
+  - uid: 166
+    components:
+    - type: Transform
+      pos: -5.5,6.5
+      parent: 2
+- proto: RandomEngineerCorpseSpawner
+  entities:
+  - uid: 93
+    components:
+    - type: Transform
+      pos: 7.5,-6.5
+      parent: 2
+- proto: RandomPosterLegit
+  entities:
+  - uid: 337
+    components:
+    - type: Transform
+      pos: 5.5,8.5
+      parent: 2
+  - uid: 338
+    components:
+    - type: Transform
+      pos: 6.5,8.5
+      parent: 2
+- proto: RandomScienceCorpseSpawner
+  entities:
+  - uid: 354
+    components:
+    - type: Transform
+      pos: -2.5,2.5
+      parent: 2
+- proto: ReinforcedGirder
+  entities:
+  - uid: 62
+    components:
+    - type: Transform
+      pos: 3.5,9.5
+      parent: 2
+  - uid: 206
+    components:
+    - type: Transform
+      pos: -0.5,8.5
+      parent: 2
+  - uid: 215
+    components:
+    - type: Transform
+      pos: -7.5,0.5
+      parent: 2
+- proto: ReinforcedPlasmaWindow
+  entities:
+  - uid: 277
+    components:
+    - type: Transform
+      pos: -7.5,6.5
+      parent: 2
+- proto: ReinforcedWindow
+  entities:
+  - uid: 9
+    components:
+    - type: Transform
+      pos: -4.5,3.5
+      parent: 2
+  - uid: 96
+    components:
+    - type: Transform
+      pos: -5.5,0.5
+      parent: 2
+  - uid: 110
+    components:
+    - type: Transform
+      pos: -4.5,0.5
+      parent: 2
+  - uid: 113
+    components:
+    - type: Transform
+      pos: 9.5,0.5
+      parent: 2
+  - uid: 115
+    components:
+    - type: Transform
+      pos: -0.5,6.5
+      parent: 2
+  - uid: 117
+    components:
+    - type: Transform
+      pos: 3.5,6.5
+      parent: 2
+  - uid: 118
+    components:
+    - type: Transform
+      pos: 3.5,5.5
+      parent: 2
+  - uid: 123
+    components:
+    - type: Transform
+      pos: 3.5,-8.5
+      parent: 2
+  - uid: 126
+    components:
+    - type: Transform
+      pos: -0.5,-9.5
+      parent: 2
+  - uid: 221
+    components:
+    - type: Transform
+      pos: -3.5,2.5
+      parent: 2
+  - uid: 222
+    components:
+    - type: Transform
+      pos: 6.5,2.5
+      parent: 2
+- proto: SalvageCanisterSpawner
+  entities:
+  - uid: 350
+    components:
+    - type: Transform
+      pos: -4.5,-7.5
+      parent: 2
+  - uid: 352
+    components:
+    - type: Transform
+      pos: -4.5,-8.5
+      parent: 2
+  - uid: 353
+    components:
+    - type: Transform
+      pos: -4.5,-9.5
+      parent: 2
+- proto: SalvageLootSpawner
+  entities:
+  - uid: 71
+    components:
+    - type: Transform
+      pos: -4.5,5.5
+      parent: 2
+- proto: SalvageMaterialCrateSpawner
+  entities:
+  - uid: 32
+    components:
+    - type: Transform
+      pos: -3.5,-7.5
+      parent: 2
+  - uid: 91
+    components:
+    - type: Transform
+      pos: -5.5,1.5
+      parent: 2
+  - uid: 322
+    components:
+    - type: Transform
+      pos: 8.5,6.5
+      parent: 2
+  - uid: 339
+    components:
+    - type: Transform
+      pos: -2.5,-8.5
+      parent: 2
+- proto: SalvageMobSpawner
+  entities:
+  - uid: 349
+    components:
+    - type: Transform
+      pos: -3.5,-5.5
+      parent: 2
+- proto: SalvageMobSpawner75
+  entities:
+  - uid: 348
+    components:
+    - type: Transform
+      pos: -4.5,-6.5
+      parent: 2
+- proto: SalvageSpawnerMobMagnet
+  entities:
+  - uid: 361
+    components:
+    - type: Transform
+      pos: 8.5,-5.5
+      parent: 2
+  - uid: 362
+    components:
+    - type: Transform
+      pos: 6.5,-7.5
+      parent: 2
+- proto: SalvageSpawnerScrapCommon
+  entities:
+  - uid: 344
+    components:
+    - type: Transform
+      pos: -3.5,-6.5
+      parent: 2
+- proto: SalvageSpawnerScrapCommon75
+  entities:
+  - uid: 56
+    components:
+    - type: Transform
+      pos: 9.5,7.5
+      parent: 2
+  - uid: 79
+    components:
+    - type: Transform
+      pos: 6.5,6.5
+      parent: 2
+  - uid: 83
+    components:
+    - type: Transform
+      pos: 7.5,-5.5
+      parent: 2
+  - uid: 87
+    components:
+    - type: Transform
+      pos: 5.5,-7.5
+      parent: 2
+  - uid: 90
+    components:
+    - type: Transform
+      pos: 7.5,-9.5
+      parent: 2
+- proto: SalvageSpawnerScrapValuable
+  entities:
+  - uid: 121
+    components:
+    - type: Transform
+      pos: 6.5,-6.5
+      parent: 2
+- proto: SalvageSpawnerScrapValuable75
+  entities:
+  - uid: 163
+    components:
+    - type: Transform
+      pos: -4.5,4.5
+      parent: 2
+  - uid: 340
+    components:
+    - type: Transform
+      pos: -2.5,-6.5
+      parent: 2
+- proto: SalvageSpawnerTreasure
+  entities:
+  - uid: 74
+    components:
+    - type: Transform
+      pos: -6.5,-8.5
+      parent: 2
+  - uid: 75
+    components:
+    - type: Transform
+      pos: 8.5,2.5
+      parent: 2
+  - uid: 78
+    components:
+    - type: Transform
+      pos: -6.5,5.5
+      parent: 2
+- proto: SalvageSpawnerTreasureValuable
+  entities:
+  - uid: 72
+    components:
+    - type: Transform
+      pos: 9.5,-8.5
+      parent: 2
+- proto: ShardGlass
+  entities:
+  - uid: 328
+    components:
+    - type: Transform
+      pos: -1.0626283,1.741735
+      parent: 2
+  - uid: 333
+    components:
+    - type: Transform
+      pos: 3.4061213,0.19485998
+      parent: 2
+- proto: ShardGlassReinforced
+  entities:
+  - uid: 141
+    components:
+    - type: Transform
+      pos: 3.7342463,-0.008265018
+      parent: 2
+  - uid: 330
+    components:
+    - type: Transform
+      pos: 0.2028017,1.4173388
+      parent: 2
+- proto: SheetGlass
+  entities:
+  - uid: 298
+    components:
+    - type: Transform
+      pos: -1.4880872,5.502641
+      parent: 2
+- proto: SheetPlastic
+  entities:
+  - uid: 299
+    components:
+    - type: Transform
+      pos: -1.5037122,5.346391
+      parent: 2
+- proto: SheetSteel
+  entities:
+  - uid: 297
+    components:
+    - type: Transform
+      pos: -1.4724622,5.643266
+      parent: 2
+- proto: SignCargo
+  entities:
+  - uid: 73
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-6.5
+      parent: 2
+- proto: SignDirectionalMed
+  entities:
+  - uid: 351
+    components:
+    - type: Transform
+      pos: 3.5,7.5
+      parent: 2
+- proto: SignDirectionalSci
+  entities:
+  - uid: 295
+    components:
+    - type: Transform
+      pos: -0.5,7.5
+      parent: 2
+- proto: SinkWide
+  entities:
+  - uid: 335
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,2.5
+      parent: 2
+- proto: SmartFridge
+  entities:
+  - uid: 218
+    components:
+    - type: Transform
+      pos: 7.5,3.5
+      parent: 2
+- proto: SpawnMobBearSalvage
+  entities:
+  - uid: 368
+    components:
+    - type: Transform
+      pos: -3.5,7.5
+      parent: 2
+- proto: SpawnMobCobraSalvage
+  entities:
+  - uid: 364
+    components:
+    - type: Transform
+      pos: 7.5,4.5
+      parent: 2
+  - uid: 367
+    components:
+    - type: Transform
+      pos: -3.5,5.5
+      parent: 2
+- proto: SpawnMobSpiderSalvage
+  entities:
+  - uid: 345
+    components:
+    - type: Transform
+      pos: -2.5,-7.5
+      parent: 2
+  - uid: 363
+    components:
+    - type: Transform
+      pos: 6.5,5.5
+      parent: 2
+- proto: StationMapBroken
+  entities:
+  - uid: 95
+    components:
+    - type: Transform
+      pos: -3.5,0.5
+      parent: 2
+  - uid: 101
+    components:
+    - type: Transform
+      pos: 6.5,0.5
+      parent: 2
+- proto: SubstationBasic
+  entities:
+  - uid: 228
+    components:
+    - type: Transform
+      pos: -6.5,-9.5
+      parent: 2
+  - uid: 229
+    components:
+    - type: Transform
+      pos: 9.5,-9.5
+      parent: 2
+- proto: SyringeBluespace
+  entities:
+  - uid: 116
+    components:
+    - type: Transform
+      parent: 114
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: TableFrame
+  entities:
+  - uid: 193
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,7.5
+      parent: 2
+- proto: TableGlass
+  entities:
+  - uid: 320
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,7.5
+      parent: 2
+- proto: TableReinforced
+  entities:
+  - uid: 3
+    components:
+    - type: Transform
+      pos: -0.5,-3.5
+      parent: 2
+  - uid: 4
+    components:
+    - type: Transform
+      pos: -1.5,-3.5
+      parent: 2
+  - uid: 13
+    components:
+    - type: Transform
+      pos: 3.5,-4.5
+      parent: 2
+  - uid: 14
+    components:
+    - type: Transform
+      pos: 3.5,-3.5
+      parent: 2
+  - uid: 15
+    components:
+    - type: Transform
+      pos: -0.5,0.5
+      parent: 2
+  - uid: 16
+    components:
+    - type: Transform
+      pos: 4.5,-3.5
+      parent: 2
+  - uid: 17
+    components:
+    - type: Transform
+      pos: -0.5,-4.5
+      parent: 2
+  - uid: 18
+    components:
+    - type: Transform
+      pos: 4.5,0.5
+      parent: 2
+  - uid: 19
+    components:
+    - type: Transform
+      pos: 3.5,1.5
+      parent: 2
+  - uid: 20
+    components:
+    - type: Transform
+      pos: 3.5,0.5
+      parent: 2
+  - uid: 21
+    components:
+    - type: Transform
+      pos: -1.5,0.5
+      parent: 2
+  - uid: 22
+    components:
+    - type: Transform
+      pos: -0.5,1.5
+      parent: 2
+  - uid: 122
+    components:
+    - type: Transform
+      pos: 8.5,0.5
+      parent: 2
+  - uid: 296
+    components:
+    - type: Transform
+      pos: -1.5,5.5
+      parent: 2
+  - uid: 310
+    components:
+    - type: Transform
+      pos: 9.5,1.5
+      parent: 2
+  - uid: 311
+    components:
+    - type: Transform
+      pos: 9.5,2.5
+      parent: 2
+  - uid: 323
+    components:
+    - type: Transform
+      pos: 9.5,4.5
+      parent: 2
+  - uid: 324
+    components:
+    - type: Transform
+      pos: 9.5,5.5
+      parent: 2
+- proto: WallReinforced
+  entities:
+  - uid: 7
+    components:
+    - type: Transform
+      pos: -7.5,3.5
+      parent: 2
+  - uid: 11
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,0.5
+      parent: 2
+  - uid: 24
+    components:
+    - type: Transform
+      pos: -7.5,5.5
+      parent: 2
+  - uid: 28
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,4.5
+      parent: 2
+  - uid: 145
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,3.5
+      parent: 2
+  - uid: 146
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,7.5
+      parent: 2
+  - uid: 148
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,8.5
+      parent: 2
+  - uid: 149
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,8.5
+      parent: 2
+  - uid: 151
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,8.5
+      parent: 2
+  - uid: 153
+    components:
+    - type: Transform
+      pos: -3.5,8.5
+      parent: 2
+  - uid: 154
+    components:
+    - type: Transform
+      pos: -0.5,7.5
+      parent: 2
+  - uid: 155
+    components:
+    - type: Transform
+      pos: -1.5,8.5
+      parent: 2
+  - uid: 157
+    components:
+    - type: Transform
+      pos: -3.5,0.5
+      parent: 2
+  - uid: 161
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,2.5
+      parent: 2
+  - uid: 162
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,3.5
+      parent: 2
+  - uid: 164
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,4.5
+      parent: 2
+  - uid: 168
+    components:
+    - type: Transform
+      pos: -4.5,8.5
+      parent: 2
+  - uid: 170
+    components:
+    - type: Transform
+      pos: -5.5,8.5
+      parent: 2
+  - uid: 270
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,6.5
+      parent: 2
+  - uid: 271
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,7.5
+      parent: 2
+  - uid: 272
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,8.5
+      parent: 2
+  - uid: 303
+    components:
+    - type: Transform
+      pos: -0.5,3.5
+      parent: 2
+- proto: WallReinforcedRust
+  entities:
+  - uid: 61
+    components:
+    - type: Transform
+      pos: 3.5,8.5
+      parent: 2
+  - uid: 195
+    components:
+    - type: Transform
+      pos: -7.5,4.5
+      parent: 2
+  - uid: 197
+    components:
+    - type: Transform
+      pos: 6.5,0.5
+      parent: 2
+  - uid: 202
+    components:
+    - type: Transform
+      pos: -7.5,2.5
+      parent: 2
+  - uid: 204
+    components:
+    - type: Transform
+      pos: 10.5,1.5
+      parent: 2
+  - uid: 207
+    components:
+    - type: Transform
+      pos: 6.5,8.5
+      parent: 2
+  - uid: 212
+    components:
+    - type: Transform
+      pos: 9.5,8.5
+      parent: 2
+  - uid: 213
+    components:
+    - type: Transform
+      pos: -0.5,9.5
+      parent: 2
+  - uid: 216
+    components:
+    - type: Transform
+      pos: -0.5,4.5
+      parent: 2
+  - uid: 226
+    components:
+    - type: Transform
+      pos: -7.5,1.5
+      parent: 2
+  - uid: 227
+    components:
+    - type: Transform
+      pos: 10.5,5.5
+      parent: 2
+  - uid: 230
+    components:
+    - type: Transform
+      pos: -6.5,8.5
+      parent: 2
+  - uid: 231
+    components:
+    - type: Transform
+      pos: -7.5,8.5
+      parent: 2
+  - uid: 236
+    components:
+    - type: Transform
+      pos: -2.5,8.5
+      parent: 2
+  - uid: 239
+    components:
+    - type: Transform
+      pos: 10.5,8.5
+      parent: 2
+  - uid: 366
+    components:
+    - type: Transform
+      pos: -8.5,0.5
+      parent: 2
+- proto: WallSolid
+  entities:
+  - uid: 5
+    components:
+    - type: Transform
+      pos: -0.5,-6.5
+      parent: 2
+  - uid: 12
+    components:
+    - type: Transform
+      pos: 3.5,-6.5
+      parent: 2
+  - uid: 30
+    components:
+    - type: Transform
+      pos: 6.5,-3.5
+      parent: 2
+  - uid: 34
+    components:
+    - type: Transform
+      pos: 3.5,-7.5
+      parent: 2
+  - uid: 35
+    components:
+    - type: Transform
+      pos: -6.5,3.5
+      parent: 2
+  - uid: 98
+    components:
+    - type: Transform
+      pos: 9.5,-3.5
+      parent: 2
+  - uid: 100
+    components:
+    - type: Transform
+      pos: -5.5,-3.5
+      parent: 2
+  - uid: 102
+    components:
+    - type: Transform
+      pos: 6.5,1.5
+      parent: 2
+  - uid: 108
+    components:
+    - type: Transform
+      pos: -0.5,-10.5
+      parent: 2
+  - uid: 109
+    components:
+    - type: Transform
+      pos: -4.5,-3.5
+      parent: 2
+  - uid: 119
+    components:
+    - type: Transform
+      pos: -6.5,-3.5
+      parent: 2
+  - uid: 128
+    components:
+    - type: Transform
+      pos: -3.5,1.5
+      parent: 2
+  - uid: 129
+    components:
+    - type: Transform
+      pos: -3.5,3.5
+      parent: 2
+  - uid: 132
+    components:
+    - type: Transform
+      pos: 10.5,-4.5
+      parent: 2
+  - uid: 133
+    components:
+    - type: Transform
+      pos: 4.5,-10.5
+      parent: 2
+  - uid: 134
+    components:
+    - type: Transform
+      pos: 5.5,-10.5
+      parent: 2
+  - uid: 135
+    components:
+    - type: Transform
+      pos: 6.5,-10.5
+      parent: 2
+  - uid: 137
+    components:
+    - type: Transform
+      pos: 8.5,-10.5
+      parent: 2
+  - uid: 139
+    components:
+    - type: Transform
+      pos: 10.5,-10.5
+      parent: 2
+  - uid: 140
+    components:
+    - type: Transform
+      pos: 10.5,-9.5
+      parent: 2
+  - uid: 143
+    components:
+    - type: Transform
+      pos: 10.5,-6.5
+      parent: 2
+  - uid: 174
+    components:
+    - type: Transform
+      pos: -7.5,-4.5
+      parent: 2
+  - uid: 177
+    components:
+    - type: Transform
+      pos: -7.5,-7.5
+      parent: 2
+  - uid: 179
+    components:
+    - type: Transform
+      pos: -7.5,-9.5
+      parent: 2
+  - uid: 180
+    components:
+    - type: Transform
+      pos: -7.5,-10.5
+      parent: 2
+  - uid: 181
+    components:
+    - type: Transform
+      pos: -6.5,-10.5
+      parent: 2
+  - uid: 183
+    components:
+    - type: Transform
+      pos: -4.5,-10.5
+      parent: 2
+  - uid: 184
+    components:
+    - type: Transform
+      pos: -3.5,-10.5
+      parent: 2
+  - uid: 186
+    components:
+    - type: Transform
+      pos: -1.5,-10.5
+      parent: 2
+  - uid: 187
+    components:
+    - type: Transform
+      pos: -8.5,-3.5
+      parent: 2
+  - uid: 188
+    components:
+    - type: Transform
+      pos: -9.5,-3.5
+      parent: 2
+  - uid: 196
+    components:
+    - type: Transform
+      pos: 14.5,-8.5
+      parent: 2
+  - uid: 198
+    components:
+    - type: Transform
+      pos: -5.5,-9.5
+      parent: 2
+  - uid: 199
+    components:
+    - type: Transform
+      pos: -5.5,-8.5
+      parent: 2
+  - uid: 200
+    components:
+    - type: Transform
+      pos: -5.5,-7.5
+      parent: 2
+  - uid: 203
+    components:
+    - type: Transform
+      pos: 8.5,-7.5
+      parent: 2
+  - uid: 205
+    components:
+    - type: Transform
+      pos: 8.5,-9.5
+      parent: 2
+  - uid: 208
+    components:
+    - type: Transform
+      pos: -8.5,-9.5
+      parent: 2
+  - uid: 209
+    components:
+    - type: Transform
+      pos: 14.5,-7.5
+      parent: 2
+  - uid: 210
+    components:
+    - type: Transform
+      pos: 14.5,-6.5
+      parent: 2
+  - uid: 211
+    components:
+    - type: Transform
+      pos: 14.5,-4.5
+      parent: 2
+  - uid: 214
+    components:
+    - type: Transform
+      pos: 13.5,-3.5
+      parent: 2
+  - uid: 217
+    components:
+    - type: Transform
+      pos: 6.5,3.5
+      parent: 2
+  - uid: 220
+    components:
+    - type: Transform
+      pos: 9.5,3.5
+      parent: 2
+  - uid: 232
+    components:
+    - type: Transform
+      pos: 11.5,-9.5
+      parent: 2
+  - uid: 233
+    components:
+    - type: Transform
+      pos: 13.5,-9.5
+      parent: 2
+- proto: WallSolidRust
+  entities:
+  - uid: 243
+    components:
+    - type: Transform
+      pos: -3.5,-3.5
+      parent: 2
+  - uid: 244
+    components:
+    - type: Transform
+      pos: -0.5,-7.5
+      parent: 2
+  - uid: 245
+    components:
+    - type: Transform
+      pos: 10.5,-3.5
+      parent: 2
+  - uid: 248
+    components:
+    - type: Transform
+      pos: 3.5,-10.5
+      parent: 2
+  - uid: 252
+    components:
+    - type: Transform
+      pos: 7.5,-3.5
+      parent: 2
+  - uid: 256
+    components:
+    - type: Transform
+      pos: 7.5,-10.5
+      parent: 2
+  - uid: 260
+    components:
+    - type: Transform
+      pos: 9.5,-10.5
+      parent: 2
+  - uid: 267
+    components:
+    - type: Transform
+      pos: 10.5,-8.5
+      parent: 2
+  - uid: 273
+    components:
+    - type: Transform
+      pos: 10.5,-7.5
+      parent: 2
+  - uid: 276
+    components:
+    - type: Transform
+      pos: -7.5,-3.5
+      parent: 2
+  - uid: 279
+    components:
+    - type: Transform
+      pos: -7.5,-6.5
+      parent: 2
+  - uid: 282
+    components:
+    - type: Transform
+      pos: -7.5,-8.5
+      parent: 2
+  - uid: 283
+    components:
+    - type: Transform
+      pos: -5.5,-10.5
+      parent: 2
+  - uid: 284
+    components:
+    - type: Transform
+      pos: -2.5,-10.5
+      parent: 2
+  - uid: 285
+    components:
+    - type: Transform
+      pos: -10.5,-3.5
+      parent: 2
+  - uid: 287
+    components:
+    - type: Transform
+      pos: -11.5,-4.5
+      parent: 2
+  - uid: 292
+    components:
+    - type: Transform
+      pos: -11.5,-6.5
+      parent: 2
+  - uid: 293
+    components:
+    - type: Transform
+      pos: 14.5,-9.5
+      parent: 2
+  - uid: 300
+    components:
+    - type: Transform
+      pos: 12.5,-9.5
+      parent: 2
+  - uid: 301
+    components:
+    - type: Transform
+      pos: 8.5,-8.5
+      parent: 2
+  - uid: 307
+    components:
+    - type: Transform
+      pos: 14.5,-3.5
+      parent: 2
+  - uid: 308
+    components:
+    - type: Transform
+      pos: 14.5,-5.5
+      parent: 2
+  - uid: 365
+    components:
+    - type: Transform
+      pos: -0.5,-11.5
+      parent: 2
+- proto: WeaponPistolCHIMP
+  entities:
+  - uid: 225
+    components:
+    - type: Transform
+      parent: 120
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: WindoorAssemblySecure
+  entities:
+  - uid: 142
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,3.5
+      parent: 2
+  - uid: 318
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-3.5
+      parent: 2
+  - uid: 325
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-4.5
+      parent: 2
+  - uid: 326
+    components:
+    - type: Transform
+      pos: -1.5,0.5
+      parent: 2
+  - uid: 327
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,0.5
+      parent: 2
+- proto: WindoorAssemblySecurePlasma
+  entities:
+  - uid: 329
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,7.5
+      parent: 2
+- proto: WindoorSecureCargoLocked
+  entities:
+  - uid: 76
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-3.5
+      parent: 2
+- proto: WindoorSecureChemistryLocked
+  entities:
+  - uid: 234
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,0.5
+      parent: 2
+  - uid: 343
+    components:
+    - type: Transform
+      pos: 7.5,3.5
+      parent: 2
+- proto: WindoorSecureEngineeringLocked
+  entities:
+  - uid: 86
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-4.5
+      parent: 2
+  - uid: 92
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-4.5
+      parent: 2
+- proto: WindoorSecureMedicalLocked
+  entities:
+  - uid: 88
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,1.5
+      parent: 2
+  - uid: 89
+    components:
+    - type: Transform
+      pos: 4.5,0.5
+      parent: 2
+- proto: WindoorSecureScienceLocked
+  entities:
+  - uid: 94
+    components:
+    - type: Transform
+      pos: -2.5,1.5
+      parent: 2
+  - uid: 266
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,3.5
+      parent: 2
+  - uid: 312
+    components:
+    - type: Transform
+      pos: 8.5,6.5
+      parent: 2
+- proto: WindowReinforcedDirectional
+  entities:
+  - uid: 63
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-3.5
+      parent: 2
+  - uid: 64
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,0.5
+      parent: 2
+  - uid: 65
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,0.5
+      parent: 2
+  - uid: 66
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-3.5
+      parent: 2
+  - uid: 68
+    components:
+    - type: Transform
+      pos: 3.5,-4.5
+      parent: 2
+  - uid: 69
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,1.5
+      parent: 2
+  - uid: 77
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-3.5
+      parent: 2
+  - uid: 80
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,0.5
+      parent: 2
+  - uid: 81
+    components:
+    - type: Transform
+      pos: -0.5,0.5
+      parent: 2
+  - uid: 82
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,0.5
+      parent: 2
+  - uid: 84
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-3.5
+      parent: 2
+  - uid: 85
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-3.5
+      parent: 2
+  - uid: 268
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,3.5
+      parent: 2
+  - uid: 269
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,3.5
+      parent: 2
+  - uid: 313
+    components:
+    - type: Transform
+      pos: 9.5,6.5
+      parent: 2
+  - uid: 341
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,6.5
+      parent: 2
+  - uid: 342
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,7.5
+      parent: 2
+- proto: Wrench
+  entities:
+  - uid: 306
+    components:
+    - type: Transform
+      pos: -1.691124,5.257793
+      parent: 2
+...
diff --git a/Resources/Maps/Shuttles/ShuttleEvent/lambordeere.yml b/Resources/Maps/Shuttles/ShuttleEvent/lambordeere.yml
index 56624fcd3b8..fcb40acdf45 100644
--- a/Resources/Maps/Shuttles/ShuttleEvent/lambordeere.yml
+++ b/Resources/Maps/Shuttles/ShuttleEvent/lambordeere.yml
@@ -1206,6 +1206,10 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 0.5,5.5
       parent: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        50:
+        - Pressed: DoorBolt
   - uid: 199
     components:
     - type: MetaData
@@ -1214,6 +1218,10 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 0.5,2.5
       parent: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        82:
+        - Pressed: DoorBolt
 - proto: SMESBasic
   entities:
   - uid: 65
diff --git a/Resources/Maps/arena.yml b/Resources/Maps/arena.yml
index 49b7daf6b60..dc404102aca 100644
--- a/Resources/Maps/arena.yml
+++ b/Resources/Maps/arena.yml
@@ -9348,8 +9348,7 @@ entities:
           -4,-6:
             0: 63247
           -5,-6:
-            0: 64271
-            2: 1024
+            0: 65295
           -3,-8:
             0: 16383
           -3,-7:
@@ -9369,7 +9368,7 @@ entities:
           -1,-7:
             0: 65535
           -1,-6:
-            3: 65520
+            2: 65520
             0: 4
           -1,-9:
             0: 64160
@@ -9380,7 +9379,7 @@ entities:
           0,-7:
             0: 57305
           0,-6:
-            3: 4368
+            2: 4368
             0: 52416
           -8,-8:
             0: 65535
@@ -9840,15 +9839,15 @@ entities:
           9,9:
             1: 4080
           9,10:
-            4: 273
-            5: 1092
+            3: 273
+            4: 1092
           9,11:
             1: 240
           10,9:
             1: 4080
           10,10:
-            6: 273
-            7: 1092
+            5: 273
+            6: 1092
           10,11:
             1: 752
             0: 28672
@@ -9857,13 +9856,13 @@ entities:
           11,9:
             1: 4080
           11,10:
-            7: 1365
+            6: 1365
           11,11:
             1: 35056
           12,9:
             1: 4080
           12,10:
-            7: 273
+            6: 273
             0: 34816
           12,11:
             1: 5936
@@ -9883,14 +9882,15 @@ entities:
           -3,10:
             1: 62259
           -3,11:
-            0: 819
+            0: 947
             1: 29772
           -2,9:
             0: 15
           -2,10:
             1: 63616
           -2,11:
-            1: 32911
+            1: 32863
+            0: 160
           -1,12:
             1: 61457
             0: 4078
@@ -10719,6 +10719,9 @@ entities:
             0: 65535
           16,9:
             1: 240
+            0: 13056
+          16,10:
+            0: 13107
           12,13:
             1: 61713
           11,13:
@@ -10994,20 +10997,24 @@ entities:
             0: 30464
           18,2:
             0: 12407
-            1: 32768
           18,3:
-            0: 13107
-            1: 34952
+            0: 15355
           18,4:
-            0: 3059
+            0: 3067
           19,0:
             1: 12847
           19,1:
             1: 13107
           19,2:
-            1: 13107
+            1: 3891
+          19,3:
+            0: 1911
+          19,4:
+            0: 52733
           20,0:
             1: 15
+          20,3:
+            1: 4096
           16,7:
             0: 61166
           16,8:
@@ -11025,9 +11032,6 @@ entities:
             0: 819
           18,6:
             0: 30583
-          19,4:
-            0: 19964
-            2: 32768
           20,4:
             0: 4369
             1: 3808
@@ -11264,21 +11268,6 @@ entities:
           - 0
           - 0
           - 0
-        - volume: 2500
-          temperature: 293.14975
-          moles:
-          - 20.078888
-          - 75.53487
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
         - volume: 2500
           temperature: 235
           moles:
@@ -11362,6 +11351,7 @@ entities:
       id: Arena
     - type: GasTileOverlay
     - type: SpreaderGrid
+    - type: Shuttle
 - proto: AirAlarm
   entities:
   - uid: 304
@@ -123391,12 +123381,12 @@ entities:
     - type: Transform
       pos: 43.567142,-35.436256
       parent: 6747
-- proto: MaterialDiamond
+- proto: MaterialDiamond1
   entities:
   - uid: 4036
     components:
     - type: Transform
-      pos: -35.668434,-47.688297
+      pos: -35.674225,-47.724026
       parent: 6747
 - proto: MaterialDurathread
   entities:
@@ -148725,7 +148715,7 @@ entities:
     - type: Transform
       pos: 35.444176,-18.296202
       parent: 6747
-- proto: RightArmBorgMining
+- proto: RightArmBorg
   entities:
   - uid: 10713
     components:
@@ -155624,7 +155614,7 @@ entities:
     - type: Transform
       pos: -35.5,0.5
       parent: 6747
-- proto: SuitStorageSec
+- proto: SuitStorageSecDeltaV
   entities:
   - uid: 684
     components:
diff --git a/Resources/Maps/glacier.yml b/Resources/Maps/glacier.yml
index 2f076877f17..cdaab107f63 100644
--- a/Resources/Maps/glacier.yml
+++ b/Resources/Maps/glacier.yml
@@ -12068,7 +12068,7 @@ entities:
   - uid: 22
     components:
     - type: MetaData
-      name: Breakroom
+      name: Restroom
     - type: Transform
       pos: 49.5,-24.5
       parent: 2
@@ -13666,6 +13666,29 @@ entities:
     - type: Transform
       pos: 26.5,-30.5
       parent: 2
+- proto: AirlockRoboticsGlassLocked
+  entities:
+  - uid: 129
+    components:
+    - type: MetaData
+      name: Robotics
+    - type: Transform
+      pos: 44.5,-19.5
+      parent: 2
+  - uid: 130
+    components:
+    - type: MetaData
+      name: Robotics
+    - type: Transform
+      pos: 43.5,-19.5
+      parent: 2
+  - uid: 214
+    components:
+    - type: MetaData
+      name: Robotics
+    - type: Transform
+      pos: 40.5,-22.5
+      parent: 2
 - proto: AirlockSalvageGlassLocked
   entities:
   - uid: 13374
@@ -13700,29 +13723,6 @@ entities:
     - type: Transform
       pos: 37.5,-15.5
       parent: 2
-- proto: AirlockScienceGlassLocked
-  entities:
-  - uid: 129
-    components:
-    - type: MetaData
-      name: Robotics
-    - type: Transform
-      pos: 43.5,-19.5
-      parent: 2
-  - uid: 130
-    components:
-    - type: MetaData
-      name: Robotics
-    - type: Transform
-      pos: 44.5,-19.5
-      parent: 2
-  - uid: 214
-    components:
-    - type: MetaData
-      name: Robotics
-    - type: Transform
-      pos: 40.5,-22.5
-      parent: 2
 - proto: AirlockScienceLocked
   entities:
   - uid: 211
@@ -14093,8 +14093,6 @@ entities:
     - type: Transform
       pos: -33.5,33.5
       parent: 2
-    - type: Apc
-      hasAccess: True
     - type: PowerNetworkBattery
       canDischarge: False
   - uid: 254
@@ -16712,6 +16710,18 @@ entities:
     - type: Transform
       pos: 1.5,19.5
       parent: 2
+- proto: BlastDoorUnlinkedRobotics
+  entities:
+  - uid: 12146
+    components:
+    - type: Transform
+      pos: 45.5,-19.5
+      parent: 2
+  - uid: 12687
+    components:
+    - type: Transform
+      pos: 46.5,-19.5
+      parent: 2
 - proto: BlockGameArcade
   entities:
   - uid: 735
@@ -29972,6 +29982,16 @@ entities:
     - type: Transform
       pos: 38.5,59.5
       parent: 2
+  - uid: 17990
+    components:
+    - type: Transform
+      pos: -5.5,17.5
+      parent: 2
+  - uid: 17991
+    components:
+    - type: Transform
+      pos: -33.5,33.5
+      parent: 2
 - proto: CableApcStack
   entities:
   - uid: 3087
@@ -47850,6 +47870,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: -8.5,24.5
       parent: 2
+  - uid: 17989
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -7.5,20.5
+      parent: 2
 - proto: ComputerFrame
   entities:
   - uid: 6301
@@ -76052,6 +76078,13 @@ entities:
     - type: Transform
       pos: -16.5,15.5
       parent: 2
+- proto: GunSafeLaserCarbine
+  entities:
+  - uid: 14378
+    components:
+    - type: Transform
+      pos: -20.5,11.5
+      parent: 2
 - proto: Gyroscope
   entities:
   - uid: 10043
@@ -76766,6 +76799,41 @@ entities:
     - type: Transform
       pos: 37.295227,37.70594
       parent: 2
+- proto: IntercomEngineering
+  entities:
+  - uid: 17999
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 20.5,36.5
+      parent: 2
+  - uid: 18001
+    components:
+    - type: Transform
+      pos: 4.5,33.5
+      parent: 2
+  - uid: 18002
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 18.5,55.5
+      parent: 2
+- proto: IntercomMedical
+  entities:
+  - uid: 18000
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,4.5
+      parent: 2
+- proto: IntercomScience
+  entities:
+  - uid: 17997
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 30.5,-20.5
+      parent: 2
 - proto: IntercomSecurity
   entities:
   - uid: 10155
@@ -76778,6 +76846,46 @@ entities:
     - type: Transform
       pos: -14.5,38.5
       parent: 2
+  - uid: 17992
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,24.5
+      parent: 2
+  - uid: 17993
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,25.5
+      parent: 2
+- proto: IntercomService
+  entities:
+  - uid: 17994
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 11.5,19.5
+      parent: 2
+  - uid: 17995
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 17.5,26.5
+      parent: 2
+  - uid: 17998
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 30.5,9.5
+      parent: 2
+- proto: IntercomSupply
+  entities:
+  - uid: 17996
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 36.5,10.5
+      parent: 2
 - proto: JanitorialTrolley
   entities:
   - uid: 10157
@@ -77230,6 +77338,19 @@ entities:
         - Pressed: Toggle
         730:
         - Pressed: Toggle
+- proto: LockableButtonRobotics
+  entities:
+  - uid: 5814
+    components:
+    - type: Transform
+      pos: 47.5,-19.5
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        12687:
+        - Pressed: Toggle
+        12146:
+        - Pressed: Toggle
 - proto: LockableButtonSalvage
   entities:
   - uid: 4805
@@ -81076,11 +81197,6 @@ entities:
     - type: Transform
       pos: 50.5,-0.5
       parent: 2
-  - uid: 10865
-    components:
-    - type: Transform
-      pos: 34.5,71.5
-      parent: 2
   - uid: 10866
     components:
     - type: Transform
@@ -81206,11 +81322,6 @@ entities:
     - type: Transform
       pos: 49.5,-19.5
       parent: 2
-  - uid: 10902
-    components:
-    - type: Transform
-      pos: 34.5,72.5
-      parent: 2
   - uid: 10903
     components:
     - type: Transform
@@ -81226,6 +81337,11 @@ entities:
     - type: Transform
       pos: 57.5,-14.5
       parent: 2
+  - uid: 10908
+    components:
+    - type: Transform
+      pos: 37.5,72.5
+      parent: 2
   - uid: 10909
     components:
     - type: Transform
@@ -81781,6 +81897,11 @@ entities:
     - type: Transform
       pos: 32.5,63.5
       parent: 2
+  - uid: 11030
+    components:
+    - type: Transform
+      pos: 38.5,72.5
+      parent: 2
   - uid: 11031
     components:
     - type: Transform
@@ -86316,6 +86437,11 @@ entities:
     - type: Transform
       pos: 40.5,-15.5
       parent: 2
+  - uid: 13982
+    components:
+    - type: Transform
+      pos: 39.5,72.5
+      parent: 2
   - uid: 14615
     components:
     - type: Transform
@@ -88131,6 +88257,13 @@ entities:
     - type: Transform
       pos: 51.5,6.5
       parent: 2
+- proto: PlayerStationAi
+  entities:
+  - uid: 14579
+    components:
+    - type: Transform
+      pos: 38.5,70.5
+      parent: 2
 - proto: PlushieAtmosian
   entities:
   - uid: 12274
@@ -88194,6 +88327,14 @@ entities:
     - type: Transform
       pos: -58.510414,-5.4538803
       parent: 2
+- proto: PlushieRainbowCarp
+  entities:
+  - uid: 17987
+    components:
+    - type: Transform
+      parent: 14550
+    - type: Physics
+      canCollide: False
 - proto: PlushieRatvar
   entities:
   - uid: 12281
@@ -97586,16 +97727,6 @@ entities:
       parent: 2
 - proto: ShuttersWindow
   entities:
-  - uid: 12146
-    components:
-    - type: Transform
-      pos: 45.5,-19.5
-      parent: 2
-  - uid: 14706
-    components:
-    - type: Transform
-      pos: 46.5,-19.5
-      parent: 2
   - uid: 17029
     components:
     - type: Transform
@@ -97933,19 +98064,6 @@ entities:
       linkedPorts:
         10250:
         - Status: Toggle
-  - uid: 13939
-    components:
-    - type: Transform
-      pos: 47.5,-19.5
-      parent: 2
-    - type: DeviceLinkSource
-      linkedPorts:
-        14706:
-        - On: Open
-        - Off: Close
-        12146:
-        - On: Open
-        - Off: Close
   - uid: 14666
     components:
     - type: Transform
@@ -100217,15 +100335,15 @@ entities:
       parent: 2
 - proto: SpawnPointReporter
   entities:
-  - uid: 13981
+  - uid: 10891
     components:
     - type: Transform
-      pos: 67.5,-9.5
+      pos: 68.5,-8.5
       parent: 2
-  - uid: 13982
+  - uid: 13981
     components:
     - type: Transform
-      pos: 69.5,-8.5
+      pos: 67.5,-9.5
       parent: 2
   - uid: 14159
     components:
@@ -100251,6 +100369,23 @@ entities:
     - type: Transform
       pos: 31.5,42.5
       parent: 2
+- proto: SpawnPointRoboticist
+  entities:
+  - uid: 13939
+    components:
+    - type: Transform
+      pos: 43.5,-21.5
+      parent: 2
+  - uid: 14706
+    components:
+    - type: Transform
+      pos: 46.5,-21.5
+      parent: 2
+  - uid: 17982
+    components:
+    - type: Transform
+      pos: 47.5,-25.5
+      parent: 2
 - proto: SpawnPointSalvageSpecialist
   entities:
   - uid: 4794
@@ -100280,16 +100415,6 @@ entities:
     - type: Transform
       pos: 40.5,-33.5
       parent: 2
-  - uid: 5814
-    components:
-    - type: Transform
-      pos: 43.5,-21.5
-      parent: 2
-  - uid: 12687
-    components:
-    - type: Transform
-      pos: 47.5,-25.5
-      parent: 2
   - uid: 13588
     components:
     - type: Transform
@@ -100340,6 +100465,28 @@ entities:
     - type: Transform
       pos: 30.5,-18.5
       parent: 2
+- proto: SpawnPointSecurityBorg
+  entities:
+  - uid: 17983
+    components:
+    - type: Transform
+      pos: -6.5,21.5
+      parent: 2
+  - uid: 17984
+    components:
+    - type: Transform
+      pos: -23.5,21.5
+      parent: 2
+  - uid: 17985
+    components:
+    - type: Transform
+      pos: -22.5,38.5
+      parent: 2
+  - uid: 17986
+    components:
+    - type: Transform
+      pos: -19.5,41.5
+      parent: 2
 - proto: SpawnPointSecurityCadet
   entities:
   - uid: 13988
@@ -101100,7 +101247,7 @@ entities:
     - type: Transform
       pos: 83.5,6.5
       parent: 2
-- proto: SuitStorageSec
+- proto: SuitStorageSecDeltaV
   entities:
   - uid: 13629
     components:
@@ -101137,7 +101284,7 @@ entities:
   - uid: 10517
     components:
     - type: Transform
-      pos: 37.5,73.5
+      pos: 36.5,73.5
       parent: 2
     - type: SurveillanceCamera
       setupAvailableNetworks:
@@ -103275,12 +103422,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -4.5,-6.5
       parent: 2
-  - uid: 14378
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,11.5
-      parent: 2
   - uid: 14379
     components:
     - type: Transform
@@ -104242,6 +104383,16 @@ entities:
       rot: 3.141592653589793 rad
       pos: 50.5,-26.5
       parent: 2
+    - type: ContainerContainer
+      containers:
+        stash: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: 17987
+        disposals: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
   - uid: 14551
     components:
     - type: Transform
@@ -104398,16 +104549,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 59.421833,-15.183031
       parent: 2
-- proto: ToyAi
-  entities:
-  - uid: 14579
-    components:
-    - type: MetaData
-      desc: It's displaying the famous "blue smile of death"
-      name: faulty AI core
-    - type: Transform
-      pos: 38.49569,70.53853
-      parent: 2
 - proto: ToyFigurineClown
   entities:
   - uid: 14580
@@ -105104,6 +105245,11 @@ entities:
     - type: Transform
       pos: 26.5,39.5
       parent: 2
+  - uid: 17981
+    components:
+    - type: Transform
+      pos: 29.5,-21.5
+      parent: 2
 - proto: VendingMachineViroDrobe
   entities:
   - uid: 14681
@@ -105504,13 +105650,18 @@ entities:
   - uid: 10845
     components:
     - type: Transform
-      pos: 39.5,72.5
+      pos: 34.5,72.5
       parent: 2
   - uid: 10863
     components:
     - type: Transform
       pos: -23.5,11.5
       parent: 2
+  - uid: 10865
+    components:
+    - type: Transform
+      pos: 34.5,71.5
+      parent: 2
   - uid: 10868
     components:
     - type: Transform
@@ -105543,25 +105694,20 @@ entities:
       rot: 3.141592653589793 rad
       pos: 39.5,70.5
       parent: 2
-  - uid: 10891
-    components:
-    - type: Transform
-      pos: 38.5,72.5
-      parent: 2
   - uid: 10900
     components:
     - type: Transform
       pos: 41.5,68.5
       parent: 2
-  - uid: 10907
+  - uid: 10902
     components:
     - type: Transform
-      pos: 41.5,71.5
+      pos: 36.5,72.5
       parent: 2
-  - uid: 10908
+  - uid: 10907
     components:
     - type: Transform
-      pos: 37.5,72.5
+      pos: 41.5,71.5
       parent: 2
   - uid: 10914
     components:
@@ -105580,11 +105726,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 42.5,64.5
       parent: 2
-  - uid: 11030
-    components:
-    - type: Transform
-      pos: 36.5,72.5
-      parent: 2
   - uid: 11043
     components:
     - type: Transform
@@ -113677,6 +113818,13 @@ entities:
       rot: 3.141592653589793 rad
       pos: -11.5,41.5
       parent: 2
+- proto: WarningO2
+  entities:
+  - uid: 17988
+    components:
+    - type: Transform
+      pos: -11.5,47.5
+      parent: 2
 - proto: WarpPoint
   entities:
   - uid: 16248
@@ -114429,6 +114577,17 @@ entities:
       parent: 2
 - proto: WindoorSecureSecurityLawyerLocked
   entities:
+  - uid: 6005
+    components:
+    - type: Transform
+      pos: -8.5,27.5
+      parent: 2
+  - uid: 6408
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -7.5,25.5
+      parent: 2
   - uid: 16537
     components:
     - type: Transform
@@ -114453,17 +114612,6 @@ entities:
       parent: 2
 - proto: WindoorSecureSecurityLocked
   entities:
-  - uid: 6005
-    components:
-    - type: Transform
-      pos: -8.5,27.5
-      parent: 2
-  - uid: 6408
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -7.5,25.5
-      parent: 2
   - uid: 13193
     components:
     - type: MetaData
@@ -114476,7 +114624,7 @@ entities:
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -4307.4097
+      secondsUntilStateChange: -5336.6123
       state: Opening
     - type: Airlock
       autoClose: False
@@ -114492,7 +114640,7 @@ entities:
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -4306.8433
+      secondsUntilStateChange: -5336.046
       state: Opening
     - type: Airlock
       autoClose: False
@@ -114514,7 +114662,7 @@ entities:
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -4306.3765
+      secondsUntilStateChange: -5335.579
       state: Opening
     - type: Airlock
       autoClose: False
@@ -114530,7 +114678,7 @@ entities:
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -4307.9097
+      secondsUntilStateChange: -5337.1123
       state: Opening
     - type: Airlock
       autoClose: False
diff --git a/Resources/Maps/lighthouse.yml b/Resources/Maps/lighthouse.yml
index f599ec505e3..845daf7a210 100644
--- a/Resources/Maps/lighthouse.yml
+++ b/Resources/Maps/lighthouse.yml
@@ -8,6 +8,7 @@ tilemap:
   7: FloorAsteroidSand
   8: FloorAsteroidSandDug
   11: FloorAsteroidTile
+  10: FloorAstroGrass
   14: FloorBar
   17: FloorBlue
   18: FloorBlueCircuit
@@ -162,7 +163,7 @@ entities:
           version: 6
         -2,2:
           ind: -2,2
-          tiles: PQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAANAAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAANAAAAAAANAAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAANAAAAAAANAAAAAAANAAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAZQAAAAAAbQAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAUAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAANAAAAAAANAAAAAAANAAAAAAANAAAAAAAPQAAAAAAPQAAAAAAZQAAAAAAbQAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAcQAAAAAAcQAAAAAACQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAfwAAAAAAfwAAAAAAcQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAIAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAfwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAUAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAUAAAAAAAIAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAUAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAXgAAAAABfwAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAfwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAXgAAAAABfwAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAUAAAAAAAcQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAXgAAAAABfwAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAfwAAAAAACQAAAAAAfwAAAAAAfwAAAAAACQAAAAAAfwAAAAAAcQAAAAAAcQAAAAAAfwAAAAAA
+          tiles: PQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAACgAAAAAACgAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAPQAAAAAAPQAAAAAAZQAAAAAAbQAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAUAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAPQAAAAAAPQAAAAAAZQAAAAAAbQAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAcQAAAAAAcQAAAAAACQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAfwAAAAAAfwAAAAAAcQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAIAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAfwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAUAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAUAAAAAAAIAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAUAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAXgAAAAABfwAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAfwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAXgAAAAABfwAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAUAAAAAAAcQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAXgAAAAABfwAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAfwAAAAAACQAAAAAAfwAAAAAAfwAAAAAACQAAAAAAfwAAAAAAcQAAAAAAcQAAAAAAfwAAAAAA
           version: 6
         -3,0:
           ind: -3,0
@@ -174,7 +175,7 @@ entities:
           version: 6
         -3,2:
           ind: -3,2
-          tiles: fwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAADAQAAAAAAXgAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAXgAAAAADAQAAAAAAXgAAAAAAfwAAAAAAXgAAAAADXgAAAAACXgAAAAADXgAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAXgAAAAABXgAAAAACXgAAAAACXgAAAAADXgAAAAAAXgAAAAABAQAAAAAAXgAAAAABfwAAAAAAXgAAAAACXgAAAAAAXgAAAAABXgAAAAADAQAAAAAAMgAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAMAAAAAABXgAAAAACUAAAAAAAXgAAAAAAXgAAAAAAXgAAAAADXgAAAAACAQAAAAAAAQAAAAAAAQAAAAAAXgAAAAACXgAAAAAAXgAAAAABXgAAAAABXgAAAAABXgAAAAACAQAAAAAAXgAAAAABUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAABAQAAAAAAXgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAAQAAAAAAXgAAAAAAUAAAAAAAXgAAAAAAXgAAAAADXgAAAAAAXgAAAAAAXgAAAAADAQAAAAAAXgAAAAABXgAAAAABXgAAAAACXgAAAAABXgAAAAABfwAAAAAAXgAAAAACAQAAAAAAXgAAAAABfwAAAAAAXgAAAAABXgAAAAAAXgAAAAACfwAAAAAAXgAAAAACAQAAAAAAXgAAAAACXgAAAAACXgAAAAACXgAAAAAAXgAAAAADfwAAAAAAXgAAAAAAAQAAAAAAAQAAAAAAXgAAAAAAfwAAAAAAfwAAAAAAXgAAAAACXgAAAAACXgAAAAADAQAAAAAAXgAAAAACfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAABAQAAAAAAXgAAAAAAXgAAAAADfwAAAAAAXgAAAAACfwAAAAAAXgAAAAACMAAAAAADXgAAAAABXgAAAAACXgAAAAABXgAAAAAAXgAAAAABXgAAAAAAfwAAAAAAXgAAAAABMAAAAAACXgAAAAADXgAAAAABXgAAAAABXgAAAAAAXgAAAAADXgAAAAACXgAAAAACXgAAAAADXgAAAAABXgAAAAACXgAAAAAAXgAAAAAAXgAAAAADfwAAAAAAXgAAAAAAAQAAAAAAXgAAAAACXgAAAAABXgAAAAABXgAAAAACfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAAQAAAAAAXgAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAADAQAAAAAAXgAAAAADfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAZQAAAAAAfwAAAAAAQwAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAXgAAAAADAQAAAAAAXgAAAAACfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAZQAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAXgAAAAACMAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAfwAAAAAAQwAAAAAAQwAAAAAAfwAAAAAAXgAAAAAAXgAAAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAACAQAAAAAA
+          tiles: fwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAADAQAAAAAAXgAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAXgAAAAADAQAAAAAAXgAAAAAAfwAAAAAAXgAAAAADXgAAAAACXgAAAAADXgAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAXgAAAAABXgAAAAACXgAAAAACXgAAAAADXgAAAAAAXgAAAAABAQAAAAAAXgAAAAABfwAAAAAAXgAAAAACXgAAAAAAXgAAAAABXgAAAAADAQAAAAAAMgAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAMAAAAAABXgAAAAACPQAAAAAAXgAAAAAAXgAAAAAAXgAAAAADXgAAAAACAQAAAAAAAQAAAAAAAQAAAAAAXgAAAAACXgAAAAAAXgAAAAABXgAAAAABXgAAAAABXgAAAAACAQAAAAAAXgAAAAABPQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAABAQAAAAAAXgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAAQAAAAAAXgAAAAAAUAAAAAAAXgAAAAAAXgAAAAADXgAAAAAAXgAAAAAAXgAAAAADAQAAAAAAXgAAAAABXgAAAAABXgAAAAACXgAAAAABXgAAAAABfwAAAAAAXgAAAAACAQAAAAAAXgAAAAABfwAAAAAAXgAAAAABXgAAAAAAXgAAAAACfwAAAAAAXgAAAAACAQAAAAAAXgAAAAACXgAAAAACXgAAAAACXgAAAAAAXgAAAAADfwAAAAAAXgAAAAAAAQAAAAAAAQAAAAAAXgAAAAAAfwAAAAAAfwAAAAAAXgAAAAACXgAAAAACXgAAAAADAQAAAAAAXgAAAAACfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAABAQAAAAAAXgAAAAAAXgAAAAADfwAAAAAAXgAAAAACfwAAAAAAXgAAAAACMAAAAAADXgAAAAABXgAAAAACXgAAAAABXgAAAAAAXgAAAAABXgAAAAAAfwAAAAAAXgAAAAABMAAAAAACXgAAAAADXgAAAAABXgAAAAABXgAAAAAAXgAAAAADXgAAAAACXgAAAAACXgAAAAADXgAAAAABXgAAAAACXgAAAAAAXgAAAAAAXgAAAAADfwAAAAAAXgAAAAAAAQAAAAAAXgAAAAACXgAAAAABXgAAAAABXgAAAAACfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAAQAAAAAAXgAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAADAQAAAAAAXgAAAAADfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAZQAAAAAAfwAAAAAAQwAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAXgAAAAADAQAAAAAAXgAAAAACfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAZQAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAXgAAAAACMAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAfwAAAAAAQwAAAAAAQwAAAAAAfwAAAAAAXgAAAAAAXgAAAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAACAQAAAAAA
           version: 6
         -3,-1:
           ind: -3,-1
@@ -194,7 +195,7 @@ entities:
           version: 6
         0,3:
           ind: 0,3
-          tiles: UAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAIAAAAAAAIAAAAAABIAAAAAACIAAAAAADIAAAAAACIAAAAAABIAAAAAABIAAAAAADfwAAAAAAfwAAAAAAIAAAAAACIAAAAAACMgAAAAAAMgAAAAAAMgAAAAAAfwAAAAAAIAAAAAAAIAAAAAACIAAAAAABIAAAAAACIAAAAAACIAAAAAADIAAAAAADIAAAAAACfwAAAAAAfwAAAAAAUAAAAAAAIAAAAAACMgAAAAAAMgAAAAAAMgAAAAAAfwAAAAAAfwAAAAAAIAAAAAABIAAAAAABIAAAAAABIAAAAAADIAAAAAACfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAIAAAAAABIAAAAAABMgAAAAAAMgAAAAAAMgAAAAAAMgAAAAAAfwAAAAAAfwAAAAAAIAAAAAADIAAAAAADIAAAAAADfwAAAAAAfwAAAAAAfgAAAAAAUAAAAAAAIAAAAAAATwAAAAADIAAAAAADMgAAAAAAMgAAAAAAMgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAUAAAAAAAIAAAAAADIAAAAAACIAAAAAACMgAAAAAAMgAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAIAAAAAADMgAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: UAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAIAAAAAAAIAAAAAABIAAAAAACIAAAAAADIAAAAAACIAAAAAABIAAAAAABIAAAAAADfwAAAAAAfwAAAAAAIAAAAAACIAAAAAACMgAAAAAAMgAAAAAAMgAAAAAAfwAAAAAAIAAAAAAAIAAAAAACIAAAAAABIAAAAAACIAAAAAACIAAAAAADIAAAAAADIAAAAAACfwAAAAAAfwAAAAAAUAAAAAAAIAAAAAACMgAAAAAAMgAAAAAAMgAAAAAAfwAAAAAAfwAAAAAAIAAAAAABIAAAAAABIAAAAAABIAAAAAADIAAAAAACfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAIAAAAAABIAAAAAABMgAAAAAAMgAAAAAAMgAAAAAAMgAAAAAAfwAAAAAAfwAAAAAAIAAAAAADIAAAAAADIAAAAAADfwAAAAAAfwAAAAAAfgAAAAAAUAAAAAAAIAAAAAAATwAAAAADIAAAAAADMgAAAAAAMgAAAAAAMgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAUAAAAAAAIAAAAAADIAAAAAACIAAAAAACMgAAAAAAMgAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAIAAAAAADMgAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         1,2:
           ind: 1,2
@@ -202,7 +203,7 @@ entities:
           version: 6
         1,3:
           ind: 1,3
-          tiles: IAAAAAACIAAAAAAAIAAAAAADfwAAAAAAfwAAAAAAZQAAAAAAZQAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAACXgAAAAAAXgAAAAADXgAAAAADXgAAAAAAXgAAAAACXgAAAAADXgAAAAAAIAAAAAAAIAAAAAADIAAAAAADIAAAAAABfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAADXgAAAAAAXgAAAAACXgAAAAADXgAAAAAAXgAAAAABXgAAAAACXgAAAAACXgAAAAACTwAAAAAAIAAAAAAATwAAAAAAIAAAAAACUAAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAXgAAAAADXgAAAAADXgAAAAABXgAAAAAAXgAAAAABXgAAAAACXgAAAAAAIAAAAAAAIAAAAAABIAAAAAABIAAAAAAAUAAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAXgAAAAAAXgAAAAADXgAAAAADXgAAAAABXgAAAAABXgAAAAADXgAAAAADXgAAAAADIAAAAAAAIAAAAAACUAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAXgAAAAACXgAAAAACXgAAAAABXgAAAAABXgAAAAABXgAAAAADXgAAAAABUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAXgAAAAABXgAAAAADXgAAAAACXgAAAAADXgAAAAABXgAAAAABfwAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAXgAAAAADXgAAAAAAXgAAAAADXgAAAAADXgAAAAADXgAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAXgAAAAAAXgAAAAADXgAAAAABXgAAAAAAXgAAAAACXgAAAAADUAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAXgAAAAAAXgAAAAADXgAAAAABXgAAAAAAXgAAAAABXgAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: IAAAAAACIAAAAAAAIAAAAAADfwAAAAAAfwAAAAAAZQAAAAAAZQAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAACXgAAAAAAXgAAAAADXgAAAAADXgAAAAAAXgAAAAACXgAAAAADXgAAAAAAIAAAAAAAIAAAAAADIAAAAAADIAAAAAABfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAADXgAAAAAAXgAAAAACXgAAAAADXgAAAAAAXgAAAAABXgAAAAACXgAAAAACXgAAAAACTwAAAAAAIAAAAAAATwAAAAAAIAAAAAACUAAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAXgAAAAADXgAAAAADXgAAAAABXgAAAAAAXgAAAAABXgAAAAACXgAAAAAAIAAAAAAAIAAAAAABIAAAAAABIAAAAAAAUAAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAXgAAAAAAXgAAAAADXgAAAAADXgAAAAABXgAAAAABXgAAAAADXgAAAAADXgAAAAADIAAAAAAAIAAAAAACUAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAXgAAAAACXgAAAAACXgAAAAABXgAAAAABXgAAAAABXgAAAAADXgAAAAABUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAXgAAAAABXgAAAAADXgAAAAACXgAAAAADXgAAAAABXgAAAAABfwAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAXgAAAAADXgAAAAAAXgAAAAADXgAAAAADXgAAAAADXgAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAXgAAAAAAXgAAAAADXgAAAAABXgAAAAAAXgAAAAACXgAAAAADUAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAXgAAAAAAXgAAAAADXgAAAAABXgAAAAAAXgAAAAABXgAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         1,-3:
           ind: 1,-3
@@ -990,7 +991,6 @@ entities:
             color: '#A4FF98E6'
             id: Bushh2
           decals:
-            79: -30.847744,35.061573
             80: -32.097744,34.342823
             81: -29.800869,36.249073
         - node:
@@ -3081,7 +3081,11 @@ entities:
             id: Grassb1
           decals:
             90: -30.187717,36.983448
-            91: -31.953342,34.264698
+        - node:
+            color: '#FFFFFFFF'
+            id: Grassb4
+          decals:
+            2799: -30.950752,35.19532
         - node:
             color: '#FFFFFFFF'
             id: Grassc1
@@ -3099,6 +3103,11 @@ entities:
             87: -30.359592,36.264698
             88: -30.625217,37.061573
             89: -32.140842,36.733448
+        - node:
+            color: '#FFFFFFFF'
+            id: Grassd1
+          decals:
+            2796: -28.918009,36.22847
         - node:
             color: '#60466660'
             id: Grassd3
@@ -4343,6 +4352,26 @@ entities:
           decals:
             2644: -13,37
             2786: -18,37
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerNE
+          decals:
+            2804: -13,0
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerNW
+          decals:
+            2803: -15,0
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerSE
+          decals:
+            2801: -13,-2
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerSW
+          decals:
+            2802: -15,-2
         - node:
             color: '#FFFFFFFF'
             id: WarnEndE
@@ -4392,6 +4421,7 @@ entities:
             2435: -37,6
             2436: -39,8
             2437: -37,8
+            2805: -14,-2
         - node:
             color: '#FFFFFFFF'
             id: WarnLineW
@@ -4400,6 +4430,7 @@ entities:
             2439: -37,8
             2440: -39,6
             2441: -37,6
+            2800: -14,0
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinCornerSw
@@ -5422,6 +5453,8 @@ entities:
             0: 48027
           4,11:
             0: 28825
+          -9,8:
+            0: 65399
           -8,9:
             0: 57599
           -9,9:
@@ -5524,8 +5557,6 @@ entities:
             0: 14100
           -10,8:
             0: 65528
-          -9,8:
-            0: 30583
           -12,8:
             0: 65520
           -13,8:
@@ -5705,18 +5736,18 @@ entities:
           1,15:
             1: 241
           2,13:
-            1: 20028
+            1: 60988
           2,15:
             1: 144
           2,14:
-            1: 128
+            1: 238
+          3,13:
+            1: 36864
+            0: 142
           3,14:
-            1: 467
+            1: 4083
           3,15:
             1: 4369
-          3,13:
-            0: 142
-            1: 36864
           3,16:
             1: 57619
             0: 4096
@@ -5726,7 +5757,7 @@ entities:
             0: 63
             1: 12288
           4,14:
-            1: 376
+            1: 4088
           5,9:
             0: 57109
           5,10:
@@ -5761,9 +5792,9 @@ entities:
           8,11:
             0: 65535
           5,13:
-            1: 48646
+            1: 65030
           5,14:
-            1: 10
+            1: 511
           6,13:
             0: 61167
           6,14:
@@ -5780,7 +5811,7 @@ entities:
             1: 7
           8,12:
             0: 30708
-            7: 32768
+            3: 32768
           8,13:
             0: 247
             1: 61440
@@ -5926,7 +5957,7 @@ entities:
             0: 65535
           -7,-13:
             0: 45155
-            3: 12
+            4: 12
           -6,-12:
             0: 65335
           -6,-11:
@@ -6351,24 +6382,24 @@ entities:
             0: 65535
           -3,-15:
             0: 13104
-            3: 128
-            4: 32768
+            4: 128
+            5: 32768
           -3,-14:
             0: 13107
-            5: 128
-            6: 32768
+            6: 128
+            7: 32768
           -3,-17:
             0: 61457
             1: 238
           -2,-16:
             0: 64447
           -2,-15:
-            3: 48
-            4: 12288
+            4: 48
+            5: 12288
             0: 34952
           -2,-14:
-            5: 48
-            6: 12288
+            6: 48
+            7: 12288
             0: 34952
           -2,-17:
             0: 47308
@@ -6637,7 +6668,7 @@ entities:
             1: 57856
           9,12:
             0: 238
-            7: 61440
+            3: 61440
           10,10:
             1: 15
             0: 47872
@@ -6648,7 +6679,7 @@ entities:
             1: 8192
           10,12:
             0: 102
-            7: 4096
+            3: 4096
             1: 49152
           10,8:
             0: 32768
@@ -6764,17 +6795,17 @@ entities:
           -7,-15:
             0: 17
             1: 4352
-            3: 52416
+            4: 52416
           -7,-14:
             1: 1
             0: 12560
-            3: 17612
+            4: 17612
           -6,-16:
             0: 65520
           -6,-15:
-            3: 30576
+            4: 30576
           -6,-14:
-            3: 119
+            4: 119
             0: 61440
           -6,-17:
             1: 4096
@@ -6893,7 +6924,7 @@ entities:
             0: 63280
           9,13:
             1: 28672
-            7: 238
+            3: 238
           9,14:
             1: 18146
             0: 8192
@@ -6903,7 +6934,7 @@ entities:
             1: 7715
             0: 8192
           10,13:
-            7: 17
+            3: 17
             1: 9728
           10,14:
             1: 242
@@ -7152,7 +7183,7 @@ entities:
           temperature: 293.15
           moles:
           - 0
-          - 0
+          - 103.92799
           - 0
           - 0
           - 0
@@ -7169,7 +7200,7 @@ entities:
           - 0
           - 0
           - 0
-          - 6666.982
+          - 0
           - 0
           - 0
           - 0
@@ -7181,10 +7212,10 @@ entities:
         - volume: 2500
           temperature: 293.15
           moles:
-          - 6666.982
           - 0
           - 0
           - 0
+          - 6666.982
           - 0
           - 0
           - 0
@@ -7196,7 +7227,6 @@ entities:
         - volume: 2500
           temperature: 293.15
           moles:
-          - 0
           - 6666.982
           - 0
           - 0
@@ -7208,11 +7238,12 @@ entities:
           - 0
           - 0
           - 0
+          - 0
         - volume: 2500
           temperature: 293.15
           moles:
           - 0
-          - 103.92799
+          - 6666.982
           - 0
           - 0
           - 0
@@ -8683,6 +8714,8 @@ entities:
       - 7086
       - 7087
       - 10774
+      - 21223
+      - 21525
   - uid: 17336
     components:
     - type: Transform
@@ -9029,6 +9062,8 @@ entities:
       - 6167
       - 6163
       - 17294
+      - 21223
+      - 21525
   - uid: 21360
     components:
     - type: MetaData
@@ -9056,6 +9091,17 @@ entities:
     - type: DeviceList
       devices:
       - 21362
+  - uid: 21668
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -9.5,-4.5
+      parent: 100
+    - type: DeviceList
+      devices:
+      - 21655
+      - 21656
+      - 21669
 - proto: AirAlarmVox
   entities:
   - uid: 21104
@@ -9488,6 +9534,14 @@ entities:
       parent: 100
 - proto: AirlockChiefEngineerLocked
   entities:
+  - uid: 464
+    components:
+    - type: MetaData
+      name: AI Satellite Power
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -65.5,74.5
+      parent: 100
   - uid: 10414
     components:
     - type: MetaData
@@ -9999,13 +10053,6 @@ entities:
       parent: 100
     - type: DeviceLinkSink
       invokeCounter: 1
-  - uid: 20375
-    components:
-    - type: MetaData
-      name: AI Satellite Power
-    - type: Transform
-      pos: -65.5,74.5
-      parent: 100
 - proto: AirlockEVAGlassLocked
   entities:
   - uid: 3419
@@ -12261,6 +12308,22 @@ entities:
     - type: Transform
       pos: -11.5,-18.5
       parent: 100
+- proto: AirlockRoboticsGlassLocked
+  entities:
+  - uid: 5598
+    components:
+    - type: MetaData
+      name: Robotics
+    - type: Transform
+      pos: -10.5,-4.5
+      parent: 100
+  - uid: 5600
+    components:
+    - type: MetaData
+      name: Robotics
+    - type: Transform
+      pos: -16.5,-4.5
+      parent: 100
 - proto: AirlockSalvageGlassLocked
   entities:
   - uid: 1334
@@ -12339,13 +12402,6 @@ entities:
     - type: Transform
       pos: -21.5,-14.5
       parent: 100
-  - uid: 10181
-    components:
-    - type: MetaData
-      name: Robotics
-    - type: Transform
-      pos: -10.5,-4.5
-      parent: 100
   - uid: 14368
     components:
     - type: MetaData
@@ -12354,13 +12410,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -7.5,-13.5
       parent: 100
-  - uid: 15346
-    components:
-    - type: MetaData
-      name: Robotics
-    - type: Transform
-      pos: -16.5,-4.5
-      parent: 100
 - proto: AirlockScienceLocked
   entities:
   - uid: 97
@@ -13351,15 +13400,15 @@ entities:
       parent: 100
 - proto: AppraisalTool
   entities:
-  - uid: 19804
+  - uid: 1235
     components:
     - type: Transform
-      pos: 23.284695,-9.149356
+      pos: -27.416039,33.236454
       parent: 100
-  - uid: 19805
+  - uid: 19804
     components:
     - type: Transform
-      pos: -27.753727,33.79231
+      pos: 23.284695,-9.149356
       parent: 100
 - proto: AsimovCircuitBoard
   entities:
@@ -14595,6 +14644,13 @@ entities:
     - type: Transform
       pos: 2.378759,7.0188603
       parent: 100
+- proto: Biogenerator
+  entities:
+  - uid: 497
+    components:
+    - type: Transform
+      pos: -30.5,29.5
+      parent: 100
 - proto: BiomassReclaimer
   entities:
   - uid: 1471
@@ -14677,6 +14733,23 @@ entities:
     - type: Transform
       pos: -63.5,-2.5
       parent: 100
+- proto: BlastDoorUnlinkedRobotics
+  entities:
+  - uid: 10378
+    components:
+    - type: Transform
+      pos: -12.5,-0.5
+      parent: 100
+  - uid: 11647
+    components:
+    - type: Transform
+      pos: -13.5,-0.5
+      parent: 100
+  - uid: 13744
+    components:
+    - type: Transform
+      pos: -14.5,-0.5
+      parent: 100
 - proto: BlockGameArcade
   entities:
   - uid: 1141
@@ -15344,6 +15417,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -20.5,-57.5
       parent: 100
+  - uid: 21653
+    components:
+    - type: Transform
+      pos: -7.5,80.5
+      parent: 100
 - proto: ButtonFrameCautionSecurity
   entities:
   - uid: 15525
@@ -24243,11 +24321,6 @@ entities:
     - type: Transform
       pos: 26.5,22.5
       parent: 100
-  - uid: 13022
-    components:
-    - type: Transform
-      pos: -6.5,55.5
-      parent: 100
   - uid: 13040
     components:
     - type: Transform
@@ -29168,6 +29241,41 @@ entities:
     - type: Transform
       pos: -20.5,39.5
       parent: 100
+  - uid: 21597
+    components:
+    - type: Transform
+      pos: -24.5,73.5
+      parent: 100
+  - uid: 21598
+    components:
+    - type: Transform
+      pos: -24.5,74.5
+      parent: 100
+  - uid: 21599
+    components:
+    - type: Transform
+      pos: -23.5,73.5
+      parent: 100
+  - uid: 21600
+    components:
+    - type: Transform
+      pos: -24.5,69.5
+      parent: 100
+  - uid: 21601
+    components:
+    - type: Transform
+      pos: -24.5,70.5
+      parent: 100
+  - uid: 21602
+    components:
+    - type: Transform
+      pos: -23.5,69.5
+      parent: 100
+  - uid: 21654
+    components:
+    - type: Transform
+      pos: -7.5,57.5
+      parent: 100
 - proto: CableApcStack
   entities:
   - uid: 10832
@@ -38848,6 +38956,206 @@ entities:
     - type: Transform
       pos: -11.5,43.5
       parent: 100
+  - uid: 21555
+    components:
+    - type: Transform
+      pos: 9.5,54.5
+      parent: 100
+  - uid: 21556
+    components:
+    - type: Transform
+      pos: 9.5,55.5
+      parent: 100
+  - uid: 21557
+    components:
+    - type: Transform
+      pos: 9.5,56.5
+      parent: 100
+  - uid: 21558
+    components:
+    - type: Transform
+      pos: 9.5,57.5
+      parent: 100
+  - uid: 21559
+    components:
+    - type: Transform
+      pos: 10.5,57.5
+      parent: 100
+  - uid: 21560
+    components:
+    - type: Transform
+      pos: 11.5,57.5
+      parent: 100
+  - uid: 21561
+    components:
+    - type: Transform
+      pos: 12.5,57.5
+      parent: 100
+  - uid: 21562
+    components:
+    - type: Transform
+      pos: 12.5,58.5
+      parent: 100
+  - uid: 21563
+    components:
+    - type: Transform
+      pos: 13.5,58.5
+      parent: 100
+  - uid: 21564
+    components:
+    - type: Transform
+      pos: 14.5,58.5
+      parent: 100
+  - uid: 21565
+    components:
+    - type: Transform
+      pos: 15.5,58.5
+      parent: 100
+  - uid: 21566
+    components:
+    - type: Transform
+      pos: 16.5,58.5
+      parent: 100
+  - uid: 21567
+    components:
+    - type: Transform
+      pos: 17.5,58.5
+      parent: 100
+  - uid: 21568
+    components:
+    - type: Transform
+      pos: 18.5,58.5
+      parent: 100
+  - uid: 21569
+    components:
+    - type: Transform
+      pos: 19.5,58.5
+      parent: 100
+  - uid: 21570
+    components:
+    - type: Transform
+      pos: 20.5,58.5
+      parent: 100
+  - uid: 21571
+    components:
+    - type: Transform
+      pos: 20.5,57.5
+      parent: 100
+  - uid: 21572
+    components:
+    - type: Transform
+      pos: 21.5,57.5
+      parent: 100
+  - uid: 21573
+    components:
+    - type: Transform
+      pos: 22.5,57.5
+      parent: 100
+  - uid: 21574
+    components:
+    - type: Transform
+      pos: 23.5,57.5
+      parent: 100
+  - uid: 21575
+    components:
+    - type: Transform
+      pos: 11.5,41.5
+      parent: 100
+  - uid: 21576
+    components:
+    - type: Transform
+      pos: 11.5,42.5
+      parent: 100
+  - uid: 21577
+    components:
+    - type: Transform
+      pos: 11.5,43.5
+      parent: 100
+  - uid: 21578
+    components:
+    - type: Transform
+      pos: 11.5,44.5
+      parent: 100
+  - uid: 21579
+    components:
+    - type: Transform
+      pos: 11.5,45.5
+      parent: 100
+  - uid: 21580
+    components:
+    - type: Transform
+      pos: 11.5,46.5
+      parent: 100
+  - uid: 21581
+    components:
+    - type: Transform
+      pos: 11.5,47.5
+      parent: 100
+  - uid: 21582
+    components:
+    - type: Transform
+      pos: 11.5,48.5
+      parent: 100
+  - uid: 21583
+    components:
+    - type: Transform
+      pos: 10.5,48.5
+      parent: 100
+  - uid: 21584
+    components:
+    - type: Transform
+      pos: 9.5,48.5
+      parent: 100
+  - uid: 21585
+    components:
+    - type: Transform
+      pos: 8.5,48.5
+      parent: 100
+  - uid: 21586
+    components:
+    - type: Transform
+      pos: 7.5,48.5
+      parent: 100
+  - uid: 21587
+    components:
+    - type: Transform
+      pos: 7.5,49.5
+      parent: 100
+  - uid: 21588
+    components:
+    - type: Transform
+      pos: 7.5,50.5
+      parent: 100
+  - uid: 21589
+    components:
+    - type: Transform
+      pos: 7.5,51.5
+      parent: 100
+  - uid: 21590
+    components:
+    - type: Transform
+      pos: 7.5,52.5
+      parent: 100
+  - uid: 21591
+    components:
+    - type: Transform
+      pos: 6.5,52.5
+      parent: 100
+  - uid: 21592
+    components:
+    - type: Transform
+      pos: 8.5,52.5
+      parent: 100
+  - uid: 21594
+    components:
+    - type: Transform
+      pos: 9.5,52.5
+      parent: 100
+  - uid: 21595
+    components:
+    - type: Transform
+      pos: 9.5,53.5
+      parent: 100
 - proto: CableTerminal
   entities:
   - uid: 10857
@@ -44031,6 +44339,11 @@ entities:
     - type: Transform
       pos: -16.5,-34.5
       parent: 100
+  - uid: 21620
+    components:
+    - type: Transform
+      pos: -29.5,32.5
+      parent: 100
 - proto: ChemMasterMachineCircuitboard
   entities:
   - uid: 19445
@@ -44038,11 +44351,6 @@ entities:
     - type: Transform
       pos: 47.61066,35.424324
       parent: 100
-  - uid: 21223
-    components:
-    - type: Transform
-      pos: -27.64921,33.26915
-      parent: 100
 - proto: ChessBoard
   entities:
   - uid: 3870
@@ -44964,7 +45272,7 @@ entities:
   - uid: 10716
     components:
     - type: Transform
-      pos: -21.496914,74.75787
+      pos: -21.609526,74.54546
       parent: 100
     - type: Storage
       storedItems:
@@ -44994,6 +45302,22 @@ entities:
           - 4648
           - 4646
           - 4649
+    - type: GroupExamine
+      group:
+      - hoverMessage: ""
+        contextText: verb-examine-group-other
+        icon: /Textures/Interface/examine-star.png
+        components:
+        - Armor
+        - ClothingSpeedModifier
+        entries:
+        - message: >-
+            It provides the following protection:
+
+            - [color=orange]Explosion[/color] damage [color=white]to contents[/color] reduced by [color=lightblue]10%[/color].
+          priority: 0
+          component: Armor
+        title: null
   - uid: 19023
     components:
     - type: Transform
@@ -46360,6 +46684,11 @@ entities:
     - type: Transform
       pos: 12.5,-57.5
       parent: 100
+  - uid: 21630
+    components:
+    - type: Transform
+      pos: -13.5,50.5
+      parent: 100
 - proto: ComputerBroken
   entities:
   - uid: 2498
@@ -46659,6 +46988,13 @@ entities:
       rot: 3.141592653589793 rad
       pos: -14.5,-19.5
       parent: 100
+- proto: ComputerShipyard
+  entities:
+  - uid: 12455
+    components:
+    - type: Transform
+      pos: -15.5,79.5
+      parent: 100
 - proto: ComputerShuttleCargo
   entities:
   - uid: 687
@@ -47228,6 +47564,11 @@ entities:
       parent: 100
 - proto: CrateFreezer
   entities:
+  - uid: 21029
+    components:
+    - type: Transform
+      pos: -14.5,50.5
+      parent: 100
   - uid: 21478
     components:
     - type: Transform
@@ -47254,6 +47595,11 @@ entities:
     - type: Transform
       pos: -6.5,-0.5
       parent: 100
+  - uid: 10244
+    components:
+    - type: Transform
+      pos: -12.5,49.5
+      parent: 100
 - proto: CrateNPCHamlet
   entities:
   - uid: 2939
@@ -47275,13 +47621,6 @@ entities:
     - type: Transform
       pos: -41.5,52.5
       parent: 100
-- proto: CrateSurgery
-  entities:
-  - uid: 21029
-    components:
-    - type: Transform
-      pos: -12.5,49.5
-      parent: 100
 - proto: CrayonGreen
   entities:
   - uid: 15252
@@ -48137,6 +48476,38 @@ entities:
     - type: Transform
       pos: 12.5,30.5
       parent: 100
+- proto: DeskBell
+  entities:
+  - uid: 20171
+    components:
+    - type: Transform
+      pos: -32.483395,34.424244
+      parent: 100
+  - uid: 21526
+    components:
+    - type: Transform
+      pos: -7.0286546,38.53318
+      parent: 100
+  - uid: 21527
+    components:
+    - type: Transform
+      pos: -22.43248,-7.6259303
+      parent: 100
+  - uid: 21528
+    components:
+    - type: Transform
+      pos: -40.26062,-0.4060562
+      parent: 100
+  - uid: 21529
+    components:
+    - type: Transform
+      pos: 18.541483,8.426419
+      parent: 100
+  - uid: 21530
+    components:
+    - type: Transform
+      pos: 17.713358,20.559307
+      parent: 100
 - proto: DiceBag
   entities:
   - uid: 2168
@@ -48704,6 +49075,24 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -7.5,34.5
       parent: 100
+  - uid: 21640
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -30.5,33.5
+      parent: 100
+  - uid: 21641
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -30.5,31.5
+      parent: 100
+  - uid: 21642
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -27.5,33.5
+      parent: 100
 - proto: DisposalJunction
   entities:
   - uid: 3339
@@ -48730,6 +49119,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -6.5,3.5
       parent: 100
+  - uid: 10181
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -15.5,-5.5
+      parent: 100
   - uid: 10196
     components:
     - type: Transform
@@ -48868,6 +49263,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -1.5,18.5
       parent: 100
+  - uid: 10496
+    components:
+    - type: Transform
+      pos: -34.5,31.5
+      parent: 100
   - uid: 10566
     components:
     - type: Transform
@@ -48892,6 +49292,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: -25.5,6.5
       parent: 100
+  - uid: 13022
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -14.5,18.5
+      parent: 100
   - uid: 19976
     components:
     - type: Transform
@@ -49431,11 +49837,6 @@ entities:
     - type: Transform
       pos: -34.5,32.5
       parent: 100
-  - uid: 10244
-    components:
-    - type: Transform
-      pos: -34.5,31.5
-      parent: 100
   - uid: 10245
     components:
     - type: Transform
@@ -49974,12 +50375,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -14.5,-5.5
       parent: 100
-  - uid: 10378
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -15.5,-5.5
-      parent: 100
   - uid: 10379
     components:
     - type: Transform
@@ -50359,12 +50754,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -13.5,18.5
       parent: 100
-  - uid: 10496
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -14.5,18.5
-      parent: 100
   - uid: 10497
     components:
     - type: Transform
@@ -52314,6 +52703,59 @@ entities:
       rot: 3.141592653589793 rad
       pos: -37.5,-36.5
       parent: 100
+  - uid: 21628
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -15.5,-4.5
+      parent: 100
+  - uid: 21633
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -33.5,31.5
+      parent: 100
+  - uid: 21634
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -32.5,31.5
+      parent: 100
+  - uid: 21635
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -31.5,31.5
+      parent: 100
+  - uid: 21636
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -30.5,32.5
+      parent: 100
+  - uid: 21637
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -29.5,33.5
+      parent: 100
+  - uid: 21638
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -28.5,33.5
+      parent: 100
+  - uid: 21639
+    components:
+    - type: Transform
+      pos: -27.5,34.5
+      parent: 100
+  - uid: 21645
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -14.5,17.5
+      parent: 100
 - proto: DisposalTrunk
   entities:
   - uid: 701
@@ -52577,6 +53019,22 @@ entities:
       rot: 3.141592653589793 rad
       pos: -37.5,-37.5
       parent: 100
+  - uid: 21629
+    components:
+    - type: Transform
+      pos: -15.5,-3.5
+      parent: 100
+  - uid: 21632
+    components:
+    - type: Transform
+      pos: -27.5,35.5
+      parent: 100
+  - uid: 21644
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -14.5,16.5
+      parent: 100
 - proto: DisposalUnit
   entities:
   - uid: 1987
@@ -52799,6 +53257,21 @@ entities:
     - type: Transform
       pos: -37.5,-37.5
       parent: 100
+  - uid: 21627
+    components:
+    - type: Transform
+      pos: -15.5,-3.5
+      parent: 100
+  - uid: 21631
+    components:
+    - type: Transform
+      pos: -27.5,35.5
+      parent: 100
+  - uid: 21643
+    components:
+    - type: Transform
+      pos: -14.5,16.5
+      parent: 100
 - proto: DisposalYJunction
   entities:
   - uid: 10335
@@ -54304,6 +54777,13 @@ entities:
     - type: Transform
       pos: -12.5,-3.5
       parent: 100
+- proto: ExplosivesSignMed
+  entities:
+  - uid: 21532
+    components:
+    - type: Transform
+      pos: 16.5,58.5
+      parent: 100
 - proto: ExtendedEmergencyOxygenTank
   entities:
   - uid: 1917
@@ -56647,6 +57127,16 @@ entities:
       deviceLists:
       - 6162
       - 15423
+  - uid: 21223
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -32.5,34.5
+      parent: 100
+    - type: DeviceNetwork
+      deviceLists:
+      - 17333
+      - 21233
   - uid: 21442
     components:
     - type: Transform
@@ -56671,6 +57161,16 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 15281
+  - uid: 21525
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -32.5,35.5
+      parent: 100
+    - type: DeviceNetwork
+      deviceLists:
+      - 17333
+      - 21233
 - proto: FirelockElectronics
   entities:
   - uid: 17772
@@ -58076,6 +58576,15 @@ entities:
       deviceLists:
       - 21360
       - 17161
+  - uid: 21669
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -11.5,-5.5
+      parent: 100
+    - type: DeviceNetwork
+      deviceLists:
+      - 21668
 - proto: Fireplace
   entities:
   - uid: 324
@@ -58180,6 +58689,11 @@ entities:
     - type: Transform
       pos: 21.565899,25.115238
       parent: 100
+  - uid: 21646
+    components:
+    - type: Transform
+      pos: -10.497249,100.51098
+      parent: 100
 - proto: FloorDrain
   entities:
   - uid: 1662
@@ -58744,6 +59258,11 @@ entities:
       parent: 100
 - proto: GasAnalyzer
   entities:
+  - uid: 959
+    components:
+    - type: Transform
+      pos: -27.728539,33.84583
+      parent: 100
   - uid: 12143
     components:
     - type: Transform
@@ -59349,7 +59868,6 @@ entities:
   - uid: 5783
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
       pos: -10.5,-5.5
       parent: 100
     - type: AtmosPipeColor
@@ -60923,6 +61441,37 @@ entities:
       parent: 100
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 21657
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -10.5,-5.5
+      parent: 100
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 21663
+    components:
+    - type: Transform
+      pos: -10.5,-1.5
+      parent: 100
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 21664
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -10.5,-6.5
+      parent: 100
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 21665
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -7.5,-6.5
+      parent: 100
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
 - proto: GasPipeFourway
   entities:
   - uid: 4099
@@ -77444,13 +77993,6 @@ entities:
       parent: 100
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 19852
-    components:
-    - type: Transform
-      pos: -12.5,-1.5
-      parent: 100
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 19853
     components:
     - type: Transform
@@ -78562,6 +79104,59 @@ entities:
       parent: 100
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 21658
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -9.5,-5.5
+      parent: 100
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 21659
+    components:
+    - type: Transform
+      pos: -10.5,-4.5
+      parent: 100
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 21660
+    components:
+    - type: Transform
+      pos: -10.5,-3.5
+      parent: 100
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 21661
+    components:
+    - type: Transform
+      pos: -10.5,-2.5
+      parent: 100
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 21662
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -11.5,-1.5
+      parent: 100
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 21666
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -9.5,-6.5
+      parent: 100
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 21667
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -8.5,-6.5
+      parent: 100
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
 - proto: GasPipeTJunction
   entities:
   - uid: 167
@@ -81382,6 +81977,14 @@ entities:
       parent: 100
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 19852
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -12.5,-1.5
+      parent: 100
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 19856
     components:
     - type: Transform
@@ -81808,6 +82411,8 @@ entities:
     - type: Transform
       pos: -21.5,50.5
       parent: 100
+    - type: GasThermoMachine
+      targetTemperature: 150
   - uid: 20870
     components:
     - type: Transform
@@ -83582,6 +84187,16 @@ entities:
       - 6162
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 21656
+    components:
+    - type: Transform
+      pos: -7.5,-5.5
+      parent: 100
+    - type: DeviceNetwork
+      deviceLists:
+      - 21668
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
 - proto: GasVentPumpVox
   entities:
   - uid: 21106
@@ -85337,6 +85952,17 @@ entities:
       - 15423
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 21655
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -8.5,-5.5
+      parent: 100
+    - type: DeviceNetwork
+      deviceLists:
+      - 21668
+    - type: AtmosPipeColor
+      color: '#990000FF'
 - proto: GasVentScrubberVox
   entities:
   - uid: 21105
@@ -85929,16 +86555,6 @@ entities:
     - type: Transform
       pos: -12.5,28.5
       parent: 100
-  - uid: 1282
-    components:
-    - type: Transform
-      pos: -32.5,34.5
-      parent: 100
-  - uid: 1283
-    components:
-    - type: Transform
-      pos: -32.5,35.5
-      parent: 100
   - uid: 1286
     components:
     - type: Transform
@@ -91736,6 +92352,91 @@ entities:
     - type: Transform
       pos: -56.5,18.5
       parent: 100
+  - uid: 21533
+    components:
+    - type: Transform
+      pos: 9.5,54.5
+      parent: 100
+  - uid: 21534
+    components:
+    - type: Transform
+      pos: 9.5,55.5
+      parent: 100
+  - uid: 21535
+    components:
+    - type: Transform
+      pos: 9.5,56.5
+      parent: 100
+  - uid: 21536
+    components:
+    - type: Transform
+      pos: 10.5,57.5
+      parent: 100
+  - uid: 21537
+    components:
+    - type: Transform
+      pos: 11.5,57.5
+      parent: 100
+  - uid: 21538
+    components:
+    - type: Transform
+      pos: 12.5,57.5
+      parent: 100
+  - uid: 21539
+    components:
+    - type: Transform
+      pos: 13.5,58.5
+      parent: 100
+  - uid: 21540
+    components:
+    - type: Transform
+      pos: 14.5,58.5
+      parent: 100
+  - uid: 21541
+    components:
+    - type: Transform
+      pos: 15.5,58.5
+      parent: 100
+  - uid: 21542
+    components:
+    - type: Transform
+      pos: 16.5,58.5
+      parent: 100
+  - uid: 21543
+    components:
+    - type: Transform
+      pos: 17.5,58.5
+      parent: 100
+  - uid: 21544
+    components:
+    - type: Transform
+      pos: 18.5,58.5
+      parent: 100
+  - uid: 21545
+    components:
+    - type: Transform
+      pos: 19.5,58.5
+      parent: 100
+  - uid: 21546
+    components:
+    - type: Transform
+      pos: 20.5,57.5
+      parent: 100
+  - uid: 21547
+    components:
+    - type: Transform
+      pos: 21.5,57.5
+      parent: 100
+  - uid: 21548
+    components:
+    - type: Transform
+      pos: 22.5,57.5
+      parent: 100
+  - uid: 21549
+    components:
+    - type: Transform
+      pos: 23.5,57.5
+      parent: 100
 - proto: GrilleBroken
   entities:
   - uid: 1065
@@ -92515,11 +93216,6 @@ entities:
       parent: 100
 - proto: HydroponicsToolMiniHoe
   entities:
-  - uid: 959
-    components:
-    - type: Transform
-      pos: -27.269173,33.072388
-      parent: 100
   - uid: 2817
     components:
     - type: Transform
@@ -92571,11 +93267,6 @@ entities:
     - type: Transform
       pos: -28.5,37.5
       parent: 100
-  - uid: 1235
-    components:
-    - type: Transform
-      pos: -31.5,34.5
-      parent: 100
   - uid: 1236
     components:
     - type: Transform
@@ -92589,13 +93280,21 @@ entities:
   - uid: 1256
     components:
     - type: Transform
+      anchored: False
       pos: -31.5,35.5
       parent: 100
+    - type: Physics
+      bodyType: Dynamic
   - uid: 1257
     components:
     - type: Transform
       pos: -31.5,37.5
       parent: 100
+  - uid: 4629
+    components:
+    - type: Transform
+      pos: -28.5,36.5
+      parent: 100
   - uid: 11874
     components:
     - type: Transform
@@ -93093,25 +93792,25 @@ entities:
       parent: 100
 - proto: LandMineExplosive
   entities:
-  - uid: 464
+  - uid: 512
     components:
     - type: Transform
-      pos: 11.5,52.5
+      pos: 14.5840645,57.51315
       parent: 100
-  - uid: 497
+  - uid: 517
     components:
     - type: Transform
-      pos: 15.5,55.5
+      pos: 21.959064,54.95065
       parent: 100
-  - uid: 512
+  - uid: 1220
     components:
     - type: Transform
-      pos: 17.5,55.5
+      pos: 18.490314,57.51315
       parent: 100
-  - uid: 517
+  - uid: 19805
     components:
     - type: Transform
-      pos: 21.5,52.5
+      pos: 10.9903145,55.01315
       parent: 100
 - proto: LandMineModular
   entities:
@@ -93127,6 +93826,11 @@ entities:
     - type: Transform
       pos: -27.915045,23.632677
       parent: 100
+  - uid: 21619
+    components:
+    - type: Transform
+      pos: -31.272928,29.58155
+      parent: 100
 - proto: LauncherCreamPie
   entities:
   - uid: 16713
@@ -93217,6 +93921,21 @@ entities:
       linkedPorts:
         14749:
         - Pressed: Trigger
+- proto: LockableButtonRobotics
+  entities:
+  - uid: 15346
+    components:
+    - type: Transform
+      pos: -15.5,-0.5
+      parent: 100
+    - type: DeviceLinkSource
+      linkedPorts:
+        13744:
+        - Pressed: Toggle
+        11647:
+        - Pressed: Toggle
+        10378:
+        - Pressed: Toggle
 - proto: LockerAtmosphericsFilledHardsuit
   entities:
   - uid: 15078
@@ -94684,6 +95403,11 @@ entities:
       intervalSeconds: 740
 - proto: Multitool
   entities:
+  - uid: 4658
+    components:
+    - type: Transform
+      pos: -4.78162,79.54993
+      parent: 100
   - uid: 12174
     components:
     - type: Transform
@@ -94694,11 +95418,6 @@ entities:
     - type: Transform
       pos: 28.222687,-16.239151
       parent: 100
-  - uid: 12455
-    components:
-    - type: Transform
-      pos: -15.741209,79.59234
-      parent: 100
   - uid: 12565
     components:
     - type: Transform
@@ -95852,6 +96571,13 @@ entities:
     - type: Transform
       pos: -59.5,-6.5
       parent: 100
+- proto: PlayerStationAi
+  entities:
+  - uid: 20375
+    components:
+    - type: Transform
+      pos: -71.5,76.5
+      parent: 100
 - proto: PlushieAtmosian
   entities:
   - uid: 20750
@@ -98221,6 +98947,18 @@ entities:
       rot: 3.141592653589793 rad
       pos: 5.5,-57.5
       parent: 100
+  - uid: 21593
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 14.5,57.5
+      parent: 100
+  - uid: 21596
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 18.5,57.5
+      parent: 100
 - proto: PoweredLightBlueInterior
   entities:
   - uid: 11428
@@ -100114,10 +100852,10 @@ entities:
     - type: Transform
       pos: -2.4364867,79.59787
       parent: 100
-  - uid: 12503
+  - uid: 4655
     components:
     - type: Transform
-      pos: -15.310652,79.49447
+      pos: -13.03162,77.64368
       parent: 100
   - uid: 12508
     components:
@@ -105027,6 +105765,31 @@ entities:
     - type: Transform
       pos: -17.5,-72.5
       parent: 100
+  - uid: 21550
+    components:
+    - type: Transform
+      pos: 9.5,57.5
+      parent: 100
+  - uid: 21551
+    components:
+    - type: Transform
+      pos: 12.5,58.5
+      parent: 100
+  - uid: 21552
+    components:
+    - type: Transform
+      pos: 20.5,58.5
+      parent: 100
+  - uid: 21553
+    components:
+    - type: Transform
+      pos: 19.5,57.5
+      parent: 100
+  - uid: 21554
+    components:
+    - type: Transform
+      pos: 13.5,57.5
+      parent: 100
 - proto: ReinforcedPlasmaWindow
   entities:
   - uid: 33
@@ -108931,23 +109694,6 @@ entities:
     - type: Transform
       pos: -56.5,55.5
       parent: 100
-- proto: ShuttersNormal
-  entities:
-  - uid: 5598
-    components:
-    - type: Transform
-      pos: -14.5,-0.5
-      parent: 100
-  - uid: 5600
-    components:
-    - type: Transform
-      pos: -13.5,-0.5
-      parent: 100
-  - uid: 13744
-    components:
-    - type: Transform
-      pos: -12.5,-0.5
-      parent: 100
 - proto: ShuttersNormalOpen
   entities:
   - uid: 2052
@@ -109465,19 +110211,6 @@ entities:
       linkedPorts:
         11338:
         - Pressed: Toggle
-  - uid: 11647
-    components:
-    - type: Transform
-      pos: -15.5,-0.5
-      parent: 100
-    - type: DeviceLinkSource
-      linkedPorts:
-        5598:
-        - Pressed: Toggle
-        5600:
-        - Pressed: Toggle
-        13744:
-        - Pressed: Toggle
   - uid: 11680
     components:
     - type: Transform
@@ -109675,6 +110408,11 @@ entities:
     - type: Transform
       pos: -34.5,62.5
       parent: 100
+  - uid: 21531
+    components:
+    - type: Transform
+      pos: 14.5,49.5
+      parent: 100
 - proto: SignAtmos
   entities:
   - uid: 6345
@@ -111919,11 +112657,6 @@ entities:
     - type: Transform
       pos: -28.5,34.5
       parent: 100
-  - uid: 16354
-    components:
-    - type: Transform
-      pos: -28.5,36.5
-      parent: 100
   - uid: 16355
     components:
     - type: Transform
@@ -112093,6 +112826,12 @@ entities:
     - type: Transform
       pos: 10.5,9.5
       parent: 100
+  - uid: 21626
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -7.5,-1.5
+      parent: 100
 - proto: SpawnPointCourier
   entities:
   - uid: 16733
@@ -112618,6 +113357,23 @@ entities:
     - type: Transform
       pos: -10.5,56.5
       parent: 100
+- proto: SpawnPointRoboticist
+  entities:
+  - uid: 21623
+    components:
+    - type: Transform
+      pos: -12.5,-2.5
+      parent: 100
+  - uid: 21624
+    components:
+    - type: Transform
+      pos: -14.5,-2.5
+      parent: 100
+  - uid: 21625
+    components:
+    - type: Transform
+      pos: -6.5,-1.5
+      parent: 100
 - proto: SpawnPointSalvageSpecialist
   entities:
   - uid: 9595
@@ -113445,7 +114201,7 @@ entities:
     - type: Transform
       pos: -12.5,-17.5
       parent: 100
-- proto: SuitStorageSec
+- proto: SuitStorageSecDeltaV
   entities:
   - uid: 518
     components:
@@ -113566,7 +114322,7 @@ entities:
       setupAvailableNetworks:
       - SurveillanceCameraCommand
       nameSet: True
-      id: ai satellite
+      id: AI Satellite
   - uid: 16625
     components:
     - type: Transform
@@ -113599,6 +114355,82 @@ entities:
       - SurveillanceCameraCommand
       nameSet: True
       id: Circuit Board Room
+  - uid: 21606
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,24.5
+      parent: 100
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraCommand
+      nameSet: True
+      id: Chief Justice
+  - uid: 21611
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -55.5,-46.5
+      parent: 100
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraCommand
+      nameSet: True
+      id: Evac Lounge
+  - uid: 21614
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -57.5,76.5
+      parent: 100
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraCommand
+      nameSet: True
+      id: AI External Access
+  - uid: 21615
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -52.5,56.5
+      parent: 100
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraCommand
+      nameSet: True
+      id: AI Access
+  - uid: 21652
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -21.5,74.5
+      parent: 100
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraCommand
+      nameSet: True
+      id: Captain's Quarters
+  - uid: 21670
+    components:
+    - type: Transform
+      pos: -71.5,73.5
+      parent: 100
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraCommand
+      nameSet: True
+      id: AI Core South
+  - uid: 21671
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -71.5,79.5
+      parent: 100
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraCommand
+      nameSet: True
+      id: AI Core North
 - proto: SurveillanceCameraEngineering
   entities:
   - uid: 2874
@@ -113702,6 +114534,48 @@ entities:
       - SurveillanceCameraEngineering
       nameSet: True
       id: Engineering West Entrance
+  - uid: 21648
+    components:
+    - type: Transform
+      pos: 9.5,-47.5
+      parent: 100
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: Locker Room
+  - uid: 21649
+    components:
+    - type: Transform
+      pos: -6.5,-49.5
+      parent: 100
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: Atmos Locker Room
+  - uid: 21650
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -12.5,-62.5
+      parent: 100
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: TEG
+  - uid: 21672
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -66.5,73.5
+      parent: 100
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: AI Satellite Power
 - proto: SurveillanceCameraGeneral
   entities:
   - uid: 177
@@ -113942,6 +114816,81 @@ entities:
       - SurveillanceCameraGeneral
       nameSet: True
       id: Disposals
+  - uid: 21607
+    components:
+    - type: Transform
+      pos: 21.5,17.5
+      parent: 100
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: EVA Hall
+  - uid: 21608
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 17.5,-8.5
+      parent: 100
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Public Garden
+  - uid: 21609
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 33.5,-3.5
+      parent: 100
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Bee Shuttle
+  - uid: 21612
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -15.5,15.5
+      parent: 100
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Central Hall
+  - uid: 21613
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -21.5,28.5
+      parent: 100
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Boxing Ring
+  - uid: 21647
+    components:
+    - type: Transform
+      pos: -7.5,1.5
+      parent: 100
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Epi Hallway
+  - uid: 21651
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,22.5
+      parent: 100
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Main Hall / "rouny containment"
 - proto: SurveillanceCameraMedical
   entities:
   - uid: 18741
@@ -114053,6 +115002,28 @@ entities:
       - SurveillanceCameraMedical
       nameSet: True
       id: Medical
+  - uid: 21610
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -20.5,-32.5
+      parent: 100
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraMedical
+      nameSet: True
+      id: Engi Outpost
+  - uid: 21616
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -21.5,50.5
+      parent: 100
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraMedical
+      nameSet: True
+      id: Cryogenics
 - proto: SurveillanceCameraRouterCommand
   entities:
   - uid: 3059
@@ -114293,6 +115264,38 @@ entities:
       - SurveillanceCameraSecurity
       nameSet: True
       id: Detective's Room
+  - uid: 21603
+    components:
+    - type: Transform
+      pos: 9.5,31.5
+      parent: 100
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: Security
+  - uid: 21604
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 17.5,43.5
+      parent: 100
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: Security Lockers
+  - uid: 21605
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 19.5,39.5
+      parent: 100
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: Perma Entrance
 - proto: SurveillanceCameraService
   entities:
   - uid: 14872
@@ -114348,6 +115351,17 @@ entities:
       - SurveillanceCameraService
       nameSet: True
       id: Arcade
+  - uid: 21618
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -27.5,35.5
+      parent: 100
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraService
+      nameSet: True
+      id: Botany
 - proto: SurveillanceCameraSupply
   entities:
   - uid: 6128
@@ -114413,6 +115427,17 @@ entities:
       - SurveillanceCameraSupply
       nameSet: True
       id: LO's Room
+  - uid: 21617
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -58.5,-4.5
+      parent: 100
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSupply
+      nameSet: True
+      id: Cargo Shuttle Dock
 - proto: SurveillanceWirelessCameraAnchoredEntertainment
   entities:
   - uid: 10169
@@ -115670,11 +116695,6 @@ entities:
     - type: Transform
       pos: -31.5,22.5
       parent: 100
-  - uid: 1220
-    components:
-    - type: Transform
-      pos: -30.5,29.5
-      parent: 100
   - uid: 1221
     components:
     - type: Transform
@@ -115993,11 +117013,6 @@ entities:
     - type: Transform
       pos: -17.5,76.5
       parent: 100
-  - uid: 4629
-    components:
-    - type: Transform
-      pos: -15.5,79.5
-      parent: 100
   - uid: 4847
     components:
     - type: Transform
@@ -116078,6 +117093,12 @@ entities:
     - type: Transform
       pos: -2.5,79.5
       parent: 100
+  - uid: 12503
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -32.5,35.5
+      parent: 100
   - uid: 12686
     components:
     - type: Transform
@@ -116139,6 +117160,12 @@ entities:
     - type: Transform
       pos: -20.5,-29.5
       parent: 100
+  - uid: 16354
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -32.5,34.5
+      parent: 100
   - uid: 17746
     components:
     - type: Transform
@@ -117670,13 +118697,6 @@ entities:
     - type: Transform
       pos: -41.57066,46.601814
       parent: 100
-- proto: ToyAi
-  entities:
-  - uid: 20171
-    components:
-    - type: Transform
-      pos: -71.51892,76.56057
-      parent: 100
 - proto: ToyFigurineHamlet
   entities:
   - uid: 2941
@@ -134133,6 +135153,22 @@ entities:
       parent: 100
 - proto: WindoorHydroponicsLocked
   entities:
+  - uid: 1282
+    components:
+    - type: MetaData
+      name: Botany
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -32.5,35.5
+      parent: 100
+  - uid: 1283
+    components:
+    - type: MetaData
+      name: Botany
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -32.5,34.5
+      parent: 100
   - uid: 4889
     components:
     - type: MetaData
@@ -134142,6 +135178,16 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -26.5,36.5
       parent: 100
+  - uid: 21621
+    components:
+    - type: Transform
+      pos: -31.5,29.5
+      parent: 100
+  - uid: 21622
+    components:
+    - type: Transform
+      pos: -30.5,29.5
+      parent: 100
 - proto: WindoorMailLocked
   entities:
   - uid: 16931
@@ -134734,21 +135780,11 @@ entities:
     - type: Transform
       pos: 6.5,-0.5
       parent: 100
-  - uid: 4655
-    components:
-    - type: Transform
-      pos: -32.5,34.5
-      parent: 100
   - uid: 4656
     components:
     - type: Transform
       pos: -32.5,36.5
       parent: 100
-  - uid: 4658
-    components:
-    - type: Transform
-      pos: -32.5,35.5
-      parent: 100
   - uid: 4659
     components:
     - type: Transform
diff --git a/Resources/Maps/shoukou.yml b/Resources/Maps/shoukou.yml
index 4709d61ba44..7a89d98d976 100644
--- a/Resources/Maps/shoukou.yml
+++ b/Resources/Maps/shoukou.yml
@@ -104,7 +104,7 @@ entities:
           version: 6
         0,0:
           ind: 0,0
-          tiles: aQAAAAAAMAAAAAACaQAAAAAAaQAAAAAAMAAAAAACXgAAAAAAbQAAAAAAYwAAAAABYwAAAAABYwAAAAADYwAAAAABYwAAAAABYwAAAAADYwAAAAAAbAAAAAAAUAAAAAAAXgAAAAABXgAAAAAAXgAAAAABXgAAAAADXgAAAAAAXgAAAAAAUAAAAAAAawAAAAAAawAAAAACawAAAAABawAAAAADawAAAAACZgAAAAAAYwAAAAABbAAAAAACfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAXgAAAAACXgAAAAAAXgAAAAAAXgAAAAACbAAAAAADYwAAAAADbAAAAAABfwAAAAAAewAAAAACewAAAAADewAAAAABewAAAAACewAAAAADewAAAAADfwAAAAAAXgAAAAABXgAAAAACXgAAAAACXgAAAAAAXgAAAAABbAAAAAADYwAAAAAAbAAAAAADUAAAAAAAewAAAAACewAAAAAAewAAAAADewAAAAADewAAAAACewAAAAACfwAAAAAAUAAAAAAAUAAAAAAAbQAAAAAAUAAAAAAAfwAAAAAAbAAAAAABYwAAAAADbAAAAAADbQAAAAAAewAAAAACewAAAAABewAAAAAAewAAAAABewAAAAABewAAAAADfwAAAAAAewAAAAABewAAAAAAewAAAAAAewAAAAADfwAAAAAAbAAAAAACYwAAAAACbAAAAAADUAAAAAAAewAAAAADewAAAAAAewAAAAABewAAAAAAewAAAAADewAAAAADfwAAAAAAewAAAAADewAAAAABewAAAAABewAAAAADUAAAAAAAbAAAAAADYwAAAAAAbAAAAAABfwAAAAAAewAAAAADewAAAAABewAAAAADewAAAAABewAAAAAAewAAAAAAfwAAAAAAewAAAAADewAAAAADewAAAAADewAAAAACUAAAAAAAbAAAAAACYwAAAAADbAAAAAABfwAAAAAAewAAAAAAewAAAAACewAAAAACewAAAAABewAAAAACewAAAAADfwAAAAAAewAAAAACewAAAAAAewAAAAADewAAAAADUAAAAAAAbAAAAAADYwAAAAAAbAAAAAADbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbAAAAAAAYwAAAAAAbAAAAAADfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbAAAAAAAYwAAAAACbAAAAAADfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAbAAAAAABYwAAAAADbAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAbQAAAAAAUAAAAAAAfwAAAAAATwAAAAAAXgAAAAADTwAAAAACfwAAAAAAXgAAAAADXgAAAAAAXgAAAAADXgAAAAADTgAAAAACXgAAAAACXgAAAAABXgAAAAACXgAAAAADXgAAAAABXgAAAAABfwAAAAAATwAAAAABTwAAAAAATwAAAAAAbQAAAAAAXgAAAAABXgAAAAADXgAAAAADXgAAAAACXgAAAAABXgAAAAACXgAAAAACXgAAAAAAXgAAAAAAXgAAAAADXgAAAAADbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAADIQAAAAAAIQAAAAABIQAAAAADIQAAAAABIQAAAAABIQAAAAAAIQAAAAACIQAAAAADIQAAAAAAXgAAAAADUAAAAAAA
+          tiles: aQAAAAAAMAAAAAACaQAAAAAAaQAAAAAAMAAAAAACXgAAAAAAbQAAAAAAYwAAAAABYwAAAAABYwAAAAADYwAAAAABYwAAAAABYwAAAAADYwAAAAAAbAAAAAAAUAAAAAAAXgAAAAABXgAAAAAAXgAAAAABXgAAAAADXgAAAAAAXgAAAAAAUAAAAAAAawAAAAAAawAAAAACawAAAAABawAAAAADawAAAAACZgAAAAAAYwAAAAABbAAAAAACfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAXgAAAAACXgAAAAAAXgAAAAAAXgAAAAACbAAAAAADYwAAAAADbAAAAAABfwAAAAAAewAAAAACewAAAAADewAAAAABewAAAAACewAAAAADewAAAAADfwAAAAAAXgAAAAABXgAAAAACXgAAAAACXgAAAAAAXgAAAAABbAAAAAADYwAAAAAAbAAAAAADUAAAAAAAewAAAAACewAAAAAAewAAAAADewAAAAADewAAAAACewAAAAACfwAAAAAAUAAAAAAAUAAAAAAAbQAAAAAAUAAAAAAAfwAAAAAAbAAAAAABYwAAAAADbAAAAAADbQAAAAAAewAAAAACewAAAAABewAAAAAAewAAAAABewAAAAABewAAAAADfwAAAAAAewAAAAABewAAAAAAewAAAAAAewAAAAADfwAAAAAAbAAAAAACYwAAAAACbAAAAAADUAAAAAAAewAAAAADewAAAAAAewAAAAABewAAAAAAewAAAAADewAAAAADfwAAAAAAewAAAAADewAAAAABewAAAAABewAAAAADUAAAAAAAbAAAAAADYwAAAAAAbAAAAAABfwAAAAAAewAAAAADewAAAAABewAAAAADewAAAAABewAAAAAAewAAAAAAfwAAAAAAewAAAAADewAAAAADewAAAAADewAAAAACUAAAAAAAbAAAAAACYwAAAAADbAAAAAABfwAAAAAAewAAAAAAewAAAAACewAAAAACewAAAAABewAAAAACewAAAAADfwAAAAAAewAAAAACewAAAAAAewAAAAADewAAAAADUAAAAAAAbAAAAAADYwAAAAAAbAAAAAADbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbAAAAAAAYwAAAAAAbAAAAAADfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbAAAAAAAYwAAAAACbAAAAAADfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAbAAAAAABYwAAAAADbAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAbQAAAAAAUAAAAAAAfwAAAAAATwAAAAAAXgAAAAADTwAAAAACfwAAAAAAXgAAAAADXgAAAAAAXgAAAAADXgAAAAADTgAAAAACXgAAAAACXgAAAAABXgAAAAACXgAAAAADXgAAAAABXgAAAAABfwAAAAAATwAAAAABTwAAAAAATwAAAAAAbQAAAAAAXgAAAAABXgAAAAADXgAAAAADXgAAAAACXgAAAAABXgAAAAACXgAAAAACXgAAAAAAXgAAAAAAXgAAAAADXgAAAAADbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAADIQAAAAAAIQAAAAABIQAAAAADIQAAAAABIQAAAAABIQAAAAAAIQAAAAACIQAAAAADIQAAAAAAXgAAAAADUAAAAAAA
           version: 6
         0,-1:
           ind: 0,-1
@@ -116,7 +116,7 @@ entities:
           version: 6
         -2,-1:
           ind: -2,-1
-          tiles: fwAAAAAAewAAAAAAMAAAAAAAIAAAAAAAJwAAAAAAIAAAAAAAMAAAAAABewAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAewAAAAAAewAAAAAAfwAAAAAAewAAAAAAewAAAAABewAAAAABewAAAAABewAAAAADewAAAAADewAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAbgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAewAAAAAAewAAAAAAewAAAAADewAAAAADewAAAAAAewAAAAAAewAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAbgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAXgAAAAAAXgAAAAAAXgAAAAADXgAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAaQAAAAADaQAAAAABaQAAAAADXgAAAAADfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAPQAAAAAAPQAAAAAAUAAAAAAAfwAAAAAAXgAAAAAAXgAAAAABXgAAAAABXgAAAAAAXgAAAAAAXgAAAAACXgAAAAACXgAAAAABXgAAAAABXgAAAAAAXgAAAAABewAAAAACewAAAAABewAAAAADewAAAAADXgAAAAABXgAAAAADXgAAAAADXgAAAAADXgAAAAADXgAAAAACXgAAAAACMAAAAAACaQAAAAABaQAAAAABMAAAAAAAaQAAAAACaQAAAAACMAAAAAADaQAAAAADaQAAAAADMAAAAAAD
+          tiles: fwAAAAAAewAAAAAAMAAAAAAAIAAAAAAAJwAAAAAAIAAAAAAAMAAAAAABewAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAewAAAAAAewAAAAAAbQAAAAAAewAAAAAAewAAAAABewAAAAABewAAAAABewAAAAADewAAAAADewAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAbgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAewAAAAAAewAAAAAAewAAAAADewAAAAADewAAAAAAewAAAAAAewAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAbgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAXgAAAAAAXgAAAAAAXgAAAAADXgAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAaQAAAAADaQAAAAABaQAAAAADXgAAAAADfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAPQAAAAAAPQAAAAAAUAAAAAAAfwAAAAAAXgAAAAAAXgAAAAABXgAAAAABXgAAAAAAXgAAAAAAXgAAAAACXgAAAAACXgAAAAABXgAAAAABXgAAAAAAXgAAAAABewAAAAACewAAAAABewAAAAADewAAAAADXgAAAAABXgAAAAADXgAAAAADXgAAAAADXgAAAAADXgAAAAACXgAAAAACMAAAAAACaQAAAAABaQAAAAABMAAAAAAAaQAAAAACaQAAAAACMAAAAAADaQAAAAADaQAAAAADMAAAAAAD
           version: 6
         0,-2:
           ind: 0,-2
@@ -128,7 +128,7 @@ entities:
           version: 6
         -2,-2:
           ind: -2,-2
-          tiles: QwAAAAAAfwAAAAAAIAAAAAABIAAAAAABUAAAAAAAewAAAAAAewAAAAAAewAAAAACfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAADIAAAAAABUAAAAAAAewAAAAAAewAAAAADewAAAAADfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAACfwAAAAAAIAAAAAACIAAAAAAAfwAAAAAAewAAAAADewAAAAACewAAAAABfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAQwAAAAAAIAAAAAAAQwAAAAAAQwAAAAAAfwAAAAAAIAAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAIAAAAAAAIAAAAAADUAAAAAAAYwAAAAACXgAAAAAAXgAAAAABYwAAAAAAIAAAAAADIAAAAAACIAAAAAABIAAAAAAAbQAAAAAAIAAAAAABIAAAAAAAIAAAAAAAIAAAAAACIAAAAAAAIAAAAAAAbQAAAAAAYwAAAAACXgAAAAAAXgAAAAADYwAAAAABQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfwAAAAAAQwAAAAAAIAAAAAACQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAUAAAAAAAYwAAAAACXgAAAAABXgAAAAABYwAAAAACfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAYwAAAAACXgAAAAAAXgAAAAADYwAAAAACewAAAAAAewAAAAABewAAAAABewAAAAADewAAAAADawAAAAADawAAAAABawAAAAABawAAAAABawAAAAADawAAAAAAawAAAAAAawAAAAADawAAAAADawAAAAADawAAAAACYwAAAAAAYwAAAAABYwAAAAABYwAAAAACYwAAAAAAYwAAAAAAYwAAAAABYwAAAAABYwAAAAADYwAAAAADYwAAAAADYwAAAAABYwAAAAADYwAAAAACYwAAAAABawAAAAAAawAAAAADawAAAAACawAAAAAAawAAAAABawAAAAADawAAAAADawAAAAADawAAAAABawAAAAAAawAAAAACawAAAAABawAAAAAAawAAAAADawAAAAACawAAAAADawAAAAACfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAawAAAAAAawAAAAADfwAAAAAAUAAAAAAAbQAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAMgAAAAAAMgAAAAAAIAAAAAAAJwAAAAAAIAAAAAAAMgAAAAAAMgAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAewAAAAACewAAAAABewAAAAABewAAAAACfwAAAAAAewAAAAAAMAAAAAAAKAAAAAAAIQAAAAAAKAAAAAAAMAAAAAABewAAAAACfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAewAAAAABewAAAAABewAAAAACewAAAAACfwAAAAAAewAAAAAAMAAAAAAAKAAAAAAAIQAAAAAAKAAAAAAAMAAAAAABewAAAAABfwAAAAAAbQAAAAAAfwAAAAAAbQAAAAAAewAAAAAAewAAAAABewAAAAABewAAAAADfwAAAAAAewAAAAAAMAAAAAAAKAAAAAAAIQAAAAAAKAAAAAAAMAAAAAADewAAAAACfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAewAAAAADewAAAAADewAAAAABewAAAAAA
+          tiles: QwAAAAAAfwAAAAAAIAAAAAABIAAAAAABUAAAAAAAewAAAAAAewAAAAAAewAAAAACfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAADIAAAAAABUAAAAAAAewAAAAAAewAAAAADewAAAAADfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAACfwAAAAAAIAAAAAACIAAAAAAAfwAAAAAAewAAAAADewAAAAACewAAAAABfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAQwAAAAAAIAAAAAAAQwAAAAAAQwAAAAAAfwAAAAAAIAAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAIAAAAAAAIAAAAAADUAAAAAAAYwAAAAACXgAAAAAAXgAAAAABYwAAAAAAIAAAAAADIAAAAAACIAAAAAABIAAAAAAAbQAAAAAAIAAAAAABIAAAAAAAIAAAAAAAIAAAAAACIAAAAAAAIAAAAAAAbQAAAAAAYwAAAAACXgAAAAAAXgAAAAADYwAAAAABQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfwAAAAAAQwAAAAAAIAAAAAACQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAUAAAAAAAYwAAAAACXgAAAAABXgAAAAABYwAAAAACfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAYwAAAAACXgAAAAAAXgAAAAADYwAAAAACewAAAAAAewAAAAABewAAAAABewAAAAADewAAAAADawAAAAADawAAAAABawAAAAABawAAAAABawAAAAADawAAAAAAawAAAAAAawAAAAADawAAAAADawAAAAADawAAAAACYwAAAAAAYwAAAAABYwAAAAABYwAAAAACYwAAAAAAYwAAAAAAYwAAAAABYwAAAAABYwAAAAADYwAAAAADYwAAAAADYwAAAAABYwAAAAADYwAAAAACYwAAAAABawAAAAAAawAAAAADawAAAAACawAAAAAAawAAAAABawAAAAADawAAAAADawAAAAADawAAAAABawAAAAAAawAAAAACawAAAAABawAAAAAAawAAAAADawAAAAACawAAAAADawAAAAACfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAawAAAAAAawAAAAADfwAAAAAAUAAAAAAAbQAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAMgAAAAAAMgAAAAAAIAAAAAAAJwAAAAAAIAAAAAAAMgAAAAAAMgAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAewAAAAACewAAAAABewAAAAABewAAAAACbQAAAAAAewAAAAAAMAAAAAAAKAAAAAAAIQAAAAAAKAAAAAAAMAAAAAABewAAAAACfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAewAAAAABewAAAAABewAAAAACewAAAAACfwAAAAAAewAAAAAAMAAAAAAAKAAAAAAAIQAAAAAAKAAAAAAAMAAAAAABewAAAAABfwAAAAAAbQAAAAAAfwAAAAAAbQAAAAAAewAAAAAAewAAAAABewAAAAABewAAAAADfwAAAAAAewAAAAAAMAAAAAAAKAAAAAAAIQAAAAAAKAAAAAAAMAAAAAADewAAAAACfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAewAAAAADewAAAAADewAAAAABewAAAAAA
           version: 6
         -3,0:
           ind: -3,0
@@ -140,7 +140,7 @@ entities:
           version: 6
         -3,-2:
           ind: -3,-2
-          tiles: TgAAAAAATgAAAAADfwAAAAAATgAAAAAATgAAAAABTgAAAAADfwAAAAAAbwAAAAADfwAAAAAAfwAAAAAAbwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAQwAAAAAATgAAAAABTgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAATgAAAAACTgAAAAABTgAAAAAATgAAAAACTgAAAAADTgAAAAABfwAAAAAAbwAAAAADfwAAAAAAbwAAAAAAbwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAADIAAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAIAAAAAACIAAAAAABIAAAAAAAIAAAAAADUAAAAAAAIAAAAAABIAAAAAACIAAAAAABIAAAAAABIAAAAAABIAAAAAABIAAAAAABIAAAAAAAIAAAAAADfwAAAAAAQwAAAAAATwAAAAACTwAAAAABTwAAAAADIAAAAAAAbQAAAAAAIAAAAAACTgAAAAACXgAAAAABXgAAAAACXgAAAAAAXgAAAAADXgAAAAABXgAAAAADXgAAAAADbQAAAAAAIAAAAAABTwAAAAACTwAAAAABTwAAAAABIAAAAAABbQAAAAAAKQAAAAACXgAAAAACXgAAAAABXgAAAAAAXgAAAAADXgAAAAACXgAAAAAAXgAAAAAAXgAAAAADfwAAAAAAQwAAAAAAIAAAAAADIAAAAAACIAAAAAACIAAAAAACfwAAAAAAIAAAAAABXgAAAAABfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAZgAAAAACawAAAAABawAAAAACawAAAAACawAAAAADawAAAAACawAAAAACewAAAAABfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbAAAAAABYwAAAAAAYwAAAAABYwAAAAABYwAAAAAAYwAAAAABYwAAAAACYwAAAAADfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAbAAAAAADYwAAAAAAZgAAAAADawAAAAACawAAAAAAawAAAAAAawAAAAABawAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbAAAAAAAYwAAAAAAbAAAAAABfwAAAAAAbQAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAUAAAAAAAewAAAAACewAAAAACYwAAAAAAbAAAAAABUAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAIAAAAAAAIAAAAAAAIAAAAAADIAAAAAAAIAAAAAAAIAAAAAAAUAAAAAAAewAAAAABewAAAAACYwAAAAAAbAAAAAAAUAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATwAAAAACIAAAAAADIAAAAAAAIAAAAAAAMAAAAAAAIAAAAAAAfwAAAAAAewAAAAADewAAAAABYwAAAAAAbAAAAAAAfwAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAIAAAAAAAMAAAAAAAIAAAAAACMAAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAewAAAAAAewAAAAACYwAAAAAAbAAAAAACfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAA
+          tiles: TgAAAAAATgAAAAADfwAAAAAATgAAAAAATgAAAAABTgAAAAADfwAAAAAAbwAAAAADfwAAAAAAfwAAAAAAbwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAQwAAAAAATgAAAAABTgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAATgAAAAACTgAAAAABTgAAAAAATgAAAAACTgAAAAADTgAAAAABfwAAAAAAbwAAAAADfwAAAAAAbwAAAAAAbwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAADIAAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAIAAAAAACIAAAAAABIAAAAAAAIAAAAAADUAAAAAAAIAAAAAABIAAAAAACIAAAAAABIAAAAAABIAAAAAABIAAAAAABIAAAAAABIAAAAAAAIAAAAAADfwAAAAAAQwAAAAAATwAAAAACTwAAAAABTwAAAAADIAAAAAAAbQAAAAAAIAAAAAACTgAAAAACXgAAAAABXgAAAAACXgAAAAAAXgAAAAADXgAAAAABXgAAAAADXgAAAAADbQAAAAAAIAAAAAABTwAAAAACTwAAAAABTwAAAAABIAAAAAABbQAAAAAAKQAAAAACXgAAAAACXgAAAAABXgAAAAAAXgAAAAADXgAAAAACXgAAAAAAXgAAAAAAXgAAAAADfwAAAAAAQwAAAAAAIAAAAAADIAAAAAACIAAAAAACIAAAAAACfwAAAAAAIAAAAAABXgAAAAABfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAZgAAAAACawAAAAABawAAAAACawAAAAACawAAAAADawAAAAACawAAAAACewAAAAABfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbAAAAAABYwAAAAAAYwAAAAABYwAAAAABYwAAAAAAYwAAAAABYwAAAAACYwAAAAADfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAbAAAAAADYwAAAAAAZgAAAAADawAAAAACawAAAAAAawAAAAAAawAAAAABawAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbAAAAAAAYwAAAAAAbAAAAAABfwAAAAAAbQAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAUAAAAAAAewAAAAACewAAAAACYwAAAAAAbAAAAAABUAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAIAAAAAAAIAAAAAAAIAAAAAADIAAAAAAAIAAAAAAAIAAAAAAAUAAAAAAAewAAAAABewAAAAACYwAAAAAAbAAAAAAAUAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATwAAAAACIAAAAAADIAAAAAAAIAAAAAAAMAAAAAAAIAAAAAAAfwAAAAAAewAAAAADewAAAAABYwAAAAAAbAAAAAAAfwAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAIAAAAAAAMAAAAAAAIAAAAAACMAAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAewAAAAAAewAAAAACYwAAAAAAbAAAAAACfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAA
           version: 6
         -1,-3:
           ind: -1,-3
@@ -702,25 +702,21 @@ entities:
             id: BrickTileSteelInnerNe
           decals:
             287: -49,-28
-            380: -39,-51
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelInnerNw
           decals:
             286: -45,-28
-            379: -37,-51
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelInnerSe
           decals:
             284: -49,-25
-            378: -39,-49
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelInnerSw
           decals:
             285: -45,-25
-            377: -37,-49
         - node:
             color: '#FF0000FF'
             id: BrickTileSteelLineE
@@ -749,7 +745,6 @@ entities:
             106: 41,6
             274: -49,-27
             275: -49,-26
-            373: -39,-50
             452: 13,16
             619: 31,-4
             620: 31,-3
@@ -770,7 +765,6 @@ entities:
             308: -40,-3
             309: -39,-3
             310: -38,-3
-            374: -38,-51
             454: 6,17
             455: 7,17
             456: 8,17
@@ -797,7 +791,6 @@ entities:
             281: -48,-25
             282: -47,-25
             283: -46,-25
-            376: -38,-49
             463: 6,15
             464: 7,15
             465: 8,15
@@ -838,7 +831,6 @@ entities:
             99: -17,-27
             279: -45,-27
             280: -45,-26
-            375: -37,-50
             453: 5,16
             636: 23,-3
             637: 23,-2
@@ -1265,6 +1257,7 @@ entities:
             984: -49,2
             1354: -49,-7
             1398: 69,-24
+            1442: -21,-40
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -1658,6 +1651,11 @@ entities:
           decals:
             126: 11,-14
             127: 11,-17
+        - node:
+            color: '#334E6DC8'
+            id: FullTileOverlayGreyscale
+          decals:
+            1418: -37,-52
         - node:
             color: '#52B4E996'
             id: FullTileOverlayGreyscale
@@ -1667,6 +1665,26 @@ entities:
             402: 4,-35
             403: 5,-35
             438: 1,-37
+        - node:
+            color: '#9FED5896'
+            id: FullTileOverlayGreyscale
+          decals:
+            1423: -39,-48
+        - node:
+            color: '#D381C996'
+            id: FullTileOverlayGreyscale
+          decals:
+            1422: -37,-48
+        - node:
+            color: '#DE3A3A96'
+            id: FullTileOverlayGreyscale
+          decals:
+            1420: -39,-52
+        - node:
+            color: '#EFB34196'
+            id: FullTileOverlayGreyscale
+          decals:
+            1419: -38,-48
         - node:
             color: '#FFFFFFFF'
             id: Grassd2
@@ -1792,6 +1810,12 @@ entities:
             440: 9,-34
             441: 9,-33
             442: 9,-32
+            1425: -37,-48
+        - node:
+            color: '#6B2833DD'
+            id: HalfTileOverlayGreyscale270
+          decals:
+            1426: -39,-52
         - node:
             color: '#724276FF'
             id: HalfTileOverlayGreyscale270
@@ -1814,6 +1838,11 @@ entities:
             725: 29,-2
             727: 29,-1
             735: 28,-4
+        - node:
+            color: '#A4610696'
+            id: HalfTileOverlayGreyscale270
+          decals:
+            1424: -38,-48
         - node:
             color: '#BE6BC3A6'
             id: HalfTileOverlayGreyscale270
@@ -1904,6 +1933,31 @@ entities:
             652: 17,-19
             653: 17,-20
             654: 18,-20
+        - node:
+            color: '#9D9D97FF'
+            id: MiniTileInnerOverlayNE
+          decals:
+            1440: -39,-51
+        - node:
+            color: '#9D9D97FF'
+            id: MiniTileInnerOverlayNW
+          decals:
+            1439: -37,-51
+        - node:
+            color: '#9D9D97FF'
+            id: MiniTileInnerOverlaySE
+          decals:
+            1437: -39,-49
+        - node:
+            color: '#9D9D97FF'
+            id: MiniTileInnerOverlaySW
+          decals:
+            1438: -37,-49
+        - node:
+            color: '#9D9D97FF'
+            id: MiniTileLineOverlayE
+          decals:
+            1436: -39,-50
         - node:
             color: '#951710FF'
             id: MiniTileLineOverlayN
@@ -1911,6 +1965,11 @@ entities:
             644: 29,-7
             645: 32,-7
             646: 33,-7
+        - node:
+            color: '#9D9D97FF'
+            id: MiniTileLineOverlayN
+          decals:
+            1435: -38,-51
         - node:
             color: '#951710FF'
             id: MiniTileLineOverlayS
@@ -1920,6 +1979,11 @@ entities:
             780: 29,-10
             788: 30,-10
             789: 31,-10
+        - node:
+            color: '#9D9D97FF'
+            id: MiniTileLineOverlayS
+          decals:
+            1433: -38,-49
         - node:
             color: '#951710FF'
             id: MiniTileLineOverlayW
@@ -1928,6 +1992,11 @@ entities:
             642: 29,-8
             643: 29,-10
             647: 29,-7
+        - node:
+            color: '#9D9D97FF'
+            id: MiniTileLineOverlayW
+          decals:
+            1434: -37,-50
         - node:
             color: '#951710FF'
             id: MiniTileWhiteLineE
@@ -2315,9 +2384,6 @@ entities:
             73: -46,-34
             74: -47,-34
             299: -36,4
-            367: -37,-48
-            368: -38,-48
-            369: -39,-48
             512: -46,-18
             1222: -58,-46
             1328: 39,-35
@@ -2326,6 +2392,9 @@ entities:
             1394: 71,-26
             1395: 72,-26
             1403: 59,-48
+            1430: -39,-51
+            1431: -38,-51
+            1432: -37,-51
         - node:
             color: '#FFFFFFFF'
             id: WarnLineS
@@ -2343,9 +2412,6 @@ entities:
             color: '#FFFFFFFF'
             id: WarnLineW
           decals:
-            370: -37,-52
-            371: -38,-52
-            372: -39,-52
             511: -46,-20
             989: -51,-1
             990: -49,-1
@@ -2357,6 +2423,9 @@ entities:
             1387: 70,-22
             1396: 71,-22
             1397: 72,-22
+            1427: -39,-49
+            1428: -38,-49
+            1429: -37,-49
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinCornerNe
@@ -3552,7 +3621,8 @@ entities:
           8,-1:
             0: 58111
           4,4:
-            0: 30479
+            0: 26383
+            3: 4096
           5,1:
             0: 58589
           5,2:
@@ -3571,7 +3641,8 @@ entities:
             0: 15
             2: 12032
           7,1:
-            0: 61695
+            0: 61567
+            8: 128
           7,2:
             0: 47359
           7,3:
@@ -4078,6 +4149,21 @@ entities:
           - 0
           - 0
           - 0
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 21.6852
+          - 81.57766
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         chunkSize: 4
     - type: OccluderTree
     - type: Shuttle
@@ -5108,6 +5194,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 44.5,-20.5
       parent: 2
+  - uid: 290
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 38.5,2.5
+      parent: 2
 - proto: AirlockArmoryGlassLocked
   entities:
   - uid: 75
@@ -5232,10 +5324,11 @@ entities:
       parent: 2
 - proto: AirlockChapelLocked
   entities:
-  - uid: 93
+  - uid: 15739
     components:
+    - type: MetaData
+      name: chapel airlock
     - type: Transform
-      rot: 3.141592653589793 rad
       pos: -31.5,-14.5
       parent: 2
 - proto: AirlockChemistryLocked
@@ -5336,7 +5429,12 @@ entities:
       parent: 2
 - proto: AirlockCorpsmanGlassLocked
   entities:
-  - uid: 335
+  - uid: 93
+    components:
+    - type: Transform
+      pos: 20.5,-0.5
+      parent: 2
+  - uid: 304
     components:
     - type: Transform
       pos: 15.5,-0.5
@@ -5793,18 +5891,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 6.5,20.5
       parent: 2
-  - uid: 15557
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -28.5,-66.5
-      parent: 2
-  - uid: 15558
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -28.5,-68.5
-      parent: 2
 - proto: AirlockExternalGlassShuttleShipyard
   entities:
   - uid: 173
@@ -5817,6 +5903,18 @@ entities:
     - type: Transform
       pos: 58.5,-50.5
       parent: 2
+  - uid: 218
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -28.5,-68.5
+      parent: 2
+  - uid: 231
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -28.5,-66.5
+      parent: 2
 - proto: AirlockFreezerHydroponicsLocked
   entities:
   - uid: 174
@@ -6083,6 +6181,8 @@ entities:
   entities:
   - uid: 213
     components:
+    - type: MetaData
+      name: attorney airlock
     - type: Transform
       pos: 9.5,4.5
       parent: 2
@@ -6114,7 +6214,7 @@ entities:
       parent: 2
 - proto: AirlockMaintChapelLocked
   entities:
-  - uid: 218
+  - uid: 234
     components:
     - type: Transform
       pos: -33.5,-12.5
@@ -6197,11 +6297,6 @@ entities:
       parent: 2
 - proto: AirlockMaintLibraryLocked
   entities:
-  - uid: 231
-    components:
-    - type: Transform
-      pos: -30.5,-9.5
-      parent: 2
   - uid: 232
     components:
     - type: Transform
@@ -6214,46 +6309,40 @@ entities:
     - type: Transform
       pos: 20.5,-33.5
       parent: 2
-  - uid: 234
-    components:
-    - type: Transform
-      pos: 11.5,10.5
-      parent: 2
   - uid: 235
     components:
     - type: Transform
-      pos: -2.5,-14.5
+      pos: -30.5,-9.5
       parent: 2
   - uid: 236
     components:
     - type: Transform
-      pos: 4.5,-13.5
+      pos: -2.5,12.5
       parent: 2
   - uid: 237
     components:
     - type: Transform
-      pos: -23.5,-14.5
+      pos: 9.5,-11.5
       parent: 2
   - uid: 238
     components:
     - type: Transform
-      pos: -21.5,-19.5
+      pos: 4.5,-13.5
       parent: 2
   - uid: 239
     components:
     - type: Transform
-      pos: -20.5,-11.5
+      pos: -23.5,-14.5
       parent: 2
   - uid: 240
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 27.5,10.5
+      pos: -21.5,-19.5
       parent: 2
   - uid: 241
     components:
     - type: Transform
-      pos: -41.5,0.5
+      pos: -20.5,-11.5
       parent: 2
   - uid: 242
     components:
@@ -6263,54 +6352,52 @@ entities:
   - uid: 243
     components:
     - type: Transform
-      pos: 0.5,9.5
+      pos: 27.5,10.5
       parent: 2
   - uid: 244
     components:
     - type: Transform
-      pos: -36.5,-10.5
+      pos: -46.5,6.5
       parent: 2
   - uid: 245
     components:
     - type: Transform
-      pos: -54.5,2.5
+      pos: 11.5,10.5
       parent: 2
   - uid: 247
     components:
     - type: Transform
-      pos: 9.5,-11.5
+      pos: -36.5,-10.5
       parent: 2
   - uid: 248
     components:
     - type: Transform
-      pos: -2.5,12.5
+      pos: -54.5,2.5
       parent: 2
   - uid: 249
     components:
     - type: Transform
-      pos: 21.5,-40.5
+      pos: -2.5,-14.5
       parent: 2
   - uid: 250
     components:
     - type: Transform
-      pos: 1.5,-45.5
+      pos: 17.5,-41.5
       parent: 2
   - uid: 251
     components:
     - type: Transform
-      pos: 17.5,-41.5
+      pos: 1.5,-45.5
       parent: 2
   - uid: 252
     components:
     - type: Transform
-      pos: -40.5,-22.5
+      pos: 21.5,-40.5
       parent: 2
   - uid: 253
     components:
-    - type: MetaData
-      name: disposals
     - type: Transform
-      pos: -41.5,6.5
+      pos: -41.5,0.5
       parent: 2
   - uid: 254
     components:
@@ -6320,7 +6407,6 @@ entities:
   - uid: 255
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
       pos: -23.5,-2.5
       parent: 2
   - uid: 256
@@ -6331,19 +6417,28 @@ entities:
   - uid: 257
     components:
     - type: Transform
-      pos: 8.5,12.5
+      pos: 0.5,9.5
       parent: 2
   - uid: 258
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -46.5,6.5
+      pos: -41.5,6.5
       parent: 2
   - uid: 259
     components:
     - type: Transform
       pos: 33.5,11.5
       parent: 2
+  - uid: 15738
+    components:
+    - type: Transform
+      pos: -40.5,-22.5
+      parent: 2
+  - uid: 15741
+    components:
+    - type: Transform
+      pos: 8.5,12.5
+      parent: 2
 - proto: AirlockMaintMedLocked
   entities:
   - uid: 261
@@ -6394,6 +6489,8 @@ entities:
     - type: Transform
       pos: -39.5,3.5
       parent: 2
+- proto: AirlockMaintRoboticsLocked
+  entities:
   - uid: 268
     components:
     - type: Transform
@@ -6406,15 +6503,6 @@ entities:
     - type: Transform
       pos: -19.5,-34.5
       parent: 2
-- proto: AirlockMaintSecLocked
-  entities:
-  - uid: 271
-    components:
-    - type: MetaData
-      name: Security South Engineering Entrance
-    - type: Transform
-      pos: 30.5,-19.5
-      parent: 2
 - proto: AirlockMaintTheatreLocked
   entities:
   - uid: 272
@@ -6441,6 +6529,12 @@ entities:
     - type: Transform
       pos: -2.5,-32.5
       parent: 2
+  - uid: 279
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-25.5
+      parent: 2
 - proto: AirlockMedicalGlassLocked
   entities:
   - uid: 276
@@ -6458,11 +6552,6 @@ entities:
     - type: Transform
       pos: 8.5,-37.5
       parent: 2
-  - uid: 279
-    components:
-    - type: Transform
-      pos: 6.5,-25.5
-      parent: 2
 - proto: AirlockMedicalLocked
   entities:
   - uid: 280
@@ -6484,6 +6573,8 @@ entities:
   entities:
   - uid: 283
     components:
+    - type: MetaData
+      name: musician's room
     - type: Transform
       pos: 6.5,-8.5
       parent: 2
@@ -6491,6 +6582,8 @@ entities:
   entities:
   - uid: 284
     components:
+    - type: MetaData
+      name: prosecutor airlock
     - type: Transform
       pos: -8.5,1.5
       parent: 2
@@ -6524,7 +6617,7 @@ entities:
       parent: 2
 - proto: AirlockReporterLocked
   entities:
-  - uid: 290
+  - uid: 15740
     components:
     - type: Transform
       pos: -31.5,-18.5
@@ -6536,6 +6629,13 @@ entities:
     - type: Transform
       pos: -50.5,-11.5
       parent: 2
+- proto: AirlockRoboticsGlassLocked
+  entities:
+  - uid: 296
+    components:
+    - type: Transform
+      pos: -41.5,-11.5
+      parent: 2
 - proto: AirlockSalvageGlassLocked
   entities:
   - uid: 292
@@ -6561,12 +6661,6 @@ entities:
     - type: Transform
       pos: -40.5,-10.5
       parent: 2
-  - uid: 296
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -41.5,-11.5
-      parent: 2
   - uid: 297
     components:
     - type: Transform
@@ -6607,15 +6701,6 @@ entities:
     - type: Transform
       pos: -46.5,0.5
       parent: 2
-- proto: AirlockSecurity
-  entities:
-  - uid: 304
-    components:
-    - type: MetaData
-      name: Extended Confinement Bathroom
-    - type: Transform
-      pos: 38.5,2.5
-      parent: 2
 - proto: AirlockSecurityGlass
   entities:
   - uid: 305
@@ -6705,11 +6790,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 18.5,-4.5
       parent: 2
-  - uid: 317
-    components:
-    - type: Transform
-      pos: 20.5,-0.5
-      parent: 2
   - uid: 318
     components:
     - type: MetaData
@@ -6734,7 +6814,7 @@ entities:
       pos: 18.5,-7.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -184824.52
+      secondsUntilStateChange: -199673.95
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -6768,11 +6848,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 40.5,-3.5
       parent: 2
-  - uid: 330
-    components:
-    - type: Transform
-      pos: 38.5,-5.5
-      parent: 2
 - proto: AirlockSecurityLawyerGlassLocked
   entities:
   - uid: 325
@@ -6800,6 +6875,16 @@ entities:
       invokeCounter: 2
 - proto: AirlockSecurityLocked
   entities:
+  - uid: 271
+    components:
+    - type: Transform
+      pos: 30.5,-19.5
+      parent: 2
+  - uid: 317
+    components:
+    - type: Transform
+      pos: 38.5,-5.5
+      parent: 2
   - uid: 329
     components:
     - type: MetaData
@@ -6824,11 +6909,15 @@ entities:
   entities:
   - uid: 333
     components:
+    - type: MetaData
+      name: service airlock
     - type: Transform
       pos: -17.5,1.5
       parent: 2
   - uid: 649
     components:
+    - type: MetaData
+      name: service airlock
     - type: Transform
       pos: -14.5,1.5
       parent: 2
@@ -8101,6 +8190,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 32.5,13.5
       parent: 2
+  - uid: 15725
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-28.5
+      parent: 2
 - proto: BarSignMaidCafe
   entities:
   - uid: 500
@@ -8201,6 +8296,11 @@ entities:
       canCollide: False
 - proto: Bed
   entities:
+  - uid: 330
+    components:
+    - type: Transform
+      pos: -17.5,-32.5
+      parent: 2
   - uid: 511
     components:
     - type: Transform
@@ -8266,11 +8366,6 @@ entities:
     - type: Transform
       pos: 39.5,-11.5
       parent: 2
-  - uid: 531
-    components:
-    - type: Transform
-      pos: -17.5,-32.5
-      parent: 2
   - uid: 532
     components:
     - type: Transform
@@ -8328,11 +8423,21 @@ entities:
     - type: Transform
       pos: -16.5,-15.5
       parent: 2
+  - uid: 4874
+    components:
+    - type: Transform
+      pos: -14.5,-32.5
+      parent: 2
   - uid: 5300
     components:
     - type: Transform
       pos: 17.5,-35.5
       parent: 2
+  - uid: 9626
+    components:
+    - type: Transform
+      pos: -16.5,-32.5
+      parent: 2
   - uid: 10781
     components:
     - type: Transform
@@ -8343,6 +8448,11 @@ entities:
     - type: Transform
       pos: 17.5,-3.5
       parent: 2
+  - uid: 12677
+    components:
+    - type: Transform
+      pos: -15.5,-32.5
+      parent: 2
   - uid: 15431
     components:
     - type: Transform
@@ -8522,11 +8632,6 @@ entities:
       parent: 2
 - proto: BedsheetSpawner
   entities:
-  - uid: 570
-    components:
-    - type: Transform
-      pos: -17.5,-32.5
-      parent: 2
   - uid: 572
     components:
     - type: Transform
@@ -8552,6 +8657,26 @@ entities:
     - type: Transform
       pos: 20.5,19.5
       parent: 2
+  - uid: 4827
+    components:
+    - type: Transform
+      pos: -17.5,-32.5
+      parent: 2
+  - uid: 6158
+    components:
+    - type: Transform
+      pos: -14.5,-32.5
+      parent: 2
+  - uid: 12689
+    components:
+    - type: Transform
+      pos: -15.5,-32.5
+      parent: 2
+  - uid: 12700
+    components:
+    - type: Transform
+      pos: -16.5,-32.5
+      parent: 2
   - uid: 15432
     components:
     - type: Transform
@@ -8672,6 +8797,14 @@ entities:
     - type: Transform
       pos: 28.403822,-32.943554
       parent: 2
+- proto: BikeHornImplanter
+  entities:
+  - uid: 15782
+    components:
+    - type: Transform
+      parent: 15103
+    - type: Physics
+      canCollide: False
 - proto: BiomassReclaimer
   entities:
   - uid: 596
@@ -8825,6 +8958,70 @@ entities:
     - type: Transform
       pos: 40.427826,3.5490375
       parent: 2
+- proto: BookIanAntarctica
+  entities:
+  - uid: 11926
+    components:
+    - type: Transform
+      parent: 11259
+    - type: Physics
+      canCollide: False
+- proto: BookIanArctic
+  entities:
+  - uid: 11671
+    components:
+    - type: Transform
+      parent: 11259
+    - type: Physics
+      canCollide: False
+- proto: BookIanCity
+  entities:
+  - uid: 11703
+    components:
+    - type: Transform
+      parent: 11259
+    - type: Physics
+      canCollide: False
+- proto: BookIanDesert
+  entities:
+  - uid: 11696
+    components:
+    - type: Transform
+      parent: 11259
+    - type: Physics
+      canCollide: False
+- proto: BookIanLostWolfPup
+  entities:
+  - uid: 11843
+    components:
+    - type: Transform
+      parent: 11259
+    - type: Physics
+      canCollide: False
+- proto: BookIanMountain
+  entities:
+  - uid: 11517
+    components:
+    - type: Transform
+      parent: 11259
+    - type: Physics
+      canCollide: False
+- proto: BookIanOcean
+  entities:
+  - uid: 11261
+    components:
+    - type: Transform
+      parent: 11259
+    - type: Physics
+      canCollide: False
+- proto: BookIanRanch
+  entities:
+  - uid: 11834
+    components:
+    - type: Transform
+      parent: 11259
+    - type: Physics
+      canCollide: False
 - proto: BookRandom
   entities:
   - uid: 617
@@ -9011,6 +9208,11 @@ entities:
     - type: Transform
       pos: 23.5,2.5
       parent: 2
+  - uid: 11257
+    components:
+    - type: Transform
+      pos: -20.5,-39.5
+      parent: 2
   - uid: 14818
     components:
     - type: Transform
@@ -9272,18 +9474,33 @@ entities:
       rot: 3.141592653589793 rad
       pos: 18.5,-5.5
       parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        316:
+        - Timer: Open
+        - Start: Close
   - uid: 682
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 18.5,-8.5
       parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        320:
+        - Timer: Open
+        - Start: Close
   - uid: 683
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 19.5,-11.5
       parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        319:
+        - Timer: Open
+        - Start: Close
 - proto: BrokenBottle
   entities:
   - uid: 684
@@ -9356,12 +9573,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -60.5,-34.5
       parent: 2
-  - uid: 14814
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 71.5,-24.5
-      parent: 2
   - uid: 15252
     components:
     - type: Transform
@@ -9370,6 +9581,11 @@ entities:
       parent: 2
 - proto: ButtonFrameCautionSecurity
   entities:
+  - uid: 531
+    components:
+    - type: Transform
+      pos: 71.5,-24.5
+      parent: 2
   - uid: 696
     components:
     - type: Transform
@@ -9401,6 +9617,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -23.5,-31.5
       parent: 2
+  - uid: 15766
+    components:
+    - type: Transform
+      pos: -42.5,-11.5
+      parent: 2
 - proto: ButtonFrameExit
   entities:
   - uid: 698
@@ -23416,6 +23637,11 @@ entities:
     - type: Transform
       pos: 65.5,-25.5
       parent: 2
+  - uid: 15755
+    components:
+    - type: Transform
+      pos: 62.5,-29.5
+      parent: 2
 - proto: CableHVStack
   entities:
   - uid: 3380
@@ -23467,6 +23693,11 @@ entities:
     - type: Transform
       pos: 20.5,-11.5
       parent: 2
+  - uid: 570
+    components:
+    - type: Transform
+      pos: 63.5,-29.5
+      parent: 2
   - uid: 3387
     components:
     - type: Transform
@@ -26867,11 +27098,6 @@ entities:
     - type: Transform
       pos: 63.5,-28.5
       parent: 2
-  - uid: 14755
-    components:
-    - type: Transform
-      pos: 62.5,-28.5
-      parent: 2
   - uid: 14756
     components:
     - type: Transform
@@ -27927,6 +28153,11 @@ entities:
     - type: Transform
       pos: 60.5,-28.5
       parent: 2
+  - uid: 15758
+    components:
+    - type: Transform
+      pos: 62.5,-29.5
+      parent: 2
 - proto: CableMVStack1
   entities:
   - uid: 4057
@@ -28035,6 +28266,13 @@ entities:
     - type: Transform
       pos: -45.033073,10.648991
       parent: 2
+- proto: CarbonDioxideCanister
+  entities:
+  - uid: 15778
+    components:
+    - type: Transform
+      pos: -51.5,-38.5
+      parent: 2
 - proto: Carpet
   entities:
   - uid: 4072
@@ -28756,12 +28994,6 @@ entities:
       parent: 2
 - proto: CarpetPurple
   entities:
-  - uid: 4188
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -30.5,-16.5
-      parent: 2
   - uid: 4189
     components:
     - type: Transform
@@ -28855,6 +29087,11 @@ entities:
     - type: Transform
       pos: 21.5,18.5
       parent: 2
+  - uid: 14496
+    components:
+    - type: Transform
+      pos: -30.5,-16.5
+      parent: 2
 - proto: CarpetSBlue
   entities:
   - uid: 4206
@@ -28929,6 +29166,16 @@ entities:
     - type: Transform
       pos: 51.5,-41.5
       parent: 2
+- proto: CartridgeMagnum
+  entities:
+  - uid: 15777
+    components:
+    - type: MetaData
+      desc: It's the detective's lucky bullet... not sure what makes it lucky...
+      name: detective's lucky bullet
+    - type: Transform
+      pos: 34.232365,-0.6443379
+      parent: 2
 - proto: Catwalk
   entities:
   - uid: 4220
@@ -32129,6 +32376,18 @@ entities:
       rot: 3.141592653589793 rad
       pos: 23.5,-14.5
       parent: 2
+  - uid: 15757
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 39.5,-4.5
+      parent: 2
+  - uid: 15759
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 41.5,-4.5
+      parent: 2
 - proto: ChairBrass
   entities:
   - uid: 14442
@@ -32138,12 +32397,6 @@ entities:
       parent: 2
 - proto: ChairFolding
   entities:
-  - uid: 4827
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -16.5,-32.5
-      parent: 2
   - uid: 4828
     components:
     - type: Transform
@@ -32410,12 +32663,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -0.598932,5.6819506
       parent: 2
-  - uid: 4874
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -14.5,-32.5
-      parent: 2
   - uid: 4875
     components:
     - type: Transform
@@ -32467,6 +32714,18 @@ entities:
       rot: 3.141592653589793 rad
       pos: -55.50212,-46.377014
       parent: 2
+  - uid: 10234
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -18.483467,-34.308426
+      parent: 2
+  - uid: 10259
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -17.686592,-33.370926
+      parent: 2
 - proto: ChairFoldingSpawnFolded
   entities:
   - uid: 4884
@@ -33140,9 +33399,16 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 38.7575,-43.8199
       parent: 2
-- proto: ChurchOrganInstrument
+- proto: ChurchBell
   entities:
   - uid: 4996
+    components:
+    - type: Transform
+      pos: -26.5,-13.5
+      parent: 2
+- proto: ChurchOrganInstrument
+  entities:
+  - uid: 5240
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -34069,6 +34335,15 @@ entities:
     - type: Transform
       pos: -56.719883,3.364719
       parent: 2
+- proto: ClothingHandsGlovesColorYellowUnsulated
+  entities:
+  - uid: 6154
+    components:
+    - type: Transform
+      parent: 5369
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: ClothingHandsGlovesNitrile
   entities:
   - uid: 5145
@@ -34357,6 +34632,13 @@ entities:
     - type: Transform
       pos: 50.279686,-27.395357
       parent: 2
+  - uid: 6028
+    components:
+    - type: Transform
+      parent: 5369
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: ClothingMaskMuzzle
   entities:
   - uid: 15611
@@ -34638,6 +34920,15 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+- proto: ClothingUniformJumpsuitAncient
+  entities:
+  - uid: 6153
+    components:
+    - type: Transform
+      parent: 5369
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: ClothingUniformJumpsuitDetective
   entities:
   - uid: 5102
@@ -34809,12 +35100,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -17.5,-38.5
       parent: 2
-  - uid: 5240
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -30.5,-13.5
-      parent: 2
   - uid: 5241
     components:
     - type: Transform
@@ -34916,6 +35201,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 54.5,-35.5
       parent: 2
+  - uid: 15760
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -30.5,-13.5
+      parent: 2
 - proto: ComputerAlert
   entities:
   - uid: 5254
@@ -35846,9 +36137,43 @@ entities:
   entities:
   - uid: 5369
     components:
+    - type: MetaData
+      desc: Has a note on the side saying "Tider Kit"
     - type: Transform
       pos: 16.5,19.5
       parent: 2
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.14673
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 6154
+          - 6153
+          - 6028
+          - 6157
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
   - uid: 15426
     components:
     - type: Transform
@@ -36042,6 +36367,13 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 14.613799,13.602171
       parent: 2
+  - uid: 6157
+    components:
+    - type: Transform
+      parent: 5369
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: CryogenicSleepUnit
   entities:
   - uid: 5388
@@ -36140,6 +36472,11 @@ entities:
       parent: 2
 - proto: CurtainsBlueOpen
   entities:
+  - uid: 335
+    components:
+    - type: Transform
+      pos: -15.5,-32.5
+      parent: 2
   - uid: 5399
     components:
     - type: Transform
@@ -36156,6 +36493,21 @@ entities:
     - type: Transform
       pos: -16.5,-15.5
       parent: 2
+  - uid: 12092
+    components:
+    - type: Transform
+      pos: -16.5,-32.5
+      parent: 2
+  - uid: 12093
+    components:
+    - type: Transform
+      pos: -17.5,-32.5
+      parent: 2
+  - uid: 14727
+    components:
+    - type: Transform
+      pos: -14.5,-32.5
+      parent: 2
   - uid: 15514
     components:
     - type: Transform
@@ -36228,7 +36580,7 @@ entities:
       pos: 31.5,-36.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -19015.95
+      secondsUntilStateChange: -33865.387
       state: Closing
   - uid: 5409
     components:
@@ -36309,6 +36661,18 @@ entities:
     - type: Transform
       pos: 17.480783,3.5951743
       parent: 2
+- proto: d6Dice
+  entities:
+  - uid: 15729
+    components:
+    - type: Transform
+      pos: -18.386646,-33.29215
+      parent: 2
+  - uid: 15730
+    components:
+    - type: Transform
+      pos: -18.622757,-33.40326
+      parent: 2
 - proto: DawInstrument
   entities:
   - uid: 15619
@@ -39588,6 +39952,16 @@ entities:
     - type: Transform
       pos: -46.219578,-27.193987
       parent: 2
+  - uid: 15735
+    components:
+    - type: Transform
+      pos: -17.560257,-33.861595
+      parent: 2
+  - uid: 15737
+    components:
+    - type: Transform
+      pos: -18.074146,-34.368538
+      parent: 2
 - proto: DrinkBeerCan
   entities:
   - uid: 5949
@@ -39639,6 +40013,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -54.520626,-46.580112
       parent: 2
+  - uid: 15736
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -17.553312,-34.71576
+      parent: 2
 - proto: DrinkBottleCognac
   entities:
   - uid: 5958
@@ -40113,11 +40493,6 @@ entities:
       parent: 2
 - proto: DrinkWaterBottleFull
   entities:
-  - uid: 6028
-    components:
-    - type: Transform
-      pos: -15.294816,-32.0834
-      parent: 2
   - uid: 6029
     components:
     - type: Transform
@@ -40126,7 +40501,7 @@ entities:
   - uid: 6030
     components:
     - type: Transform
-      pos: 18.922266,-20.45836
+      pos: 18.763243,-20.43268
       parent: 2
   - uid: 6031
     components:
@@ -40956,22 +41331,28 @@ entities:
       parent: 2
 - proto: EncryptionKeyBinary
   entities:
-  - uid: 8382
+  - uid: 6532
     components:
     - type: Transform
-      parent: 6153
+      parent: 6163
     - type: Physics
       canCollide: False
 - proto: EncryptionKeyCargo
   entities:
-  - uid: 6154
+  - uid: 15751
     components:
     - type: Transform
-      parent: 6153
+      parent: 15749
     - type: Physics
       canCollide: False
 - proto: EncryptionKeyCommand
   entities:
+  - uid: 6164
+    components:
+    - type: Transform
+      parent: 6163
+    - type: Physics
+      canCollide: False
   - uid: 12743
     components:
     - type: Transform
@@ -40988,14 +41369,20 @@ entities:
       canCollide: False
 - proto: EncryptionKeyEngineering
   entities:
-  - uid: 6158
+  - uid: 15750
     components:
     - type: Transform
-      parent: 6157
+      parent: 15749
     - type: Physics
       canCollide: False
 - proto: EncryptionKeyJustice
   entities:
+  - uid: 9282
+    components:
+    - type: Transform
+      parent: 8382
+    - type: Physics
+      canCollide: False
   - uid: 15529
     components:
     - type: Transform
@@ -41007,27 +41394,25 @@ entities:
   - uid: 6161
     components:
     - type: Transform
-      parent: 6160
+      parent: 6159
     - type: Physics
       canCollide: False
-- proto: EncryptionKeyMedicalScience
+- proto: EncryptionKeyScience
   entities:
-  - uid: 6162
+  - uid: 6160
     components:
     - type: Transform
-      parent: 6160
+      parent: 6159
     - type: Physics
       canCollide: False
-- proto: EncryptionKeyRobo
+- proto: EncryptionKeySecurity
   entities:
-  - uid: 6159
+  - uid: 9275
     components:
     - type: Transform
-      parent: 6157
+      parent: 8382
     - type: Physics
       canCollide: False
-- proto: EncryptionKeySecurity
-  entities:
   - uid: 12778
     components:
     - type: Transform
@@ -41042,10 +41427,10 @@ entities:
       canCollide: False
 - proto: EncryptionKeyService
   entities:
-  - uid: 6164
+  - uid: 6162
     components:
     - type: Transform
-      parent: 6163
+      parent: 6155
     - type: Physics
       canCollide: False
 - proto: Envelope
@@ -43659,13 +44044,6 @@ entities:
     - type: Transform
       pos: -1.0944183,-17.486998
       parent: 2
-- proto: FoodPizzaVegetableSlice
-  entities:
-  - uid: 6532
-    components:
-    - type: Transform
-      pos: -15.762994,-32.17715
-      parent: 2
 - proto: FoodPlateTrash
   entities:
   - uid: 6533
@@ -58740,6 +59118,12 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 9901
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -43.5,-1.5
+      parent: 2
   - uid: 9903
     components:
     - type: Transform
@@ -65265,11 +65649,6 @@ entities:
     - type: Transform
       pos: 28.5,17.5
       parent: 2
-  - uid: 9275
-    components:
-    - type: Transform
-      pos: -45.5,0.5
-      parent: 2
   - uid: 9276
     components:
     - type: Transform
@@ -65300,11 +65679,6 @@ entities:
     - type: Transform
       pos: -40.5,-12.5
       parent: 2
-  - uid: 9282
-    components:
-    - type: Transform
-      pos: -43.5,-1.5
-      parent: 2
   - uid: 9283
     components:
     - type: Transform
@@ -66269,11 +66643,6 @@ entities:
     - type: Transform
       pos: -34.5,0.5
       parent: 2
-  - uid: 9482
-    components:
-    - type: Transform
-      pos: -44.5,0.5
-      parent: 2
   - uid: 9483
     components:
     - type: Transform
@@ -66989,11 +67358,6 @@ entities:
     - type: Transform
       pos: 24.5,-15.5
       parent: 2
-  - uid: 9626
-    components:
-    - type: Transform
-      pos: -47.5,1.5
-      parent: 2
   - uid: 9627
     components:
     - type: Transform
@@ -68782,6 +69146,8 @@ entities:
   entities:
   - uid: 9899
     components:
+    - type: MetaData
+      desc: A standard-issue Nanotrasen storage unit. Has a large "Head of Security" stamp on it.
     - type: Transform
       pos: 31.5,5.5
       parent: 2
@@ -68791,8 +69157,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
+        - 1.8856695
+        - 7.0937095
         - 0
         - 0
         - 0
@@ -68809,8 +69175,8 @@ entities:
           showEnts: False
           occludes: True
           ents:
-          - 9900
-          - 9901
+          - 10083
+          - 10082
         paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
@@ -69060,16 +69426,22 @@ entities:
       parent: 2
   - uid: 14675
     components:
+    - type: MetaData
+      name: ai control room
     - type: Transform
       pos: 63.5,-25.5
       parent: 2
   - uid: 14676
     components:
+    - type: MetaData
+      name: camera server room
     - type: Transform
       pos: 63.5,-21.5
       parent: 2
   - uid: 14677
     components:
+    - type: MetaData
+      name: ai core
     - type: Transform
       pos: 66.5,-23.5
       parent: 2
@@ -69104,6 +69476,12 @@ entities:
       parent: 2
 - proto: HospitalCurtainsOpen
   entities:
+  - uid: 9482
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-39.5
+      parent: 2
   - uid: 15626
     components:
     - type: Transform
@@ -69134,6 +69512,18 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 2.5,-31.5
       parent: 2
+  - uid: 15754
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-41.5
+      parent: 2
+  - uid: 15756
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-37.5
+      parent: 2
 - proto: hydroponicsSoil
   entities:
   - uid: 9948
@@ -69398,6 +69788,12 @@ entities:
     - type: Transform
       pos: 8.5,-38.5
       parent: 2
+  - uid: 15753
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-34.5
+      parent: 2
 - proto: IntercomScience
   entities:
   - uid: 9989
@@ -69824,6 +70220,13 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -54.5,-44.5
       parent: 2
+- proto: Lighter
+  entities:
+  - uid: 15769
+    components:
+    - type: Transform
+      pos: 18.981993,-20.484764
+      parent: 2
 - proto: LightHeadBorg
   entities:
   - uid: 10035
@@ -69900,6 +70303,21 @@ entities:
         - Pressed: Toggle
         9718:
         - Pressed: Toggle
+- proto: LockableButtonCommand
+  entities:
+  - uid: 12085
+    components:
+    - type: Transform
+      pos: 71.5,-24.5
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        14815:
+        - Pressed: Toggle
+        12707:
+        - Pressed: DoorBolt
+        12670:
+        - Pressed: DoorBolt
 - proto: LockableButtonHeadOfPersonnel
   entities:
   - uid: 15059
@@ -69941,6 +70359,29 @@ entities:
         - Pressed: Toggle
         11514:
         - Pressed: Toggle
+- proto: LockableButtonRobotics
+  entities:
+  - uid: 11694
+    components:
+    - type: Transform
+      pos: -42.5,-11.5
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        11649:
+        - Pressed: Toggle
+        11650:
+        - Pressed: Toggle
+        11651:
+        - Pressed: Toggle
+        11625:
+        - Pressed: Toggle
+        11648:
+        - Pressed: Toggle
+        11652:
+        - Pressed: Toggle
+        11663:
+        - Pressed: Toggle
 - proto: LockerAtmosphericsFilled
   entities:
   - uid: 10039
@@ -70202,22 +70643,22 @@ entities:
       parent: 2
 - proto: LockerSalvageSpecialistFilledHardsuit
   entities:
-  - uid: 10080
+  - uid: 11928
     components:
     - type: Transform
-      pos: -18.5,-35.5
+      pos: -16.5,-35.5
       parent: 2
-  - uid: 10081
+  - uid: 12091
     components:
     - type: Transform
-      pos: -17.5,-35.5
+      pos: -18.5,-35.5
       parent: 2
-  - uid: 10082
+  - uid: 12094
     components:
     - type: Transform
-      pos: -16.5,-35.5
+      pos: -17.5,-35.5
       parent: 2
-  - uid: 10083
+  - uid: 12688
     components:
     - type: Transform
       pos: -15.5,-35.5
@@ -70550,6 +70991,15 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 40.54459,-11.15263
       parent: 2
+- proto: MagazinePistol
+  entities:
+  - uid: 10083
+    components:
+    - type: Transform
+      parent: 9899
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: MailTeleporter
   entities:
   - uid: 10115
@@ -71265,11 +71715,6 @@ entities:
     - type: Transform
       pos: 6.5360775,-42.030327
       parent: 2
-  - uid: 10234
-    components:
-    - type: Transform
-      pos: 11.840524,16.326675
-      parent: 2
 - proto: MysteryFigureBox
   entities:
   - uid: 10235
@@ -71331,6 +71776,21 @@ entities:
     - type: Transform
       pos: 21.5,7.5
       parent: 2
+  - uid: 15744
+    components:
+    - type: Transform
+      pos: -4.5,-54.5
+      parent: 2
+  - uid: 15745
+    components:
+    - type: Transform
+      pos: 7.5,-54.5
+      parent: 2
+  - uid: 15779
+    components:
+    - type: Transform
+      pos: -36.5,-39.5
+      parent: 2
 - proto: NitrousOxideTankFilled
   entities:
   - uid: 9
@@ -71432,11 +71892,10 @@ entities:
       parent: 2
 - proto: Oracle
   entities:
-  - uid: 10649
+  - uid: 11099
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -26.5,-13.5
+      pos: -24.5,-19.5
       parent: 2
 - proto: OreBox
   entities:
@@ -71478,11 +71937,6 @@ entities:
     - type: Transform
       pos: -44.5,1.5
       parent: 2
-  - uid: 10259
-    components:
-    - type: Transform
-      pos: -20.5,-39.5
-      parent: 2
   - uid: 10260
     components:
     - type: Transform
@@ -71518,6 +71972,26 @@ entities:
     - type: Transform
       pos: 29.5,7.5
       parent: 2
+  - uid: 15742
+    components:
+    - type: Transform
+      pos: -4.5,-52.5
+      parent: 2
+  - uid: 15743
+    components:
+    - type: Transform
+      pos: 7.5,-52.5
+      parent: 2
+  - uid: 15763
+    components:
+    - type: Transform
+      pos: -14.5,-40.5
+      parent: 2
+  - uid: 15776
+    components:
+    - type: Transform
+      pos: -36.5,-41.5
+      parent: 2
 - proto: PaintingBlunt
   entities:
   - uid: 10264
@@ -71780,6 +72254,36 @@ entities:
         After that you will be able to use bridge controls for a short period of time. It is advisable to use it wisely as fuel will burn up in a matter of minutes, check the fuel timer on the left side of the generator to see how much time you have left.
 
       editingDisabled: True
+  - uid: 15752
+    components:
+    - type: Transform
+      pos: 11.488341,-28.648457
+      parent: 2
+    - type: Paper
+      stampState: paper_stamp-cmo
+      stampedBy:
+      - stampedColor: '#33CCFFFF'
+        stampedName: stamp-component-stamped-name-cmo
+      - stampedColor: '#006600FF'
+        stampedName: stamp-component-stamped-name-centcom
+      content: >-
+        [color=#185A8A]█▄ █ ▀█▀    [head=3]Surgery Awareness[/head]
+
+        █ ▀█   █ [/color]    [color=#185A8A]This is a legal Nanotrasen document.[/color]
+
+        [color=#1b67a5]─────────────────────────────────────────[/color]
+
+          This room has been blocked off due to its lack of use to the medical department as of the moment. Once [bold]surgery[/bold] arrives to this Nanotrasen sector this area will be remodeled and put back into working order.
+
+        [color=#1b67a5]─────────────────────────────────────────[/color]
+
+
+        [head=3][bold]Estimated time until surgery arrival: 1 week[/bold][/head]
+
+
+        [color=#1b67a5]─────────────────────────────────────────[/color]
+          [italic]This document must stamped to be considered valid[/italic]
+      editingDisabled: True
 - proto: PaperBin
   entities:
   - uid: 10310
@@ -72194,6 +72698,7 @@ entities:
 
 
         Watching over you,
+      editingDisabled: True
   - uid: 15605
     components:
     - type: Transform
@@ -72322,6 +72827,11 @@ entities:
     - type: Transform
       pos: -57.5,-31.5
       parent: 2
+  - uid: 15780
+    components:
+    - type: Transform
+      pos: -36.5,-43.5
+      parent: 2
 - proto: PlasmaReinforcedWindowDirectional
   entities:
   - uid: 10972
@@ -72355,6 +72865,60 @@ entities:
     - type: Transform
       pos: 72.5,-24.5
       parent: 2
+  - uid: 14814
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-52.5
+      parent: 2
+  - uid: 15557
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-54.5
+      parent: 2
+  - uid: 15558
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-53.5
+      parent: 2
+  - uid: 15659
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-53.5
+      parent: 2
+  - uid: 15719
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-54.5
+      parent: 2
+  - uid: 15720
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-52.5
+      parent: 2
+  - uid: 15721
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 65.5,-26.5
+      parent: 2
+  - uid: 15722
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 65.5,-27.5
+      parent: 2
+  - uid: 15723
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 65.5,-28.5
+      parent: 2
 - proto: PlasticFlapsAirtightClear
   entities:
   - uid: 10356
@@ -72386,6 +72950,13 @@ entities:
     - type: Transform
       pos: -32.5,-62.5
       parent: 2
+- proto: PlayerStationAi
+  entities:
+  - uid: 14808
+    components:
+    - type: Transform
+      pos: 71.5,-23.5
+      parent: 2
 - proto: PlushieAtmosian
   entities:
   - uid: 10358
@@ -72418,11 +72989,17 @@ entities:
   - uid: 15103
     components:
     - type: MetaData
-      desc: A strange forgotten toy...
+      desc: A strange forgotten toy...                                              it has a tag on the side...                                               "Unkn0wn_Gh0st"..?
       name: unknown ghost toy
     - type: Transform
       pos: 39.040783,-35.417225
       parent: 1
+    - type: ContainerContainer
+      containers:
+        stash: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: 15782
 - proto: PlushieHampter
   entities:
   - uid: 5377
@@ -72820,6 +73397,13 @@ entities:
     - type: Transform
       pos: -28.5,0.5
       parent: 2
+- proto: PosterLegitIan
+  entities:
+  - uid: 15761
+    components:
+    - type: Transform
+      pos: -20.5,-19.5
+      parent: 2
 - proto: PosterLegitJustAWeekAway
   entities:
   - uid: 10416
@@ -72829,10 +73413,10 @@ entities:
       parent: 2
 - proto: PosterLegitLoveIan
   entities:
-  - uid: 10417
+  - uid: 15762
     components:
     - type: Transform
-      pos: -16.5,-14.5
+      pos: -19.5,-15.5
       parent: 2
 - proto: PosterLegitMedicate
   entities:
@@ -72945,6 +73529,18 @@ entities:
     - type: Transform
       pos: 57.5,-43.5
       parent: 2
+  - uid: 15746
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-51.5
+      parent: 2
+  - uid: 15747
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-51.5
+      parent: 2
 - proto: PosterLegitSafetyMothFires
   entities:
   - uid: 10431
@@ -73919,12 +74515,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 28.5,-4.5
       parent: 2
-  - uid: 10588
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 11.5,-27.5
-      parent: 2
   - uid: 10589
     components:
     - type: Transform
@@ -75220,6 +75810,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -44.5,7.5
       parent: 2
+  - uid: 11927
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-27.5
+      parent: 2
 - proto: PoweredSmallLightMaintenance
   entities:
   - uid: 10254
@@ -76621,6 +77217,11 @@ entities:
     - type: Transform
       pos: 35.5,9.5
       parent: 2
+  - uid: 15775
+    components:
+    - type: Transform
+      pos: -55.5,-12.5
+      parent: 2
 - proto: RandomPosterLegit
   entities:
   - uid: 11022
@@ -76809,6 +77410,13 @@ entities:
     - type: Transform
       pos: 20.5,13.5
       parent: 2
+- proto: RandomSmokables
+  entities:
+  - uid: 15768
+    components:
+    - type: Transform
+      pos: 19.17991,-20.297264
+      parent: 2
 - proto: RandomSnacks
   entities:
   - uid: 11059
@@ -77013,12 +77621,6 @@ entities:
     - type: Transform
       pos: 31.5,9.5
       parent: 2
-  - uid: 11099
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -15.5,-33.5
-      parent: 2
   - uid: 11100
     components:
     - type: Transform
@@ -77566,6 +78168,21 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -35.5,-48.5
       parent: 2
+  - uid: 11929
+    components:
+    - type: Transform
+      pos: -47.5,-4.5
+      parent: 2
+  - uid: 11976
+    components:
+    - type: Transform
+      pos: -49.5,-2.5
+      parent: 2
+  - uid: 11978
+    components:
+    - type: Transform
+      pos: -47.5,-3.5
+      parent: 2
   - uid: 12254
     components:
     - type: Transform
@@ -77925,33 +78542,17 @@ entities:
     - type: Transform
       pos: -32.5,4.5
       parent: 2
-  - uid: 11257
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -49.5,-2.5
-      parent: 2
   - uid: 11258
     components:
     - type: Transform
       pos: 29.5,17.5
       parent: 2
-  - uid: 11259
-    components:
-    - type: Transform
-      pos: -43.5,-1.5
-      parent: 2
   - uid: 11260
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 21.5,-46.5
       parent: 2
-  - uid: 11261
-    components:
-    - type: Transform
-      pos: -47.5,-4.5
-      parent: 2
   - uid: 11262
     components:
     - type: Transform
@@ -79174,11 +79775,6 @@ entities:
     - type: Transform
       pos: 59.5,-50.5
       parent: 2
-  - uid: 11517
-    components:
-    - type: Transform
-      pos: -47.5,-3.5
-      parent: 2
   - uid: 11518
     components:
     - type: Transform
@@ -79241,12 +79837,6 @@ entities:
     - type: Transform
       pos: 49.5,-20.5
       parent: 2
-  - uid: 15659
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,-37.5
-      parent: 2
 - proto: ResearchAndDevelopmentServer
   entities:
   - uid: 11530
@@ -79836,6 +80426,51 @@ entities:
       parent: 2
 - proto: ShelfRWood
   entities:
+  - uid: 11259
+    components:
+    - type: Transform
+      pos: -16.5,-14.5
+      parent: 2
+    - type: Storage
+      storedItems:
+        11261:
+          position: 2,0
+          _rotation: South
+        11517:
+          position: 0,0
+          _rotation: South
+        11671:
+          position: 1,0
+          _rotation: South
+        11696:
+          position: 3,0
+          _rotation: South
+        11703:
+          position: 0,3
+          _rotation: South
+        11834:
+          position: 1,3
+          _rotation: South
+        11843:
+          position: 2,3
+          _rotation: South
+        11926:
+          position: 3,3
+          _rotation: South
+    - type: ContainerContainer
+      containers:
+        storagebase: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 11261
+          - 11517
+          - 11671
+          - 11696
+          - 11703
+          - 11834
+          - 11843
+          - 11926
   - uid: 11613
     components:
     - type: Transform
@@ -80314,16 +80949,6 @@ entities:
       linkedPorts:
         597:
         - Pressed: Toggle
-  - uid: 11671
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,-32.5
-      parent: 2
-    - type: DeviceLinkSource
-      linkedPorts:
-        277:
-        - Pressed: Open
   - uid: 11676
     components:
     - type: Transform
@@ -80432,12 +81057,16 @@ entities:
         - Pressed: Toggle
         - Pressed: On
         - Pressed: Off
-  - uid: 14813
+  - uid: 11995
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 71.5,-24.5
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-32.5
       parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        277:
+        - Pressed: Toggle
 - proto: SignalControlledValve
   entities:
   - uid: 11678
@@ -80706,25 +81335,6 @@ entities:
         - On: Toggle
         - Off: Toggle
         - Status: Toggle
-  - uid: 11694
-    components:
-    - type: Transform
-      pos: -42.5,-11.5
-      parent: 2
-    - type: DeviceLinkSource
-      linkedPorts:
-        11648:
-        - On: Close
-        - Off: Open
-        11649:
-        - On: Close
-        - Off: Open
-        11650:
-        - On: Close
-        - Off: Open
-        11651:
-        - On: Close
-        - Off: Open
   - uid: 11695
     components:
     - type: Transform
@@ -80738,9 +81348,10 @@ entities:
         - Status: Toggle
 - proto: SignAnomaly
   entities:
-  - uid: 11696
+  - uid: 12086
     components:
     - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -43.5,-1.5
       parent: 2
 - proto: SignAnomaly2
@@ -80791,10 +81402,11 @@ entities:
       parent: 2
 - proto: SignCans
   entities:
-  - uid: 11703
+  - uid: 10080
     components:
     - type: Transform
-      pos: -44.5,0.5
+      rot: 1.5707963267948966 rad
+      pos: -45.5,0.5
       parent: 2
 - proto: SignCargo
   entities:
@@ -80808,6 +81420,13 @@ entities:
     - type: Transform
       pos: -6.5,-38.5
       parent: 2
+- proto: SignCargoDock
+  entities:
+  - uid: 15724
+    components:
+    - type: Transform
+      pos: -28.5,-67.5
+      parent: 2
 - proto: SignChapel
   entities:
   - uid: 11706
@@ -81538,6 +82157,41 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 10.5,-39.5
       parent: 2
+- proto: SignNanotrasen1
+  entities:
+  - uid: 15770
+    components:
+    - type: Transform
+      pos: 8.5,-46.5
+      parent: 2
+- proto: SignNanotrasen2
+  entities:
+  - uid: 15771
+    components:
+    - type: Transform
+      pos: 9.5,-46.5
+      parent: 2
+- proto: SignNanotrasen3
+  entities:
+  - uid: 15772
+    components:
+    - type: Transform
+      pos: 10.5,-46.5
+      parent: 2
+- proto: SignNanotrasen4
+  entities:
+  - uid: 15773
+    components:
+    - type: Transform
+      pos: 11.5,-46.5
+      parent: 2
+- proto: SignNanotrasen5
+  entities:
+  - uid: 15774
+    components:
+    - type: Transform
+      pos: 12.5,-46.5
+      parent: 2
 - proto: SignNews
   entities:
   - uid: 11808
@@ -81707,6 +82361,12 @@ entities:
     - type: Transform
       pos: 32.5,-15.5
       parent: 2
+  - uid: 15764
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -47.5,-3.5
+      parent: 2
 - proto: SignShipDock
   entities:
   - uid: 11831
@@ -81729,10 +82389,10 @@ entities:
     - type: Transform
       pos: 8.5,-27.5
       parent: 2
-  - uid: 11834
+  - uid: 12087
     components:
     - type: Transform
-      pos: -49.5,-15.5
+      pos: -47.5,-15.5
       parent: 2
 - proto: SignTelecomms
   entities:
@@ -82267,32 +82927,10 @@ entities:
       parent: 2
 - proto: SophicScribe
   entities:
-  - uid: 11926
-    components:
-    - type: Transform
-      pos: -28.5,-13.5
-      parent: 2
-- proto: SpaceCash
-  entities:
-  - uid: 11927
-    components:
-    - type: Transform
-      pos: -15.450494,-32.36465
-      parent: 2
-  - uid: 11928
-    components:
-    - type: Transform
-      pos: -15.403619,-32.317776
-      parent: 2
-  - uid: 11929
-    components:
-    - type: Transform
-      pos: -15.450494,-32.3334
-      parent: 2
-  - uid: 11930
+  - uid: 12088
     components:
     - type: Transform
-      pos: -15.512994,-32.474026
+      pos: -30.5,-19.5
       parent: 2
 - proto: SpaceCash10
   entities:
@@ -82335,6 +82973,26 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+  - uid: 15731
+    components:
+    - type: Transform
+      pos: -18.067202,-33.15326
+      parent: 2
+  - uid: 15732
+    components:
+    - type: Transform
+      pos: -18.060257,-33.04215
+      parent: 2
+  - uid: 15733
+    components:
+    - type: Transform
+      pos: -18.76859,-33.81298
+      parent: 2
+  - uid: 15734
+    components:
+    - type: Transform
+      pos: -18.553312,-33.785206
+      parent: 2
 - proto: SpaceCash1000
   entities:
   - uid: 11937
@@ -82383,6 +83041,14 @@ entities:
     - type: Transform
       pos: 42.5,-13.5
       parent: 2
+- proto: SpawnMobButterfly
+  entities:
+  - uid: 15748
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-52.5
+      parent: 2
 - proto: SpawnMobCatBingus
   entities:
   - uid: 15090
@@ -82654,22 +83320,22 @@ entities:
       parent: 2
 - proto: SpawnPointCargoTechnician
   entities:
-  - uid: 11843
+  - uid: 12095
     components:
     - type: Transform
-      pos: -13.5,-26.5
+      pos: -11.5,-30.5
       parent: 2
-  - uid: 11976
+  - uid: 12096
     components:
     - type: Transform
-      pos: -13.5,-25.5
+      pos: -11.5,-37.5
       parent: 2
-  - uid: 11978
+  - uid: 12097
     components:
     - type: Transform
-      pos: -12.5,-26.5
+      pos: -14.5,-26.5
       parent: 2
-  - uid: 11979
+  - uid: 12098
     components:
     - type: Transform
       pos: -12.5,-25.5
@@ -82787,15 +83453,15 @@ entities:
       parent: 2
 - proto: SpawnPointCourier
   entities:
-  - uid: 11995
+  - uid: 11996
     components:
     - type: Transform
-      pos: -7.5,-26.5
+      pos: -8.5,-26.5
       parent: 2
-  - uid: 11996
+  - uid: 12362
     components:
     - type: Transform
-      pos: -8.5,-26.5
+      pos: -7.5,-25.5
       parent: 2
 - proto: SpawnPointDetective
   entities:
@@ -82875,6 +83541,11 @@ entities:
       parent: 2
 - proto: SpawnPointLocationMidRoundAntag
   entities:
+  - uid: 10649
+    components:
+    - type: Transform
+      pos: 33.5,16.5
+      parent: 2
   - uid: 12009
     components:
     - type: Transform
@@ -83291,31 +83962,47 @@ entities:
     - type: Transform
       pos: 50.5,-34.5
       parent: 2
+- proto: SpawnPointRoboticist
+  entities:
+  - uid: 15765
+    components:
+    - type: Transform
+      pos: -43.5,-17.5
+      parent: 2
+  - uid: 15767
+    components:
+    - type: Transform
+      pos: -43.5,-19.5
+      parent: 2
 - proto: SpawnPointSalvageSpecialist
   entities:
-  - uid: 12085
+  - uid: 10588
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -17.5,-32.5
+      pos: -15.5,-32.5
       parent: 2
-  - uid: 12086
+  - uid: 15726
     components:
     - type: Transform
-      pos: -17.5,-34.5
+      pos: -17.5,-33.5
       parent: 2
-  - uid: 12087
+  - uid: 15727
     components:
     - type: Transform
-      pos: -14.5,-32.5
+      pos: -18.5,-34.5
       parent: 2
-  - uid: 12088
+  - uid: 15728
     components:
     - type: Transform
-      pos: -16.5,-32.5
+      pos: -15.5,-34.5
       parent: 2
 - proto: SpawnPointScientist
   entities:
+  - uid: 4188
+    components:
+    - type: Transform
+      pos: -48.5,1.5
+      parent: 2
   - uid: 12089
     components:
     - type: Transform
@@ -83326,46 +84013,41 @@ entities:
     - type: Transform
       pos: -50.5,-7.5
       parent: 2
-  - uid: 12091
+  - uid: 12701
     components:
     - type: Transform
-      pos: -29.5,-16.5
+      pos: -42.5,-3.5
       parent: 2
-  - uid: 12092
+  - uid: 12804
     components:
     - type: Transform
-      pos: -30.5,-16.5
+      pos: -49.5,-1.5
       parent: 2
-  - uid: 12093
+  - uid: 14493
     components:
     - type: Transform
-      pos: -25.5,-16.5
+      pos: -30.5,-15.5
       parent: 2
-  - uid: 12094
+  - uid: 14494
     components:
     - type: Transform
-      pos: -24.5,-16.5
+      pos: -29.5,-16.5
       parent: 2
-  - uid: 12095
+  - uid: 14495
     components:
     - type: Transform
-      pos: -29.5,-15.5
+      pos: -35.5,2.5
       parent: 2
-  - uid: 12096
+  - uid: 14497
     components:
     - type: Transform
-      pos: -30.5,-15.5
+      pos: -25.5,-15.5
       parent: 2
-  - uid: 12097
+  - uid: 14498
     components:
     - type: Transform
       pos: -24.5,-15.5
       parent: 2
-  - uid: 12098
-    components:
-    - type: Transform
-      pos: -25.5,-15.5
-      parent: 2
 - proto: SpawnPointSecurityCadet
   entities:
   - uid: 12099
@@ -83543,15 +84225,6 @@ entities:
     - type: Transform
       pos: 39.5,-12.5
       parent: 2
-- proto: SpeedLoaderMagnum
-  entities:
-  - uid: 9900
-    components:
-    - type: Transform
-      parent: 9899
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: SpiderWeb
   entities:
   - uid: 12132
@@ -83816,6 +84489,11 @@ entities:
     - type: Transform
       pos: -44.5,2.5
       parent: 2
+  - uid: 15781
+    components:
+    - type: Transform
+      pos: -36.5,-45.5
+      parent: 2
 - proto: SubstationBasic
   entities:
   - uid: 12170
@@ -84068,7 +84746,7 @@ entities:
     - type: Transform
       pos: 14.5,-38.5
       parent: 2
-- proto: SuitStorageSec
+- proto: SuitStorageSecDeltaV
   entities:
   - uid: 12210
     components:
@@ -84925,6 +85603,8 @@ entities:
   entities:
   - uid: 12279
     components:
+    - type: MetaData
+      name: command camera router
     - type: Transform
       pos: 65.5,-18.5
       parent: 2
@@ -84932,6 +85612,8 @@ entities:
   entities:
   - uid: 12284
     components:
+    - type: MetaData
+      name: engineering camera router
     - type: Transform
       pos: 61.5,-18.5
       parent: 2
@@ -84939,6 +85621,8 @@ entities:
   entities:
   - uid: 12280
     components:
+    - type: MetaData
+      name: general camera router
     - type: Transform
       pos: 64.5,-17.5
       parent: 2
@@ -84960,6 +85644,8 @@ entities:
   entities:
   - uid: 12283
     components:
+    - type: MetaData
+      name: security camera router
     - type: Transform
       pos: 61.5,-20.5
       parent: 2
@@ -84967,6 +85653,8 @@ entities:
   entities:
   - uid: 12281
     components:
+    - type: MetaData
+      name: service camera router
     - type: Transform
       pos: 62.5,-17.5
       parent: 2
@@ -84974,6 +85662,8 @@ entities:
   entities:
   - uid: 12285
     components:
+    - type: MetaData
+      name: logistics camera router
     - type: Transform
       pos: 61.5,-19.5
       parent: 2
@@ -85964,10 +86654,10 @@ entities:
       parent: 2
 - proto: TableCarpet
   entities:
-  - uid: 12362
+  - uid: 10417
     components:
     - type: Transform
-      pos: -15.5,-32.5
+      pos: -18.5,-33.5
       parent: 2
   - uid: 12363
     components:
@@ -87918,10 +88608,10 @@ entities:
       color: '#FF3300FF'
 - proto: TelecomServer
   entities:
-  - uid: 6153
+  - uid: 6155
     components:
     - type: Transform
-      pos: -38.5,-51.5
+      pos: -38.5,-47.5
       parent: 2
     - type: ContainerContainer
       containers:
@@ -87929,8 +88619,8 @@ entities:
           showEnts: False
           occludes: True
           ents:
-          - 6154
-          - 8382
+          - 6156
+          - 6162
         machine_board: !type:Container
           showEnts: False
           occludes: True
@@ -87939,10 +88629,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
-  - uid: 6155
+  - uid: 6159
     components:
     - type: Transform
-      pos: -38.5,-47.5
+      pos: -36.5,-47.5
       parent: 2
     - type: ContainerContainer
       containers:
@@ -87950,7 +88640,8 @@ entities:
           showEnts: False
           occludes: True
           ents:
-          - 6156
+          - 6160
+          - 6161
         machine_board: !type:Container
           showEnts: False
           occludes: True
@@ -87959,10 +88650,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
-  - uid: 6157
+  - uid: 6163
     components:
     - type: Transform
-      pos: -37.5,-47.5
+      pos: -36.5,-51.5
       parent: 2
     - type: ContainerContainer
       containers:
@@ -87970,8 +88661,8 @@ entities:
           showEnts: False
           occludes: True
           ents:
-          - 6159
-          - 6158
+          - 6164
+          - 6532
         machine_board: !type:Container
           showEnts: False
           occludes: True
@@ -87980,10 +88671,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
-  - uid: 6160
+  - uid: 8382
     components:
     - type: Transform
-      pos: -36.5,-47.5
+      pos: -38.5,-51.5
       parent: 2
     - type: ContainerContainer
       containers:
@@ -87991,8 +88682,8 @@ entities:
           showEnts: False
           occludes: True
           ents:
-          - 6161
-          - 6162
+          - 9275
+          - 9282
         machine_board: !type:Container
           showEnts: False
           occludes: True
@@ -88001,10 +88692,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
-  - uid: 6163
+  - uid: 11679
     components:
     - type: Transform
-      pos: -36.5,-51.5
+      pos: 40.5,-33.5
       parent: 2
     - type: ContainerContainer
       containers:
@@ -88012,7 +88703,8 @@ entities:
           showEnts: False
           occludes: True
           ents:
-          - 6164
+          - 12743
+          - 12778
         machine_board: !type:Container
           showEnts: False
           occludes: True
@@ -88021,10 +88713,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
-  - uid: 11679
+  - uid: 15325
     components:
     - type: Transform
-      pos: 40.5,-33.5
+      pos: 38.5,-13.5
       parent: 2
     - type: ContainerContainer
       containers:
@@ -88032,8 +88724,8 @@ entities:
           showEnts: False
           occludes: True
           ents:
-          - 12743
-          - 12778
+          - 15335
+          - 15529
         machine_board: !type:Container
           showEnts: False
           occludes: True
@@ -88042,10 +88734,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
-  - uid: 15325
+  - uid: 15749
     components:
     - type: Transform
-      pos: 38.5,-13.5
+      pos: -37.5,-47.5
       parent: 2
     - type: ContainerContainer
       containers:
@@ -88053,8 +88745,8 @@ entities:
           showEnts: False
           occludes: True
           ents:
-          - 15335
-          - 15529
+          - 15750
+          - 15751
         machine_board: !type:Container
           showEnts: False
           occludes: True
@@ -88075,11 +88767,6 @@ entities:
     - type: Transform
       pos: -15.5,-4.5
       parent: 2
-  - uid: 12677
-    components:
-    - type: Transform
-      pos: -47.5,1.5
-      parent: 2
   - uid: 12678
     components:
     - type: Transform
@@ -88131,16 +88818,6 @@ entities:
     - type: Transform
       pos: -29.5,0.5
       parent: 2
-  - uid: 12688
-    components:
-    - type: Transform
-      pos: -45.5,0.5
-      parent: 2
-  - uid: 12689
-    components:
-    - type: Transform
-      pos: -44.5,0.5
-      parent: 2
   - uid: 12690
     components:
     - type: Transform
@@ -88191,16 +88868,6 @@ entities:
     - type: Transform
       pos: -0.5,-34.5
       parent: 2
-  - uid: 12700
-    components:
-    - type: Transform
-      pos: 2.5,-39.5
-      parent: 2
-  - uid: 12701
-    components:
-    - type: Transform
-      pos: 2.5,-41.5
-      parent: 2
 - proto: ToiletDirtyWater
   entities:
   - uid: 12702
@@ -88356,11 +89023,6 @@ entities:
     - type: Transform
       pos: 61.458874,-28.079819
       parent: 2
-  - uid: 14808
-    components:
-    - type: Transform
-      pos: 71.48609,-23.370214
-      parent: 2
 - proto: ToyFigurineBotanist
   entities:
   - uid: 12721
@@ -89098,7 +89760,7 @@ entities:
       parent: 2
 - proto: VendingMachineSalvage
   entities:
-  - uid: 12804
+  - uid: 14813
     components:
     - type: Transform
       pos: -14.5,-35.5
@@ -95600,6 +96262,24 @@ entities:
       rot: 3.141592653589793 rad
       pos: 16.5,-27.5
       parent: 2
+  - uid: 9900
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -44.5,0.5
+      parent: 2
+  - uid: 10081
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -47.5,1.5
+      parent: 2
+  - uid: 11930
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -43.5,-1.5
+      parent: 2
   - uid: 13957
     components:
     - type: Transform
@@ -97739,6 +98419,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 16.5,13.5
       parent: 2
+  - uid: 14728
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -45.5,0.5
+      parent: 2
   - uid: 15550
     components:
     - type: Transform
@@ -98303,10 +98989,13 @@ entities:
       parent: 2
     - type: ChamberMagazineAmmoProvider
       boltClosed: True
-- proto: WeaponRevolverSnub
+- proto: WeaponPistolViperWood
   entities:
-  - uid: 9901
+  - uid: 10082
     components:
+    - type: MetaData
+      desc: A small, low-power pistol with pleasant lacquered wooden grips. It was taken by the HOS as a trophy from one of their best arrest...                  Uses .35 auto ammo.
+      name: engraved viper
     - type: Transform
       parent: 9899
     - type: Physics
@@ -98577,62 +99266,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 26.5,-34.5
       parent: 2
-- proto: WindoorSecureCommandLocked
-  entities:
-  - uid: 14493
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 7.5,-54.5
-      parent: 2
-  - uid: 14494
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,-52.5
-      parent: 2
-  - uid: 14495
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 7.5,-53.5
-      parent: 2
-  - uid: 14496
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,-53.5
-      parent: 2
-  - uid: 14497
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 7.5,-52.5
-      parent: 2
-  - uid: 14498
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,-54.5
-      parent: 2
-  - uid: 14727
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 65.5,-28.5
-      parent: 2
-  - uid: 14728
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 65.5,-27.5
-      parent: 2
-  - uid: 14729
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 65.5,-26.5
-      parent: 2
 - proto: WindoorSecureEngineeringLocked
   entities:
   - uid: 14499
@@ -98738,6 +99371,12 @@ entities:
       parent: 2
 - proto: Window
   entities:
+  - uid: 11979
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-37.5
+      parent: 2
   - uid: 14512
     components:
     - type: Transform
@@ -99183,6 +99822,18 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -26.5,-20.5
       parent: 2
+  - uid: 14729
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-41.5
+      parent: 2
+  - uid: 14755
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-39.5
+      parent: 2
 - proto: WindowDirectional
   entities:
   - uid: 14600
diff --git a/Resources/Migrations/migration.yml b/Resources/Migrations/migration.yml
index 57636eae33b..1ad319593c8 100644
--- a/Resources/Migrations/migration.yml
+++ b/Resources/Migrations/migration.yml
@@ -427,3 +427,38 @@ BlueprintFlare: null
 
 # 2024-10-04
 BaseAdvancedPen: Pen
+
+# 2024-10-09
+# Removal of separate borg chassis parts, replace them with generic borg parts.
+LeftArmBorgEngineer: LeftArmBorg
+RightArmBorgEngineer: RightArmBorg
+LeftLegBorgEngineer: LeftLegBorg
+RightLegBorgEngineer: RightLegBorg
+HeadBorgEngineer: LightHeadBorg
+TorsoBorgEngineer: TorsoBorg
+
+LeftArmBorgMedical: LeftArmBorg
+RightArmBorgMedical: RightArmBorg
+LeftLegBorgMedical: LeftLegBorg
+RightLegBorgMedical: RightLegBorg
+HeadBorgMedical: LightHeadBorg
+TorsoBorgMedical: TorsoBorg
+
+LeftArmBorgMining: LeftArmBorg
+RightArmBorgMining: RightArmBorg
+LeftLegBorgMining: LeftLegBorg
+RightLegBorgMining: RightLegBorg
+HeadBorgMining: LightHeadBorg
+TorsoBorgMining: TorsoBorg
+
+LeftArmBorgService: LeftArmBorg
+RightArmBorgService: RightArmBorg
+LeftLegBorgService: LeftLegBorg
+RightLegBorgService: RightLegBorg
+HeadBorgService: LightHeadBorg
+TorsoBorgService: TorsoBorg
+
+LeftLegBorgJanitor: LeftLegBorg
+RightLegBorgJanitor: RightLegBorg
+HeadBorgJanitor: LightHeadBorg
+TorsoBorgJanitor: TorsoBorg
diff --git a/Resources/Prototypes/Actions/borgs.yml b/Resources/Prototypes/Actions/borgs.yml
index a0168ef00fc..0f635ba3ec6 100644
--- a/Resources/Prototypes/Actions/borgs.yml
+++ b/Resources/Prototypes/Actions/borgs.yml
@@ -10,3 +10,15 @@
       state: state-laws
     event: !type:ToggleLawsScreenEvent
     useDelay: 0.5
+
+- type: entity
+  id: ActionSelectBorgType
+  name: Select Cyborg Type
+  components:
+  - type: InstantAction
+    itemIconStyle: NoItem
+    icon:
+      sprite: Interface/Actions/actions_borg.rsi
+      state: select-type
+    event: !type:BorgToggleSelectTypeEvent
+    useDelay: 0.5
diff --git a/Resources/Prototypes/Actions/polymorph.yml b/Resources/Prototypes/Actions/polymorph.yml
index 81feba4eacc..291400ab388 100644
--- a/Resources/Prototypes/Actions/polymorph.yml
+++ b/Resources/Prototypes/Actions/polymorph.yml
@@ -40,3 +40,53 @@
     icon:
       sprite: Objects/Fun/immovable_rod.rsi
       state: icon
+
+- type: entity
+  id: ActionPolymorphJaunt
+  name: Ethereal Jaunt
+  description: Melt into the Ethereal Plane for a quick getaway!
+  components:
+  - type: Magic
+  - type: InstantAction
+    useDelay: 30
+    event: !type:PolymorphActionEvent
+      protoId: Jaunt
+    itemIconStyle: NoItem
+    icon:
+      sprite: Objects/Magic/magicactions.rsi
+      state: jaunt
+    # TODO: Effect ECS (from cardboard box)
+  - type: ActionUpgrade
+    effectedLevels:
+      2: ActionPolymorphJauntII
+      3: ActionPolymorphJauntIII
+
+- type: entity
+  id: ActionPolymorphJauntII
+  parent: ActionPolymorphJaunt
+  name: Ethereal Jaunt II
+  description: Melt into the Ethereal Plane for an even quicker getaway!
+  components:
+  - type: InstantAction
+    useDelay: 25
+    event: !type:PolymorphActionEvent
+      protoId: Jaunt
+    itemIconStyle: NoItem
+    icon:
+      sprite: Objects/Magic/magicactions.rsi
+      state: jaunt
+
+- type: entity
+  id: ActionPolymorphJauntIII
+  parent: ActionPolymorphJaunt
+  name: Ethereal Jaunt III
+  description: Are you even tangible anymore?
+  components:
+  - type: InstantAction
+    useDelay: 20
+    event: !type:PolymorphActionEvent
+      protoId: Jaunt
+    itemIconStyle: NoItem
+    icon:
+      sprite: Objects/Magic/magicactions.rsi
+      state: jaunt
diff --git a/Resources/Prototypes/Alerts/alerts.yml b/Resources/Prototypes/Alerts/alerts.yml
index 80fcc44a559..859f223730b 100644
--- a/Resources/Prototypes/Alerts/alerts.yml
+++ b/Resources/Prototypes/Alerts/alerts.yml
@@ -13,6 +13,7 @@
     - alertType: Ensnared
     - category: Buckled
     - alertType: Pulling
+    - alertType: Walking
     - category: Piloting
     - alertType: Corporeal
     - alertType: Stun
@@ -126,6 +127,14 @@
   name: alerts-weightless-name
   description: alerts-weightless-desc
 
+- type: alert
+  id: Walking
+  icons:
+  - sprite: /Textures/Interface/Alerts/walking.rsi
+    state: walking
+  name: alerts-walking-name
+  description: alerts-walking-desc
+
 - type: alert
   id: Stun
   icons:
diff --git a/Resources/Prototypes/Body/Parts/silicon.yml b/Resources/Prototypes/Body/Parts/silicon.yml
index 6b2b3f57d26..3b0f2540963 100644
--- a/Resources/Prototypes/Body/Parts/silicon.yml
+++ b/Resources/Prototypes/Body/Parts/silicon.yml
@@ -28,82 +28,105 @@
     - Robotics
 
 - type: entity
-  id: BaseBorgArmLeft
+  id: LeftArmBorg
   parent: PartSilicon
   name: cyborg left arm
-  abstract: true
   components:
   - type: BodyPart
     partType: Hand
     symmetry: Left
+  - type: Sprite
+    state: borg_l_arm
+  - type: Icon
+    state: borg_l_arm
   - type: Tag
     tags:
     - Trash
     - BorgArm
+    - BorgLArm
 
 - type: entity
-  id: BaseBorgArmRight
+  id: RightArmBorg
   parent: PartSilicon
   name: cyborg right arm
-  abstract: true
   components:
   - type: BodyPart
     partType: Hand
     symmetry: Right
+  - type: Sprite
+    state: borg_r_arm
+  - type: Icon
+    state: borg_r_arm
   - type: Tag
     tags:
     - Trash
     - BorgArm
+    - BorgRArm
 
 - type: entity
-  id: BaseBorgLegLeft
+  id: LeftLegBorg
   parent: PartSilicon
   name: cyborg left leg
-  abstract: true
   components:
   - type: BodyPart
     partType: Leg
     symmetry: Left
+  - type: Sprite
+    state: borg_l_leg
+  - type: Icon
+    state: borg_l_leg
   - type: Tag
     tags:
     - Trash
     - BorgLeg
+    - BorgLLeg
 
 - type: entity
-  id: BaseBorgLegRight
+  id: RightLegBorg
   parent: PartSilicon
   name: cyborg right leg
-  abstract: true
   components:
   - type: BodyPart
     partType: Leg
     symmetry: Right
+  - type: Sprite
+    state: borg_r_leg
+  - type: Icon
+    state: borg_r_leg
   - type: Tag
     tags:
     - Trash
     - BorgLeg
+    - BorgRLeg
 
 - type: entity
-  id: BaseBorgHead
+  id: LightHeadBorg
   parent: PartSilicon
   name: cyborg head
-  abstract: true
   components:
   - type: BodyPart
     partType: Head
+  - type: Sprite
+    state: borg_head
+  - type: Icon
+    state: borg_head
   - type: Tag
     tags:
     - Trash
     - BorgHead
 
 - type: entity
-  id: BaseBorgTorso
+  id: TorsoBorg
   parent: PartSilicon
   name: cyborg torso
-  abstract: true
   components:
   - type: BodyPart
     partType: Torso
+  - type: Sprite
+    state: borg_chest
+  - type: Icon
+    state: borg_chest
   - type: Tag
     tags:
     - Trash
+    - BorgTorso
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
index a194a791852..155e9f15b57 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
@@ -33,7 +33,7 @@
     sprite: Objects/Specific/Service/vending_machine_restock.rsi
     state: base
   product: CrateVendingMachineRestockClothesFilled
-  cost: 3500 # DeltaV
+  cost: 3600 # DeltaV
   category: cargoproduct-category-name-service
   group: market
 
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
index 5e2b6aeb758..4c0a9826de7 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
@@ -30,7 +30,7 @@
     - id: MedkitOxygenFilled
       prob: 0.2
     - id: WeaponFlareGun
-      prob: 0.05
+      prob: 0.1
     - id: BoxMRE
       prob: 0.1
 
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
index 7a1f88870a9..bcf17744f49 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
@@ -53,13 +53,17 @@
     ClothingUniformJumpskirtCasualPurple: 2
     ClothingUniformJumpsuitCasualRed: 2
     ClothingUniformJumpskirtCasualRed: 2
-    ClothingUniformJumpsuitTshirtJeans: 2 # Nyano - Clothing addition
-    ClothingUniformJumpsuitTshirtJeansGray: 2 # Nyano - Clothing addition
-    ClothingUniformJumpsuitTshirtJeansPeach: 2 # Nyano - Clothing addition
-    ClothingUniformJumpsuitJeansGreen: 2 # Nyano - Clothing addition
-    ClothingUniformJumpsuitJeansRed: 2 # Nyano - Clothing addition
-    ClothingUniformJumpsuitJeansBrown: 2 # Nyano - Clothing addition
-    ClothingUniformJumpsuitLostTourist: 2 # Nyano - Clothing addition
+    ClothingUniformJumpsuitCasualGreen: 2
+    ClothingUniformJumpskirtCasualGreen: 2
+    # Begin Nyano Additions
+    ClothingUniformJumpsuitTshirtJeans: 2
+    ClothingUniformJumpsuitTshirtJeansGray: 2
+    ClothingUniformJumpsuitTshirtJeansPeach: 2
+    ClothingUniformJumpsuitJeansGreen: 2
+    ClothingUniformJumpsuitJeansRed: 2
+    ClothingUniformJumpsuitJeansBrown: 2
+    ClothingUniformJumpsuitLostTourist: 2
+    # End Nyano Additions
     # DO NOT ADD MORE, USE UNIFORM DYING
     ClothingShoesColorBlack: 8
     ClothingShoesColorBrown: 4
@@ -81,16 +85,18 @@
     ClothingHeadHatBlacksoft: 2
     ClothingHeadHatPurplesoft: 2
     ClothingHeadHatCorpsoft: 2
-    ClothingOuterWinterCoat: 2 # Nyano - Clothing addition
-    ClothingOuterWinterCoatLong: 2 # Nyano - Clothing addition
-    ClothingOuterWinterCoatPlaid: 2 # Nyano - Clothing addition
-    ClothingOuterCoatHyenhSweater: 2 # Nyano - Clothing addition
-    ClothingOuterCoatLettermanBlue: 2 # Nyano - Clothing addition
-    ClothingOuterCoatLettermanRed: 2 # Nyano - Clothing addition
-    ClothingOuterDenimJacket: 2 # DeltaV - Clothing addition
-    ClothingOuterCorporateJacket: 2 # DeltaV - Clothing addition
-    ClothingShoesBootsFishing: 2 # Nyano - Clothing addition
-    ClothingHeadTinfoil: 2 # Nyano - Clothing addition
+    # Begin Nyano/DeltaV Additions
+    ClothingOuterWinterCoat: 2
+    ClothingOuterWinterCoatLong: 2
+    ClothingOuterWinterCoatPlaid: 2
+    ClothingOuterCoatHyenhSweater: 2
+    ClothingOuterCoatLettermanBlue: 2
+    ClothingOuterCoatLettermanRed: 2
+    ClothingOuterDenimJacket: 2
+    ClothingOuterCorporateJacket: 2
+    ClothingShoesBootsFishing: 2
+    ClothingHeadTinfoil: 2
+    # End Nyano Additions
     ClothingHeadFishCap: 2
     ClothingHeadRastaHat: 2
     ClothingBeltStorageWaistbag: 3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml
index 9fa3499e15c..7722f001a3b 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml
@@ -5,6 +5,8 @@
     FoodSnackNutribrick: 5
     FoodSnackMREBrownie: 5
     FoodCondimentPacketKetchup: 5
+    ReagentTinPowderedMilkSoy: 2
+    ReagentTinPowderedJuiceOrange: 1
   emaggedInventory:
     KitchenKnife: 2
     SpaceMedipen: 3
diff --git a/Resources/Prototypes/Catalog/spellbook_catalog.yml b/Resources/Prototypes/Catalog/spellbook_catalog.yml
index 38b95c3273c..805c157f1e3 100644
--- a/Resources/Prototypes/Catalog/spellbook_catalog.yml
+++ b/Resources/Prototypes/Catalog/spellbook_catalog.yml
@@ -77,6 +77,20 @@
   - !type:ListingLimitedStockCondition
     stock: 1
 
+- type: listing
+  id: SpellbookJaunt
+  name: spellbook-ethereal-jaunt-name
+  description: spellbook-ethereal-jaunt-description
+  productAction: ActionPolymorphJaunt
+  productUpgradeId: SpellbookJauntUpgrade
+  cost:
+    WizCoin: 2
+  categories:
+  - SpellbookUtility
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 1
+
 # Equipment
 - type: listing
   id: SpellbookWandDoor
@@ -138,3 +152,22 @@
   # manual for now
   - !type:ListingLimitedStockCondition
     stock: 2
+
+- type: listing
+  id: SpellbookJauntUpgrade
+  productUpgradeId: SpellbookJauntUpgrade
+  name: spellbook-upgrade-jaunt-name
+  description: spellbook-upgrade-jaunt-description
+  icon:
+    sprite: Objects/Magic/magicactions.rsi
+    state: jaunt
+  cost:
+    WizCoin: 2
+  categories:
+  - SpellbookUtility
+  conditions:
+  - !type:BuyBeforeCondition
+    whitelist:
+    - SpellbookJaunt
+  - !type:ListingLimitedStockCondition
+    stock: 2
diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml
index d098c20fd60..d2539f0ea10 100644
--- a/Resources/Prototypes/Damage/modifier_sets.yml
+++ b/Resources/Prototypes/Damage/modifier_sets.yml
@@ -192,7 +192,7 @@
   id: Moth # Slightly worse at everything but cold
   coefficients:
     Cold: 0.7
-    Heat: 1.3
+    Heat: 1.1 # DeltaV: was 1.3, too extreme
 
 - type: damageModifierSet
   id: Vox
diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_food.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_food.yml
index 42b4d57e910..f8645aa058a 100644
--- a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_food.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_food.yml
@@ -27,3 +27,33 @@
   cost: 6000 # Thanks bounties
   category: Food
   group: market
+
+- type: cargoProduct
+  id: FoodEmergencyPie
+  icon:
+    sprite: Objects/Consumable/Food/Baked/pie.rsi
+    state: tin
+  product: CrateFoodEmergencyPie
+  cost: 3333
+  category: Food
+  group: market
+
+- type: cargoProduct
+  id: FoodHydroCoDairy
+  icon:
+    sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi
+    state: icon-order-dairy
+  product: CrateHydroCoDairy
+  cost: 1500
+  category: Food
+  group: market
+
+- type: cargoProduct
+  id: FoodHydroCoJuice
+  icon:
+    sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi
+    state: icon-order-juices
+  product: CrateHydroCoJuice
+  cost: 1500
+  category: Food
+  group: market
diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml
index 343ec4d5333..65b07de0c87 100644
--- a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml
@@ -7,3 +7,13 @@
   cost: 1100
   category: Service
   group: market
+
+- type: cargoProduct
+  id: CrateVendingMachineRestockSustenance
+  icon:
+    sprite: Objects/Specific/Service/vending_machine_restock.rsi
+    state: base
+  product: CrateVendingMachineRestockSustenanceFilled
+  cost: 750
+  category: Service
+  group: market
diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml
index 6e273a72c48..fc4a8424f08 100644
--- a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml
@@ -29,3 +29,96 @@
           amount: 1
         - id: FoodBoxDonkpocketDink
           prob: 0.1
+
+- type: entity
+  id: CrateFoodEmergencyPie
+  parent: CratePlastic
+  name: emergency pie delivery
+  description: '"Then let them eat pie."'
+  components:
+  - type: StorageFill
+    contents:
+    - id: FoodPieBananaCream
+      amount: 13
+
+- type: entity
+  parent: CratePlastic
+  id: CrateHydroCoDairy
+  name: HydroCo Dairy crate
+  description: A shipment of powdered dairy products from HydroCo. Contains powdered milk and soy milk.
+  components:
+    - type: StorageFill
+      contents:
+        - id: PaperCrateHydroCoConsumption
+        - id: SpoonPlastic
+          amount: 2
+        - id: ReagentTinPowderedMilk
+          amount: 2
+        - id: ReagentTinPowderedMilkSoy
+          amount: 2
+
+- type: entity
+  parent: CratePlastic
+  id: CrateHydroCoJuice
+  name: HydroCo Juice crate
+  description: A variety pack of powdered juice products from HydroCo.
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:AllSelector
+        children:
+        - !type:NestedSelector
+          tableId: FillHydroCoJuiceMix
+        - !type:NestedSelector
+          tableId: FillHydroCoJuiceRandomTin
+          prob: 0.15
+        - id: SpoonPlastic
+          amount: !type:ConstantNumberSelector
+            value: 2
+        - id: PaperCrateHydroCoConsumption
+
+- type: entityTable
+  id: FillHydroCoJuiceMix
+  table: !type:AllSelector
+    children:
+    # Citrus
+    - !type:GroupSelector
+      children:
+      - id: ReagentTinPowderedJuiceOrange
+      - id: ReagentTinPowderedJuiceLime
+      - id: ReagentTinPowderedJuiceLemon
+    # Berry
+    - !type:GroupSelector
+      children:
+      - id: ReagentTinPowderedJuiceBerry
+      - id: ReagentTinPowderedJuiceGrape
+      - id: ReagentTinPowderedJuiceCherry
+    # Tropical
+    - !type:GroupSelector
+      children:
+      - id: ReagentTinPowderedJuicePineapple
+      - id: ReagentTinPowderedJuiceBanana
+      - id: ReagentTinPowderedJuiceWatermelon
+    # Garden
+    - !type:GroupSelector
+      children:
+      - id: ReagentTinPowderedJuiceApple
+      - id: ReagentTinPowderedJuiceCarrot
+      - id: ReagentTinPowderedJuiceTomato
+
+- type: entityTable
+  id: FillHydroCoJuiceRandomTin
+  table: !type:GroupSelector
+    children:
+    - id: ReagentTinPowderedJuiceLemon
+    - id: ReagentTinPowderedJuiceLime
+    - id: ReagentTinPowderedJuiceOrange
+    - id: ReagentTinPowderedJuicePineapple
+    - id: ReagentTinPowderedJuiceBanana
+    - id: ReagentTinPowderedJuiceWatermelon
+    - id: ReagentTinPowderedJuiceBerry
+    - id: ReagentTinPowderedJuiceGrape
+    - id: ReagentTinPowderedJuiceCherry
+    - id: ReagentTinPowderedJuiceApple
+    - id: ReagentTinPowderedJuiceCarrot
+    - id: ReagentTinPowderedJuiceTomato
diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml
index 985b0443e2b..11883c41332 100644
--- a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml
@@ -4,4 +4,12 @@
   components:
   - type: StorageFill
     contents:
-      - id: VendingMachineRestockPride
\ No newline at end of file
+      - id: VendingMachineRestockPride
+
+- type: entity
+  id: CrateVendingMachineRestockSustenanceFilled
+  parent: CratePlastic
+  components:
+  - type: StorageFill
+    contents:
+    - id: VendingMachineRestockSustenance
diff --git a/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml b/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml
index 05a7582cd35..2e428c8f8d9 100644
--- a/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml
@@ -95,8 +95,9 @@
   productEntity: BaseBallBatHomeRun
   icon:
     entity: BaseBallBatHomeRun
+  discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 10
+    Telecrystal: 6
   cost:
     Telecrystal: 16
   categories:
diff --git a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/Random/solar.yml b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/Random/solar.yml
new file mode 100644
index 00000000000..cef6006c0f0
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/Random/solar.yml
@@ -0,0 +1,15 @@
+- type: entity
+  parent: MarkerBase
+  id: RandomSolarPanelState
+  name: Random solar panel
+  components:
+  - type: Sprite
+    layers:
+      - sprite: DeltaV/Structures/Power/Generation/solar_panel.rsi
+        state: random_solar
+  - type: RandomSpawner
+    offset: 0
+    prototypes:
+      - SolarPanel
+      - SolarPanelBroken
+    chance: 0.83
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml
index e8b79da9308..bae94e7b165 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml
@@ -1,60 +1,7 @@
 - type: entity
   id: BorgChassisSecurity
-  parent: BaseBorgChassisNT
+  parent: BorgChassisSelectable
   name: security cyborg
   components:
-  - type: Sprite
-    sprite: DeltaV/Mobs/Silicon/chassis.rsi
-    layers:
-    - state: security
-    - state: security_e_r
-      map: ["enum.BorgVisualLayers.Light"]
-      shader: unshaded
-      visible: false
-    - state: security_l
-      shader: unshaded
-      map: ["light"]
-      visible: false
-  - type: BorgChassis
-    maxModules: 4
-    moduleWhitelist:
-      tags:
-      - BorgModuleGeneric
-      - BorgModuleSecurity
-    hasMindState: security_e
-    noMindState: security_e_r
-  - type: Construction
-    node: security
-  - type: IntrinsicRadioReceiver
-  - type: IntrinsicRadioTransmitter
-    channels:
-    - Binary
-    - Common
-    - Science
-    - Security
-  - type: ActiveRadio
-    channels:
-    - Binary
-    - Common
-    - Science
-    - Security
-  - type: AccessReader
-    access: [["Security"], ["Command"], ["Research"]]
-  - type: ShowJobIcons
-  - type: ShowMindShieldIcons
-  - type: ShowCriminalRecordIcons
-  - type: SiliconLawProvider
-    laws: SiliconPolice
-  - type: MobThresholds
-    thresholds:
-      0: Alive
-      80: Critical # -20 to Crit Threshold
-      200: Dead
-  - type: FlashImmunity
-  - type: Speech
-    speechVerb: Robotic
-  - type: BorgTransponder
-    sprite:
-      sprite: Mobs/Silicon/chassis.rsi
-      state: peace
-    name: Security Cyborg
+  - type: BorgSwitchableType
+    selectedBorgType: security
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/silicon.yml
index d0716a36170..561cbfb4507 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/silicon.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/silicon.yml
@@ -1,16 +1,12 @@
-
 - type: entity
   id: PlayerBorgMedical
   parent: BorgChassisMedical
-  suffix: Diagnosis, Treatment
+  suffix: Battery
   components:
   - type: ContainerFill
     containers:
       borg_brain:
-      - PositronicBrain
-      borg_module:
-      - BorgModuleDiagnosis
-      - BorgModuleTreatment
+      - MMIFilled
   - type: ItemSlots
     slots:
       cell_slot:
@@ -22,16 +18,12 @@
 - type: entity
   parent: BorgChassisSecurity
   id: PlayerBorgSecurity
-  suffix: Peacekeeper, Patrol, Bastion
+  suffix: Battery
   components:
   - type: ContainerFill
     containers:
       borg_brain:
-      - PositronicBrain
-      borg_module:
-      - BorgModuleSecurityPeacekeeper
-      - BorgModuleSecurityPatrol
-      - BorgModuleSecurityBastion
+      - MMIFilled
   - type: ItemSlots
     slots:
       cell_slot:
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/powdered_drinks.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/powdered_drinks.yml
new file mode 100644
index 00000000000..3e242a07f2a
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/powdered_drinks.yml
@@ -0,0 +1,339 @@
+- type: entity
+  abstract: true
+  parent: ReagentContainerBase
+  id: ReagentTinBase
+  components:
+  - type: Openable
+    openableByHand: false
+    sound:
+      path: /Audio/Items/can_open3.ogg
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.OpenableVisuals.Opened:
+        enum.OpenableVisuals.Layer:
+          True: {state: "icon-open"}
+          False: {state: "icon"}
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 50
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 6
+      behaviors:
+      - !type:OpenBehavior
+  - type: Item
+    sprite: Objects/Consumable/Food/snacks.rsi
+    heldPrefix: packet
+    size: Normal
+  - type: DamageOnLand
+    damage:
+      types:
+        Blunt: 3
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Blunt: 3
+  - type: Damageable
+    damageContainer: Inorganic
+  - type: StaticPrice
+    price: 50
+
+- type: entity
+  parent: ReagentTinBase
+  id: ReagentTinPowderedJuiceOrange
+  name: tin of powdered orange juice
+  description: A container of powdered orange juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi
+    layers:
+    - state: icon
+      map: ["enum.OpenableVisuals.Layer"]
+    - state: overlay-container
+      color: "#FFC420"
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 50
+        reagents:
+        - ReagentId: PowderedJuiceOrange
+          Quantity: 50
+
+- type: entity
+  parent: ReagentTinBase
+  id: ReagentTinPowderedMilk
+  name: tin of powdered milk
+  description: A container of powdered milk manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the milk.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi
+    layers:
+    - state: icon
+      map: ["enum.OpenableVisuals.Layer"]
+    - state: overlay-container
+      color: "#FAFAFA"
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 50
+        reagents:
+        - ReagentId: PowderedMilk
+          Quantity: 50
+
+- type: entity
+  parent: ReagentTinBase
+  id: ReagentTinPowderedMilkSoy
+  name: tin of powdered soy milk
+  description: A container of powdered soy milk manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the milk.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi
+    layers:
+    - state: icon
+      map: ["enum.OpenableVisuals.Layer"]
+    - state: overlay-container
+      color: "#FFFCE3"
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 50
+        reagents:
+        - ReagentId: PowderedMilkSoy
+          Quantity: 50
+
+- type: entity
+  parent: ReagentTinBase
+  id: ReagentTinPowderedJuiceLime
+  name: tin of powdered lime juice
+  description: A container of powdered lime juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi
+    layers:
+    - state: icon
+      map: ["enum.OpenableVisuals.Layer"]
+    - state: overlay-container
+      color: "#B4FF64"
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 50
+        reagents:
+        - ReagentId: PowderedJuiceLime
+          Quantity: 50
+
+- type: entity
+  parent: ReagentTinBase
+  id: ReagentTinPowderedJuiceLemon
+  name: tin of powdered lemon juice
+  description: A container of powdered lemon juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi
+    layers:
+    - state: icon
+      map: ["enum.OpenableVisuals.Layer"]
+    - state: overlay-container
+      color: "#FFFC69"
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 50
+        reagents:
+        - ReagentId: PowderedJuiceLemon
+          Quantity: 50
+
+- type: entity
+  parent: ReagentTinBase
+  id: ReagentTinPowderedJuicePineapple
+  name: tin of powdered pineapple juice
+  description: A container of powdered pineapple juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi
+    layers:
+    - state: icon
+      map: ["enum.OpenableVisuals.Layer"]
+    - state: overlay-container
+      color: "#FFD644"
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 50
+        reagents:
+        - ReagentId: PowderedJuicePineapple
+          Quantity: 50
+
+- type: entity
+  parent: ReagentTinBase
+  id: ReagentTinPowderedJuiceBanana
+  name: tin of powdered banana juice
+  description: A container of powdered banana juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi
+    layers:
+    - state: icon
+      map: ["enum.OpenableVisuals.Layer"]
+    - state: overlay-container
+      color: "#FFFEBF"
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 50
+        reagents:
+        - ReagentId: PowderedJuiceBanana
+          Quantity: 50
+
+- type: entity
+  parent: ReagentTinBase
+  id: ReagentTinPowderedJuiceBerry
+  name: tin of powdered berry juice
+  description: A container of powdered berry juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi
+    layers:
+    - state: icon
+      map: ["enum.OpenableVisuals.Layer"]
+    - state: overlay-container
+      color: "#D366FF"
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 50
+        reagents:
+        - ReagentId: PowderedJuiceBerry
+          Quantity: 50
+
+- type: entity
+  parent: ReagentTinBase
+  id: ReagentTinPowderedJuiceWatermelon
+  name: tin of powdered melon juice
+  description: A container of powdered watermelon juice manufactured by HydroCo. NOTE - Melon only; water not included, sold separately. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi
+    layers:
+    - state: icon
+      map: ["enum.OpenableVisuals.Layer"]
+    - state: overlay-container
+      color: "#FFBCDB"
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 50
+        reagents:
+        - ReagentId: PowderedJuiceWatermelon
+          Quantity: 50
+
+- type: entity
+  parent: ReagentTinBase
+  id: ReagentTinPowderedJuiceGrape
+  name: tin of powdered grape juice
+  description: A container of powdered grape juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi
+    layers:
+    - state: icon
+      map: ["enum.OpenableVisuals.Layer"]
+    - state: overlay-container
+      color: "#E57DFF"
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 50
+        reagents:
+        - ReagentId: PowderedJuiceGrape
+          Quantity: 50
+
+- type: entity
+  parent: ReagentTinBase
+  id: ReagentTinPowderedJuiceApple
+  name: tin of powdered apple juice
+  description: A container of powdered apple juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi
+    layers:
+    - state: icon
+      map: ["enum.OpenableVisuals.Layer"]
+    - state: overlay-container
+      color: "#FFC67E"
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 50
+        reagents:
+        - ReagentId: PowderedJuiceApple
+          Quantity: 50
+
+- type: entity
+  parent: ReagentTinBase
+  id: ReagentTinPowderedJuiceCherry
+  name: tin of powdered cherry juice
+  description: A container of powdered cherry juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi
+    layers:
+    - state: icon
+      map: ["enum.OpenableVisuals.Layer"]
+    - state: overlay-container
+      color: "#A9536C"
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 50
+        reagents:
+        - ReagentId: PowderedJuiceCherry
+          Quantity: 50
+
+- type: entity
+  parent: ReagentTinBase
+  id: ReagentTinPowderedJuiceCarrot
+  name: tin of powdered carrot juice
+  description: A container of powdered carrot juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi
+    layers:
+    - state: icon
+      map: ["enum.OpenableVisuals.Layer"]
+    - state: overlay-container
+      color: "#FFA06B"
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 50
+        reagents:
+        - ReagentId: PowderedJuiceCarrot
+          Quantity: 50
+
+- type: entity
+  parent: ReagentTinBase
+  id: ReagentTinPowderedJuiceTomato
+  name: tin of powdered tomato juice
+  description: A container of powdered tomato juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi
+    layers:
+    - state: icon
+      map: ["enum.OpenableVisuals.Layer"]
+    - state: overlay-container
+      color: "#D85553"
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 50
+        reagents:
+        - ReagentId: PowderedJuiceTomato
+          Quantity: 50
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/meals.yml
index c262a36b825..0c9bb8937c9 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/meals.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/meals.yml
@@ -14,12 +14,12 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 15
+        maxVol: 20
         reagents:
         - ReagentId: Nutriment
-          Quantity: 6
+          Quantity: 12
         - ReagentId: Vitamin
-          Quantity: 2
+          Quantity: 3
   - type: FoodSequenceElement # unlimited power
     entries:
       Burger: GrilledCheese
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/soup.yml
index b6befccafb2..e9b3f3b6003 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/soup.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/soup.yml
@@ -16,12 +16,12 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 10
+        maxVol: 15
         reagents:
         - ReagentId: Nutriment
           Quantity: 5
         - ReagentId: Protein
-          Quantity: 5
+          Quantity: 10
   - type: FoodSequenceElement
     entries:
       Burger: ScrambledEggs
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml
index 1c7b822add4..46ab909d2a6 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml
@@ -56,3 +56,63 @@
     backgroundModulate: "#ead9cc"
     backgroundPatchMargin: 16.0, 16.0, 16.0, 16.0
     contentMargin: 32.0, 16.0, 32.0, 0.0
+
+  parent: Paper
+  id: PaperCrateHydroCoConsumption
+  name: HydroCo Notice
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Paper
+    stampState: paper_stamp-generic
+    stampedBy:
+    - stampedColor: '#8F99D6FF'
+      stampedName: HydroCo
+    content: |2
+
+      [head=1]HydroCo - Hydrate Tastefully[/head]
+
+      [bold]Consumption Notice[/bold]
+      HydroCo reminds all customers that powdered products
+      are NOT meant for direct consumption. Attempting to eat
+      the powder directly is a choking hazard and may result
+      in severe discomfort.
+
+      Always mix with water according to package instructions
+      before consuming.
+
+      Thank you for choosing HydroCo!
+      Enjoy your drinks!
+
+- type: entity
+  parent: Paper
+  id: PaperMailHydroCoTrial
+  name: HydroCo Trial Message
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Paper
+    stampState: paper_stamp-generic
+    stampedBy:
+    - stampedColor: '#8F99D6FF'
+      stampedName: HydroCo
+    content: |2
+
+      [head=1]HydroCo - Hydrate Tastefully[/head]
+
+      [bold]Dear Recipient,[/bold]
+      you have been selected among thousands of potential
+      beneficiaries to receive a full-size trial tin of HydroCo
+      powdered juice!
+
+      We think you will enjoy the flavor and hope to see you
+      as a returning customer.
+
+      [bold]Consumption Notice[/bold]
+      HydroCo reminds all customers that powdered products
+      are NOT meant for direct consumption. Attempting to eat
+      the powder directly is a choking hazard and may result in
+      severe discomfort.
+
+      Always mix with water according to package instructions
+      before consuming.
+
+      Enjoy your drinks!
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml
index 3d5d66fc2a2..2fa02ebc002 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml
@@ -1698,3 +1698,37 @@
       orGroup: Coat
     - id: ClothingOuterWinterCoatPlaid
       orGroup: Coat
+
+- type: entity
+  parent: BaseMail
+  id: MailHydroCoPowderJuice
+  suffix: HydroCo powder juice
+  components:
+  - type: Mail
+    contents:
+    - id: ReagentTinPowderedJuiceLemon
+      orGroup: Juice
+    - id: ReagentTinPowderedJuiceLime
+      orGroup: Juice
+    - id: ReagentTinPowderedJuicePineapple
+      orGroup: Juice
+    - id: ReagentTinPowderedJuiceBanana
+      orGroup: Juice
+    - id: ReagentTinPowderedJuiceBerry
+      orGroup: Juice
+    - id: ReagentTinPowderedJuiceWatermelon
+      orGroup: Juice
+    - id: ReagentTinPowderedJuiceGrape
+      orGroup: Juice
+    - id: ReagentTinPowderedJuiceApple
+      orGroup: Juice
+    - id: ReagentTinPowderedJuiceCherry
+      orGroup: Juice
+    - id: ReagentTinPowderedJuiceCarrot
+      orGroup: Juice
+    - id: ReagentTinPowderedJuiceTomato
+      orGroup: Juice
+    - id: SpoonPlastic
+      amount: 1
+    - id: PaperMailHydroCoTrial
+      amount: 1
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Medical/healing.yml
new file mode 100644
index 00000000000..bd0bfd5f580
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Medical/healing.yml
@@ -0,0 +1,278 @@
+- type: entity
+  parent: Pill
+  id: PillSoretizone
+  suffix: Soretizone 10u
+  components:
+  - type: Pill
+    pillType: 14
+  - type: Sprite
+    state: pill15
+  - type: Label
+    currentLabel: soretizone 10u
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 20
+        reagents:
+        - ReagentId: Soretizone
+          Quantity: 10
+
+- type: entity
+  parent: PillCanister
+  id: PillCanisterSoretizone
+  suffix: Soretizone 10u, 5
+  components:
+  - type: Label
+    currentLabel: soretizone 10u
+  - type: StorageFill
+    contents:
+    - id: PillSoretizone
+      amount: 5
+
+- type: entity
+  parent: Pill
+  id: PillSerenitol
+  suffix: Serenitol 10u
+  components:
+  - type: Sprite
+    state: pill10
+  - type: Pill
+    pillType: 9
+  - type: Label
+    currentLabel: serenitol 10u
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 20
+        reagents:
+        - ReagentId: Serenitol
+          Quantity: 10
+
+- type: entity
+  parent: PillCanister
+  id: PillCanisterSerenitol
+  suffix: Serenitol 10u, 5
+  components:
+  - type: Label
+    currentLabel: serenitol 10u
+  - type: StorageFill
+    contents:
+    - id: PillSerenitol
+      amount: 5
+
+- type: entity
+  parent: Pill
+  id: PillNeurozenium
+  suffix: Neurozenium 10u
+  components:
+  - type: Sprite
+    state: pill8
+  - type: Pill
+    pillType: 7
+  - type: Label
+    currentLabel: neurozenium 10u
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 20
+        reagents:
+        - ReagentId: Neurozenium
+          Quantity: 10
+
+- type: entity
+  parent: PillCanister
+  id: PillCanisterNeurozenium
+  suffix: Neurozenium 10u, 5
+  components:
+  - type: Label
+    currentLabel: neurozenium 10u
+  - type: StorageFill
+    contents:
+    - id: PillNeurozenium
+      amount: 5
+
+- type: entity
+  parent: Pill
+  id: PillEquilibrazine
+  suffix: Equilibrazine 5u
+  components:
+  - type: Sprite
+    state: pill2
+  - type: Pill
+    pillType: 1
+  - type: Label
+    currentLabel: equilibrazine 5u
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 20
+        reagents:
+        - ReagentId: Equilibrazine
+          Quantity: 5
+
+- type: entity
+  parent: PillCanister
+  id: PillCanisterEquilibrazine
+  suffix: Equilibrazine 5u, 5
+  components:
+  - type: Label
+    currentLabel: equilibrazine 5u
+  - type: StorageFill
+    contents:
+    - id: PillEquilibrazine
+      amount: 5
+
+- type: entity
+  parent: Pill
+  id: PillBlissifylovene
+  suffix: Blissifylovene 5u
+  components:
+  - type: Sprite
+    state: pill7
+  - type: Pill
+    pillType: 6
+  - type: Label
+    currentLabel: blissifylovene 5u
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 20
+        reagents:
+        - ReagentId: Blissifylovene
+          Quantity: 5
+
+- type: entity
+  parent: PillCanister
+  id: PillCanisterBlissifylovene
+  suffix: Blissifylovene 5u, 5
+  components:
+  - type: Label
+    currentLabel: blissifylovene 5u
+  - type: StorageFill
+    contents:
+    - id: PillBlissifylovene
+      amount: 5
+
+- type: entity
+  parent: Pill
+  id: PillCalmafluxine
+  suffix: Calmafluxine 10u
+  components:
+  - type: Sprite
+    state: pill15
+  - type: Pill
+    pillType: 14
+  - type: Label
+    currentLabel: calmafluxine 10u
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 20
+        reagents:
+        - ReagentId: Calmafluxine
+          Quantity: 10
+
+- type: entity
+  parent: PillCanister
+  id: PillCanisterCalmafluxine
+  suffix: Calmafluxine 10u, 5
+  components:
+  - type: Label
+    currentLabel: calmafluxine 10u
+  - type: StorageFill
+    contents:
+    - id: PillCalmafluxine
+      amount: 5
+
+- type: entity
+  parent: Pill
+  id: PillTranquinase
+  suffix: Tranquinase 10u
+  components:
+  - type: Sprite
+    state: pill16
+  - type: Pill
+    pillType: 15
+  - type: Label
+    currentLabel: tranquinase 10u
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 20
+        reagents:
+        - ReagentId: Tranquinase
+          Quantity: 10
+
+- type: entity
+  parent: PillCanister
+  id: PillCanisterTranquinase
+  suffix: Tranquinase 10u, 5
+  components:
+  - type: Label
+    currentLabel: tranquinase 10u
+  - type: StorageFill
+    contents:
+    - id: PillTranquinase
+      amount: 5
+
+- type: entity
+  parent: Pill
+  id: PillStubantazine
+  suffix: Stubantazine 10u
+  components:
+  - type: Sprite
+    state: pill3
+  - type: Pill
+    pillType: 2
+  - type: Label
+    currentLabel: stubantazine 10u
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 20
+        reagents:
+        - ReagentId: Stubantazine
+          Quantity: 10
+
+- type: entity
+  parent: PillCanister
+  id: PillCanisterStubantazine
+  suffix: Stubantazine 10u, 5
+  components:
+  - type: Label
+    currentLabel: stubantazine 10u
+  - type: StorageFill
+    contents:
+    - id: PillStubantazine
+      amount: 5
+
+- type: entity
+  parent: Pill
+  id: PillAgonolexyne
+  suffix: agonolexyne 5u
+  components:
+  - type: Sprite
+    state: pill20
+  - type: Pill
+    pillType: 19
+  - type: Label
+    currentLabel: agonolexyne 5u
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 20
+        reagents:
+        - ReagentId: Agonolexyne
+          Quantity: 5
+
+- type: entity
+  parent: PillCanister
+  id: PillCanisterAgonolexyne
+  suffix: Agonolexyne 5u, 5
+  components:
+  - type: Label
+    currentLabel: agonolexyne 5u
+  - type: StorageFill
+    contents:
+    - id: PillAgonolexyne
+      amount: 5
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml
index ce70c9ac4c8..4f434e5ee63 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -11,20 +11,6 @@
 
 # Security Modules
 
-- type: entity
-  id: BorgModuleSecurityPeacekeeper # Peacekeeper Set, Available on Round Start
-  parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ]
-  name: peacekeeper cyborg module
-  components:
-  - type: Sprite
-    layers:
-    - state: security
-    - state: icon-peacekeeper
-  - type: ItemBorgModule
-    items:
-    - WoodBaton
-    - SecurityWhistle
-
 - type: entity
   id: BorgModuleSecurityPatrol # Peacekeeper Set, Available on Round Start
   parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ]
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_parts.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_parts.yml
deleted file mode 100644
index 18616e3ac45..00000000000
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_parts.yml
+++ /dev/null
@@ -1,102 +0,0 @@
-# Security
-
-- type: entity
-  id: LeftArmBorgSecurity
-  parent: BaseBorgArmLeft
-  name: security cyborg left arm
-  components:
-  - type: Sprite
-    sprite: Objects/Specific/Robotics/cyborg_parts.rsi
-    state: security_l_arm
-  - type: Icon
-    sprite: Objects/Specific/Robotics/cyborg_parts.rsi
-    state: security_l_arm
-  - type: Tag
-    tags:
-    - Trash
-    - BorgArm
-    - BorgSecurityLArm
-
-- type: entity
-  id: RightArmBorgSecurity
-  parent: BaseBorgArmRight
-  name: security cyborg right arm
-  components:
-  - type: Sprite
-    sprite: Objects/Specific/Robotics/cyborg_parts.rsi
-    state: security_r_arm
-  - type: Icon
-    sprite: Objects/Specific/Robotics/cyborg_parts.rsi
-    state: security_r_arm
-  - type: Tag
-    tags:
-    - Trash
-    - BorgArm
-    - BorgSecurityRArm
-
-- type: entity
-  id: LeftLegBorgSecurity
-  parent: BaseBorgLegLeft
-  name: security cyborg left leg
-  components:
-  - type: Sprite
-    sprite: Objects/Specific/Robotics/cyborg_parts.rsi
-    state: security_l_leg
-  - type: Icon
-    sprite: Objects/Specific/Robotics/cyborg_parts.rsi
-    state: security_l_leg
-  - type: Tag
-    tags:
-    - Trash
-    - BorgLeg
-    - BorgSecurityLLeg
-
-- type: entity
-  id: RightLegBorgSecurity
-  parent: BaseBorgLegRight
-  name: security cyborg right leg
-  components:
-  - type: Sprite
-    sprite: Objects/Specific/Robotics/cyborg_parts.rsi
-    state: security_r_leg
-  - type: Icon
-    sprite: Objects/Specific/Robotics/cyborg_parts.rsi
-    state: security_r_leg
-  - type: Tag
-    tags:
-    - Trash
-    - BorgLeg
-    - BorgSecurityRLeg
-
-- type: entity
-  id: HeadBorgSecurity
-  parent: BaseBorgHead
-  name: security cyborg head
-  components:
-  - type: Sprite
-    sprite: Objects/Specific/Robotics/cyborg_parts.rsi
-    state: security_head
-  - type: Icon
-    sprite: Objects/Specific/Robotics/cyborg_parts.rsi
-    state: security_head
-  - type: Tag
-    tags:
-    - Trash
-    - BorgHead
-    - BorgSecurityHead
-
-- type: entity
-  id: TorsoBorgSecurity
-  parent: BaseBorgTorso
-  name: security cyborg torso
-  components:
-  - type: Sprite
-    sprite: Objects/Specific/Robotics/cyborg_parts.rsi
-    state: security_chest
-  - type: Icon
-    sprite: Objects/Specific/Robotics/cyborg_parts.rsi
-    state: security_chest
-  - type: Tag
-    tags:
-    - Trash
-    - BorgSecurityTorso
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Service/vending_machine_restock.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Service/vending_machine_restock.yml
index febf8d2765a..281b590e7e4 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Service/vending_machine_restock.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Service/vending_machine_restock.yml
@@ -23,3 +23,19 @@
     - state: green_bit
       shader: unshaded
     - state: refill_pride
+
+- type: entity
+  parent: BaseVendingMachineRestockDeltaV
+  id: VendingMachineRestockSustenance
+  name: Sustenance vendor restock box
+  description: Prisoners have to eat too. Nobody said they had to eat well.
+  components:
+  - type: VendingMachineRestock
+    canRestock:
+    - SustenanceInventory
+  - type: Sprite
+    layers:
+    - state: base
+    - state: green_bit
+      shader: unshaded
+    - state: refill_sustenance
diff --git a/Resources/Prototypes/DeltaV/Entities/Stations/base.yml b/Resources/Prototypes/DeltaV/Entities/Stations/base.yml
index fe31706b262..89f420f1573 100644
--- a/Resources/Prototypes/DeltaV/Entities/Stations/base.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Stations/base.yml
@@ -19,3 +19,6 @@
     - displayName: stock-trading-company-donk
       basePrice: 90
       currentPrice: 90
+    - displayName: stock-trading-company-hydroco
+      basePrice: 30
+      currentPrice: 30
diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml
index f72fbefa079..ad8c59bd1f8 100644
--- a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml
@@ -516,29 +516,7 @@
     containers:
       board: [ DoorElectronicsRobotics ]
 
-# Command-locked External airlocks. These don't exist upstream for some reason.
-- type: entity
-  parent: AirlockExternal
-  id: AirlockExternalCommandLocked
-  suffix: External, Command, Locked
-  components:
-  - type: WiresPanelSecurity
-    securityLevel: medSecurity
-  - type: ContainerFill
-    containers:
-      board: [ DoorElectronicsCommand ]
-
-- type: entity
-  parent: AirlockExternalGlass
-  id: AirlockExternalGlassCommandLocked
-  suffix: External, Glass, Command, Locked
-  components:
-  - type: WiresPanelSecurity
-    securityLevel: medSecurity
-  - type: ContainerFill
-    containers:
-      board: [ DoorElectronicsCommand ]
-
+# Security-locked External airlocks. These don't exist upstream for some reason.
 - type: entity
   parent: AirlockExternal
   id: AirlockExternalSecurityLocked
diff --git a/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/powdered_drinks.yml b/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/powdered_drinks.yml
new file mode 100644
index 00000000000..13cd6bfe11d
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/powdered_drinks.yml
@@ -0,0 +1,191 @@
+- type: reagent
+  id: BasePowderedBeverage
+  abstract: true
+  physicalDesc: reagent-physical-desc-powdery
+  flavor: terrible
+  metabolisms:
+    Poison:
+      effects:
+      - !type:Emote
+        emote: Cough
+        showInChat: true
+        probability: 0.33
+      - !type:ChemVomit
+        probability: 0.1
+        conditions:
+        - !type:ReagentThreshold
+          min: 15
+
+- type: reagent
+  parent: BasePowderedBeverage
+  id: PowderedMilk
+  name: reagent-name-powdered-milk
+  group: Foods
+  desc: reagent-desc-powdered-milk
+  flavor: sweet
+  color: "#FAFAFA"
+
+- type: reagent
+  parent: BasePowderedBeverage
+  id: PowderedMilkSoy
+  name: reagent-name-powdered-milk-soy
+  group: Foods
+  desc: reagent-desc-powdered-milk-soy
+  flavor: soy
+  color: "#FFFCE3"
+
+- type: reagent
+  parent: BasePowderedBeverage
+  id: PowderedJuiceOrange
+  name: reagent-name-powdered-juice-orange
+  group: Foods
+  desc: reagent-desc-powdered-juice-orange
+  flavor: sour
+  color: "#FFC420"
+
+- type: reagent
+  parent: BasePowderedBeverage
+  id: PowderedJuiceLime
+  name: reagent-name-powdered-juice-lime
+  group: Foods
+  desc: reagent-desc-powdered-juice-lime
+  flavor: sour
+  color: "#B4FF64"
+  metabolisms:
+    Poison:
+      effects:
+      - !type:HealthChange
+        damage:
+          types:
+            Caustic: 0.5
+      - !type:Emote
+        emote: Cough
+        showInChat: true
+        probability: 0.33
+      - !type:ChemVomit
+        probability: 0.1
+        conditions:
+        - !type:ReagentThreshold
+          min: 15
+
+- type: reagent
+  parent: BasePowderedBeverage
+  id: PowderedJuiceLemon
+  name: reagent-name-powdered-juice-lemon
+  group: Foods
+  desc: reagent-desc-powdered-juice-lemon
+  flavor: sour
+  color: "#FFFC69"
+  metabolisms:
+    Poison:
+      effects:
+      - !type:HealthChange
+        damage:
+          types:
+            Caustic: 0.5
+      - !type:Emote
+        emote: Cough
+        showInChat: true
+        probability: 0.33
+      - !type:ChemVomit
+        probability: 0.1
+        conditions:
+        - !type:ReagentThreshold
+          min: 15
+
+- type: reagent
+  parent: BasePowderedBeverage
+  id: PowderedJuicePineapple
+  name: reagent-name-powdered-juice-pineapple
+  group: Foods
+  desc: reagent-desc-powdered-juice-pineapple
+  flavor: sour
+  color: "#FFD644"
+  metabolisms:
+    Poison:
+      effects:
+      - !type:HealthChange
+        damage:
+          types:
+            Caustic: 0.5
+      - !type:Emote
+        emote: Cough
+        showInChat: true
+        probability: 0.33
+      - !type:ChemVomit
+        probability: 0.1
+        conditions:
+        - !type:ReagentThreshold
+          min: 15
+
+- type: reagent
+  parent: BasePowderedBeverage
+  id: PowderedJuiceBanana
+  name: reagent-name-powdered-juice-banana
+  group: Foods
+  desc: reagent-desc-powdered-juice-banana
+  flavor: terrible
+  color: "#FFFEBF"
+
+- type: reagent
+  parent: BasePowderedBeverage
+  id: PowderedJuiceBerry
+  name: reagent-name-powdered-juice-berry
+  group: Foods
+  desc: reagent-desc-powdered-juice-berry
+  flavor: bitter
+  color: "#D366FF"
+
+- type: reagent
+  parent: BasePowderedBeverage
+  id: PowderedJuiceWatermelon
+  name: reagent-name-powdered-juice-watermelon
+  group: Foods
+  desc: reagent-desc-powdered-juice-watermelon
+  flavor: terrible
+  color: "#FFBCDB"
+
+- type: reagent
+  parent: BasePowderedBeverage
+  id: PowderedJuiceGrape
+  name: reagent-name-powdered-juice-grape
+  group: Foods
+  desc: reagent-desc-powdered-juice-grape
+  flavor: sour
+  color: "#E57DFF"
+
+- type: reagent
+  parent: BasePowderedBeverage
+  id: PowderedJuiceApple
+  name: reagent-name-powdered-juice-apple
+  group: Foods
+  desc: reagent-desc-powdered-juice-apple
+  flavor: sour
+  color: "#FFC67E"
+
+- type: reagent
+  parent: BasePowderedBeverage
+  id: PowderedJuiceCherry
+  name: reagent-name-powdered-juice-cherry
+  group: Foods
+  desc: reagent-desc-powdered-juice-cherry
+  flavor: sour
+  color: "#A9536C"
+
+- type: reagent
+  parent: BasePowderedBeverage
+  id: PowderedJuiceCarrot
+  name: reagent-name-powdered-juice-carrot
+  group: Foods
+  desc: reagent-desc-powdered-juice-carrot
+  flavor: bitter
+  color: "#FFA06B"
+
+- type: reagent
+  parent: BasePowderedBeverage
+  id: PowderedJuiceTomato
+  name: reagent-name-powdered-juice-tomato
+  group: Foods
+  desc: reagent-desc-powdered-juice-tomato
+  flavor: bitter
+  color: "#D85553"
diff --git a/Resources/Prototypes/DeltaV/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/DeltaV/Recipes/Cooking/meal_recipes.yml
index 22d19ea2f95..d8b0c481e60 100644
--- a/Resources/Prototypes/DeltaV/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/DeltaV/Recipes/Cooking/meal_recipes.yml
@@ -6,7 +6,7 @@
   solids:
     FoodBreadPlainSlice: 2
     FoodCheeseSlice: 1
-    FoodButter: 1
+    FoodButterSlice: 1
 
 - type: microwaveMealRecipe
   id: RecipeScrambledEggs
@@ -17,8 +17,8 @@
     TableSalt: 5
   solids:
     FoodBowlBig: 1
-    FoodEgg: 3
-    FoodButter: 1
+    FoodEgg: 2
+    FoodButterSlice: 1
 
 - type: microwaveMealRecipe
   id: RecipeBlueTomatoSoup
diff --git a/Resources/Prototypes/DeltaV/Recipes/Cooking/powdered_drinks.yml b/Resources/Prototypes/DeltaV/Recipes/Cooking/powdered_drinks.yml
new file mode 100644
index 00000000000..262c40afce2
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Recipes/Cooking/powdered_drinks.yml
@@ -0,0 +1,167 @@
+- type: reaction
+  id: ReconstitutePowderedMilk
+  requiredMixerCategories:
+  - Stir
+  reactants:
+    Water:
+      amount: 1
+    PowderedMilk:
+      amount: 1
+  products:
+    Milk: 2
+
+- type: reaction
+  id: ReconstitutePowderedMilkSoy
+  requiredMixerCategories:
+  - Stir
+  reactants:
+    Water:
+      amount: 1
+    PowderedMilkSoy:
+      amount: 1
+  products:
+    MilkSoy: 2
+
+- type: reaction
+  id: ReconstitutePowderedJuiceOrange
+  requiredMixerCategories:
+  - Stir
+  reactants:
+    Water:
+      amount: 1
+    PowderedJuiceOrange:
+      amount: 1
+  products:
+    JuiceOrange: 2
+
+- type: reaction
+  id: ReconstitutePowderedJuiceLemon
+  requiredMixerCategories:
+  - Stir
+  reactants:
+    Water:
+      amount: 1
+    PowderedJuiceLemon:
+      amount: 1
+  products:
+    JuiceLemon: 2
+
+- type: reaction
+  id: ReconstitutePowderedJuiceLime
+  requiredMixerCategories:
+  - Stir
+  reactants:
+    Water:
+      amount: 1
+    PowderedJuiceLime:
+      amount: 1
+  products:
+    JuiceLime: 2
+
+- type: reaction
+  id: ReconstitutePowderedJuicePineapple
+  requiredMixerCategories:
+  - Stir
+  reactants:
+    Water:
+      amount: 1
+    PowderedJuicePineapple:
+      amount: 1
+  products:
+    JuicePineapple: 2
+
+- type: reaction
+  id: ReconstitutePowderedJuiceBanana
+  requiredMixerCategories:
+  - Stir
+  reactants:
+    Water:
+      amount: 1
+    PowderedJuiceBanana:
+      amount: 1
+  products:
+    JuiceBanana: 2
+
+- type: reaction
+  id: ReconstitutePowderedJuiceWatermelon
+  requiredMixerCategories:
+  - Stir
+  reactants:
+    Water:
+      amount: 1
+    PowderedJuiceWatermelon:
+      amount: 1
+  products:
+    JuiceWatermelon: 2
+
+- type: reaction
+  id: ReconstitutePowderedJuiceBerry
+  requiredMixerCategories:
+  - Stir
+  reactants:
+    Water:
+      amount: 1
+    PowderedJuiceBerry:
+      amount: 1
+  products:
+    JuiceBerry: 2
+
+- type: reaction
+  id: ReconstitutePowderedJuiceGrape
+  requiredMixerCategories:
+  - Stir
+  reactants:
+    Water:
+      amount: 1
+    PowderedJuiceGrape:
+      amount: 1
+  products:
+    JuiceGrape: 2
+
+- type: reaction
+  id: ReconstitutePowderedJuiceApple
+  requiredMixerCategories:
+  - Stir
+  reactants:
+    Water:
+      amount: 1
+    PowderedJuiceApple:
+      amount: 1
+  products:
+    JuiceApple: 2
+
+- type: reaction
+  id: ReconstitutePowderedJuiceCherry
+  requiredMixerCategories:
+  - Stir
+  reactants:
+    Water:
+      amount: 1
+    PowderedJuiceCherry:
+      amount: 1
+  products:
+    JuiceCherry: 2
+
+- type: reaction
+  id: ReconstitutePowderedJuiceCarrot
+  requiredMixerCategories:
+  - Stir
+  reactants:
+    Water:
+      amount: 1
+    PowderedJuiceCarrot:
+      amount: 1
+  products:
+    JuiceCarrot: 2
+
+- type: reaction
+  id: ReconstitutePowderedJuiceTomato
+  requiredMixerCategories:
+  - Stir
+  reactants:
+    Water:
+      amount: 1
+    PowderedJuiceTomato:
+      amount: 1
+  products:
+    JuiceTomato: 2
diff --git a/Resources/Prototypes/DeltaV/Recipes/Lathes/robotics.yml b/Resources/Prototypes/DeltaV/Recipes/Lathes/robotics.yml
index 3f1a6617eba..598c45d39dc 100644
--- a/Resources/Prototypes/DeltaV/Recipes/Lathes/robotics.yml
+++ b/Resources/Prototypes/DeltaV/Recipes/Lathes/robotics.yml
@@ -1,23 +1,3 @@
-- type: latheRecipe
-  parent: BaseBorgModuleRecipe
-  id: BorgModuleSecurityPeacekeeper
-  result: BorgModuleSecurityPeacekeeper
-
-- type: latheRecipe
-  parent: BaseBorgModuleRecipe
-  id: BorgModuleSecurityPatrol
-  result: BorgModuleSecurityPatrol
-
-- type: latheRecipe
-  parent: BaseBorgModuleRecipe
-  id: BorgModuleSecurityBastion
-  result: BorgModuleSecurityBastion
-
-- type: latheRecipe
-  parent: BaseGoldBorgModuleRecipe
-  id: BorgModuleSecurityDeescalate
-  result: BorgModuleSecurityDeescalate
-
 - type: latheRecipe
   parent: BaseGoldBorgModuleRecipe
   id: BorgModuleSecurityEscalate
@@ -27,33 +7,3 @@
   parent: BaseGoldBorgModuleRecipe
   id: BorgModuleSecurityChase
   result: BorgModuleSecurityChase
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: LeftArmBorgSecurity
-  result: LeftArmBorgSecurity
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: RightArmBorgSecurity
-  result: RightArmBorgSecurity
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: LeftLegBorgSecurity
-  result: LeftLegBorgSecurity
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: RightLegBorgSecurity
-  result: RightLegBorgSecurity
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: HeadBorgSecurity
-  result: HeadBorgSecurity
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: TorsoBorgSecurity
-  result: TorsoBorgSecurity
diff --git a/Resources/Prototypes/DeltaV/SoundCollections/harpy.yml b/Resources/Prototypes/DeltaV/SoundCollections/harpy.yml
new file mode 100644
index 00000000000..926903fbb3e
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/SoundCollections/harpy.yml
@@ -0,0 +1,8 @@
+- type: soundCollection
+  id: HarpyGasp
+  files:
+  - /Audio/Effects/Gasp/gasp_male1.ogg
+  - /Audio/Effects/Gasp/gasp_male2.ogg
+  - /Audio/Effects/Gasp/gasp_female1.ogg
+  - /Audio/Effects/Gasp/gasp_female2.ogg
+  - /Audio/Effects/Gasp/gasp_female3.ogg
diff --git a/Resources/Prototypes/DeltaV/Traits/disabilities.yml b/Resources/Prototypes/DeltaV/Traits/disabilities.yml
index 016e7b5340b..96ded539387 100644
--- a/Resources/Prototypes/DeltaV/Traits/disabilities.yml
+++ b/Resources/Prototypes/DeltaV/Traits/disabilities.yml
@@ -18,6 +18,7 @@
   id: InPain
   name: trait-inpain-name
   description: trait-inpain-desc
+  traitGear: PillCanisterSoretizone
   category: Disabilities
   components:
   - type: Pain
diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml
index 7fafa0538d7..02a332544d0 100644
--- a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml
+++ b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml
@@ -64,6 +64,10 @@
 #      collection: BikeHorn
     Weh:
       collection: Weh
+    Gasp:
+      collection: HarpyGasp
+    DefaultDeathgasp:
+      collection: DeathGasp
 
 - type: emoteSounds
   id: MaleVulpkanin
@@ -104,6 +108,10 @@
       collection: VulpkaninHowls
     Awoo:
       collection: VulpkaninHowls
+    Gasp:
+      collection: MaleGasp
+    DefaultDeathgasp:
+      collection: MaleDeathGasp
 
 - type: emoteSounds
   id: FemaleVulpkanin
@@ -144,6 +152,10 @@
       collection: VulpkaninHowls
     Awoo:
       collection: VulpkaninHowls
+    Gasp:
+      collection: FemaleGasp
+    DefaultDeathgasp:
+      collection: FemaleDeathGasp
 
 - type: emoteSounds
   id: MobDog
@@ -190,8 +202,12 @@
       collection: Whistles
     Weh:
       collection: Weh
-    Squeak: 
+    Squeak:
       path: /Audio/Animals/mouse_squeak.ogg
+    Gasp:
+      collection: MaleGasp
+    DefaultDeathgasp:
+      collection: MaleDeathGasp
 
 - type: emoteSounds
   id: FemaleRodentia
@@ -220,5 +236,9 @@
       collection: Whistles
     Weh:
       collection: Weh
-    Squeak: 
+    Squeak:
       path: /Audio/Animals/mouse_squeak.ogg
+    Gasp:
+      collection: FemaleGasp
+    DefaultDeathgasp:
+      collection: FemaleDeathGasp
diff --git a/Resources/Prototypes/DeltaV/borg_types.yml b/Resources/Prototypes/DeltaV/borg_types.yml
new file mode 100644
index 00000000000..0fb7ab66153
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/borg_types.yml
@@ -0,0 +1,62 @@
+# Security borg
+- type: borgType
+  id: security
+
+  # Description
+  dummyPrototype: BorgChassisSecurity
+
+  # Functional
+  extraModuleCount: 3
+  moduleWhitelist:
+    tags:
+    - BorgModuleGeneric
+    - BorgModuleSecurity
+
+  # TODO: change these when reworking secborg modules to have the equivalent of roundstart gear
+  defaultModules:
+  - BorgModuleSecurityDeescalate
+  - BorgModuleSecurityPatrol
+  - BorgModuleSecurityBastion
+
+  lawset: SiliconPolice
+
+  addComponents:
+  - type: FlashImmunity
+  - type: ShowMindShieldIcons
+  - type: ShowCriminalRecordIcons
+  - type: MobThresholds
+    thresholds:
+      0: Alive
+      80: Critical # -20 to Crit Threshold
+      200: Dead
+
+  radioChannels:
+  - Science
+  - Security
+
+  # Visual
+  clientComponents:
+  - type: Sprite
+    noRot: true
+    drawdepth: Mobs
+    sprite: DeltaV/Mobs/Silicon/chassis.rsi
+    layers:
+    - state: security
+      map: ["enum.BorgVisualLayers.Body", "movement"]
+    - state: security_e_r
+      map: ["enum.BorgVisualLayers.Light"]
+      shader: unshaded
+      visible: false
+    - state: security_l
+      shader: unshaded
+      map: ["light","enum.BorgVisualLayers.LightStatus"]
+      visible: false
+  inventoryTemplateId: borgShort
+  spriteBodyState: security
+  spriteHasMindState: security_e
+  spriteNoMindState: security_e_r
+  spriteToggleLightState: security_l
+
+  # Pet
+  petSuccessString: petting-success-security-cyborg
+  petFailureString: petting-failure-security-cyborg
diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
index f79817bfab7..24f438113b9 100644
--- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
@@ -13,11 +13,7 @@
   categories: [ HideSpawnMenu ]
   components:
   - type: ShowHealthBars
-    damageContainers:
-    - Biological
   - type: ShowHealthIcons
-    damageContainers:
-    - Biological
 
 - type: entity
   parent: ClothingEyesBase
@@ -226,8 +222,6 @@
     sprite: Clothing/Eyes/Hud/syndagent.rsi
   - type: ShowSyndicateIcons
   - type: ShowHealthBars
-    damageContainers:
-    - Biological
 
 - type: entity
   parent: [ClothingEyesGlassesSunglasses, ShowSecurityIcons]
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
index e9856e6dc66..9bc54fa0675 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
@@ -874,6 +874,10 @@
   - type: Construction
     graph: WebObjects
     node: coat
+  - type: Butcherable
+    spawned:
+    - id: MaterialWebSilk1
+      amount: 5
   - type: FlavorProfile
     flavors:
       - cobwebs
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
index d31b3cba176..1475500a65c 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
@@ -187,6 +187,10 @@
         reagents:
         - ReagentId: Fiber
           Quantity: 10
+  - type: Butcherable
+    spawned:
+    - id: MaterialWebSilk1
+      amount: 2
   - type: Construction
     graph: WebObjects
     node: boots
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml
index a2bf6b687a9..3f48b0260fc 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml
@@ -222,24 +222,24 @@
     sprite: Clothing/Uniforms/Jumpskirt/color.rsi
     layers:
     - state: icon
-      color: "#79CC26"
+      color: "#007923"
     - state: trinkets-icon
   - type: Item
     inhandVisuals:
       left:
       - state: inhand-left
-        color: "#79CC26"
+        color: "#007923"
       - state: trinkets-inhand-left
       right:
       - state: inhand-right
-        color: "#79CC26"
+        color: "#007923"
       - state: trinkets-inhand-right
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpskirt/color.rsi
     clothingVisuals:
       jumpsuit:
       - state: equipped-INNERCLOTHING
-        color: "#79CC26"
+        color: "#007923"
       - state: trinkets-equipped-INNERCLOTHING
 
 # Orange Jumpskirt
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpsuits.yml
index f56afabeac1..7a44409079b 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpsuits.yml
@@ -222,24 +222,24 @@
     sprite: Clothing/Uniforms/Jumpsuit/color.rsi
     layers:
     - state: icon
-      color: "#79CC26"
+      color: "#007923"
     - state: trinkets-icon
   - type: Item
     inhandVisuals:
       left:
       - state: inhand-left
-        color: "#79CC26"
+        color: "#007923"
       - state: trinkets-inhand-left
       right:
       - state: inhand-right
-        color: "#79CC26"
+        color: "#007923"
       - state: trinkets-inhand-right
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpsuit/color.rsi
     clothingVisuals:
       jumpsuit:
       - state: equipped-INNERCLOTHING
-        color: "#79CC26"
+        color: "#007923"
       - state: trinkets-equipped-INNERCLOTHING
 
 # Orange Jumpsuit
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
index 5f56335db2a..901433ffdbe 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
@@ -780,6 +780,36 @@
       - state: equipped-INNERCLOTHING-shirt
         color: "#b30000"
 
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtCasualGreen
+  name: casual green jumpskirt
+  description: A loose worn green shirt with a grey skirt, perfect for someone looking to relax.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/casual.rsi
+    layers:
+    - state: icon-jumpskirt
+    - state: icon-shirt
+      color: "#00661D"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-jumpskirt
+      - state: inhand-left-shirt
+        color: "#00661D"
+      right:
+      - state: inhand-right-jumpskirt
+      - state: inhand-right-shirt
+        color: "#00661D"
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/casual.rsi
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING-jumpskirt
+      - state: equipped-INNERCLOTHING-shirt
+        color: "#00661D"
+
 - type: entity
   parent: ClothingUniformSkirtBase
   id: ClothingUniformJumpskirtOldDress
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
index c4bc1c07f72..d3c46470af3 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -1302,6 +1302,36 @@
       - state: equipped-INNERCLOTHING-shirt
         color: "#b30000"
 
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitCasualGreen
+  name: casual green jumpsuit
+  description: A loose worn green shirt with a grey pants, perfect for someone looking to relax.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/casual.rsi
+    layers:
+    - state: icon-jumpsuit
+    - state: icon-shirt
+      color: "#00661D"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-jumpsuit
+      - state: inhand-left-shirt
+        color: "#00661D"
+      right:
+      - state: inhand-right-jumpsuit
+      - state: inhand-right-shirt
+        color: "#00661D"
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/casual.rsi
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING-jumpsuit
+      - state: equipped-INNERCLOTHING-shirt
+        color: "#00661D"
+
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitFamilyGuy
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
index 2ec028c0208..c7fb4f50ee5 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -69,6 +69,9 @@
         type: BorgBoundUserInterface
       enum.StrippingUiKey.Key:
         type: StrippableBoundUserInterface
+      # Only used for NT borgs that can switch type, defined here to avoid copy-pasting the rest of this component.
+      enum.BorgSwitchableTypeUiKey.SelectBorgType:
+        type: BorgSelectTypeUserInterface
   - type: ActivatableUI
     key: enum.BorgUiKey.Key
   - type: SiliconLawBound
@@ -157,6 +160,7 @@
       collection: FootstepBorg
   - type: Construction
     graph: Cyborg
+    node: cyborg
     containers:
     - part-container
     - cell_slot
@@ -289,6 +293,9 @@
   - type: AccessReader
     access: [["Command"], ["Research"]]
   - type: ShowJobIcons
+  - type: InteractionPopup
+    interactSuccessSound:
+      path: /Audio/Ambience/Objects/periodic_beep.ogg
 
 - type: entity
   id: BaseBorgChassisSyndicate
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
index 58478ca180b..fa324c0124f 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
@@ -1,23 +1,22 @@
 - type: entity
-  id: BorgChassisGeneric
+  id: BorgChassisSelectable
   parent: BaseBorgChassisNT
   components:
   - type: Sprite
     layers:
     - state: robot
+      map: ["enum.BorgVisualLayers.Body", "movement"]
     - state: robot_e_r
       map: ["enum.BorgVisualLayers.Light"]
       shader: unshaded
       visible: false
     - state: robot_l
       shader: unshaded
-      map: ["light"]
+      map: ["light","enum.BorgVisualLayers.LightStatus"]
       visible: false
   - type: BorgChassis
-    maxModules: 6
-    moduleWhitelist:
-      tags:
-      - BorgModuleGeneric
+    # Default borg can take no modules until selected type.
+    maxModules: 0
     hasMindState: robot_e
     noMindState: robot_e_r
   - type: BorgTransponder
@@ -25,315 +24,62 @@
       sprite: Mobs/Silicon/chassis.rsi
       state: robot
     name: cyborg
-  - type: Construction
-    node: cyborg
-  - type: Speech
-    speechVerb: Robotic
   - type: InteractionPopup
     interactSuccessString: petting-success-generic-cyborg
     interactFailureString: petting-failure-generic-cyborg
-    interactSuccessSound:
-      path: /Audio/Ambience/Objects/periodic_beep.ogg
+  - type: BorgSwitchableType
+    inherentRadioChannels:
+    - Common
+    - Binary
+
+- type: entity
+  id: BorgChassisGeneric
+  parent: BorgChassisSelectable
+  name: generic cyborg
+  suffix: type picked
+  components:
+  - type: BorgSwitchableType
+    selectedBorgType: generic
 
 - type: entity
   id: BorgChassisMining
-  parent: BaseBorgChassisNT
+  parent: BorgChassisSelectable
   name: salvage cyborg
   components:
-  - type: Sprite
-    layers:
-    - state: miner
-      map: ["movement"]
-    - state: miner_e_r
-      map: ["enum.BorgVisualLayers.Light"]
-      shader: unshaded
-      visible: false
-    - state: miner_l
-      shader: unshaded
-      map: ["light"]
-      visible: false
-  - type: SpriteMovement
-    movementLayers:
-      movement:
-        state: miner_moving
-    noMovementLayers:
-      movement:
-        state: miner
-  - type: BorgChassis
-    maxModules: 4
-    moduleWhitelist:
-      tags:
-      - BorgModuleGeneric
-      - BorgModuleCargo
-    hasMindState: miner_e
-    noMindState: miner_e_r
-  - type: BorgTransponder
-    sprite:
-      sprite: Mobs/Silicon/chassis.rsi
-      state: miner
-    name: salvage cyborg
-  - type: Construction
-    node: mining
-  - type: IntrinsicRadioTransmitter
-    channels:
-    - Supply
-    - Binary
-    - Common
-    - Science
-  - type: ActiveRadio
-    channels:
-    - Supply
-    - Binary
-    - Common
-    - Science
-  - type: AccessReader
-    access: [["Cargo"], ["Salvage"], ["Command"], ["Research"]]
-  - type: Inventory
-    templateId: borgTall
-  - type: InteractionPopup
-    interactSuccessString: petting-success-salvage-cyborg
-    interactFailureString: petting-failure-salvage-cyborg
-    interactSuccessSound:
-      path: /Audio/Ambience/Objects/periodic_beep.ogg
+  - type: BorgSwitchableType
+    selectedBorgType: mining
 
 - type: entity
   id: BorgChassisEngineer
-  parent: BaseBorgChassisNT
+  parent: BorgChassisSelectable
   name: engineer cyborg
   components:
-  - type: Sprite
-    layers:
-    - state: engineer
-    - state: engineer_e_r
-      map: ["enum.BorgVisualLayers.Light"]
-      shader: unshaded
-      visible: false
-    - state: engineer_l
-      shader: unshaded
-      map: ["light"]
-      visible: false
-  - type: BorgChassis
-    maxModules: 4
-    moduleWhitelist:
-      tags:
-      - BorgModuleGeneric
-      - BorgModuleEngineering
-    hasMindState: engineer_e
-    noMindState: engineer_e_r
-  - type: BorgTransponder
-    sprite:
-      sprite: Mobs/Silicon/chassis.rsi
-      state: engineer
-    name: engineer cyborg
-  - type: Construction
-    node: engineer
-  - type: IntrinsicRadioTransmitter
-    channels:
-    - Engineering
-    - Binary
-    - Common
-    - Science
-  - type: ActiveRadio
-    channels:
-    - Engineering
-    - Binary
-    - Common
-    - Science
-  - type: AccessReader
-    access: [["Engineering"], ["Command"], ["Research"]]
-  - type: Inventory
-    templateId: borgShort
-  - type: InteractionPopup
-    interactSuccessString: petting-success-engineer-cyborg
-    interactFailureString: petting-failure-engineer-cyborg
-    interactSuccessSound:
-      path: /Audio/Ambience/Objects/periodic_beep.ogg
-  - type: SiliconLawProvider # Delta-V - Adds custom lawset for Engineering Cyborg
-    laws: Engineer
+  - type: BorgSwitchableType
+    selectedBorgType: engineering
 
 - type: entity
   id: BorgChassisJanitor
-  parent: BaseBorgChassisNT
+  parent: BorgChassisSelectable
   name: janitor cyborg
   components:
-  - type: Sprite
-    layers:
-    - state: janitor
-      map: ["movement"]
-    - state: janitor_e_r
-      map: ["enum.BorgVisualLayers.Light"]
-      shader: unshaded
-      visible: false
-    - state: janitor_l
-      shader: unshaded
-      map: ["light"]
-      visible: false
-  - type: SpriteMovement
-    movementLayers:
-      movement:
-        state: janitor_moving
-    noMovementLayers:
-      movement:
-        state: janitor
-  - type: BorgChassis
-    maxModules: 4
-    moduleWhitelist:
-      tags:
-      - BorgModuleGeneric
-      - BorgModuleJanitor
-    hasMindState: janitor_e
-    noMindState: janitor_e_r
-  - type: BorgTransponder
-    sprite:
-      sprite: Mobs/Silicon/chassis.rsi
-      state: janitor
-    name: janitor cyborg
-  - type: Construction
-    node: janitor
-  - type: IntrinsicRadioTransmitter
-    channels:
-    - Service
-    - Binary
-    - Common
-    - Science
-  - type: ActiveRadio
-    channels:
-    - Service
-    - Binary
-    - Common
-    - Science
-  - type: AccessReader
-    access: [["Service"], ["Command"], ["Research"]]
-  - type: Inventory
-    templateId: borgShort
-  - type: InteractionPopup
-    interactSuccessString: petting-success-janitor-cyborg
-    interactFailureString: petting-failure-janitor-cyborg
-    interactSuccessSound:
-      path: /Audio/Ambience/Objects/periodic_beep.ogg
-  - type: SiliconLawProvider # Delta-V Adds custom lawset for Janitor Cyborg
-    laws: Janitor
+  - type: BorgSwitchableType
+    selectedBorgType: janitor
 
 - type: entity
   id: BorgChassisMedical
-  parent: [BaseBorgChassisNT, ShowMedicalIcons]
+  parent: BorgChassisSelectable
   name: medical cyborg
   components:
-  - type: Sprite
-    layers:
-    - state: medical
-      map: ["movement"]
-    - state: medical_e_r
-      map: ["enum.BorgVisualLayers.Light"]
-      shader: unshaded
-      visible: false
-    - state: medical_l
-      shader: unshaded
-      map: ["light"]
-      visible: false
-  - type: SpriteMovement
-    movementLayers:
-      movement:
-        state: medical_moving
-    noMovementLayers:
-      movement:
-        state: medical
-  - type: BorgChassis
-    maxModules: 4
-    moduleWhitelist:
-      tags:
-      - BorgModuleGeneric
-      - BorgModuleMedical
-    hasMindState: medical_e
-    noMindState: medical_e_r
-  - type: BorgTransponder
-    sprite:
-      sprite: Mobs/Silicon/chassis.rsi
-      state: medical
-    name: medical cyborg
-  - type: Construction
-    node: medical
-  - type: IntrinsicRadioTransmitter
-    channels:
-    - Medical
-    - Binary
-    - Common
-    - Science
-  - type: ActiveRadio
-    channels:
-    - Medical
-    - Binary
-    - Common
-    - Science
-  - type: AccessReader
-    access: [["Medical"], ["Command"], ["Research"]]
-  - type: Inventory
-    templateId: borgDutch
-  - type: FabricateCandy # Nyanotrasen - The medical cyborg can generate candies filled with medicine.
-  - type: SiliconLawProvider # Delta-V - Adds custom lawset for Medical cyborg
-    laws: Medical
-  - type: FootstepModifier
-    footstepSoundCollection:
-      collection: FootstepHoverBorg
-  - type: SolutionScanner
-  - type: InteractionPopup
-    interactSuccessString: petting-success-medical-cyborg
-    interactFailureString: petting-failure-medical-cyborg
-    interactSuccessSound:
-      path: /Audio/Ambience/Objects/periodic_beep.ogg
+  - type: BorgSwitchableType
+    selectedBorgType: medical
 
 - type: entity
   id: BorgChassisService
-  parent: BaseBorgChassisNT
+  parent: BorgChassisSelectable
   name: service cyborg
   components:
-  - type: Sprite
-    layers:
-    - state: service
-    - state: service_e_r
-      map: ["enum.BorgVisualLayers.Light"]
-      shader: unshaded
-      visible: false
-    - state: service_l
-      shader: unshaded
-      map: ["light"]
-      visible: false
-  - type: BorgChassis
-    maxModules: 4
-    moduleWhitelist:
-      tags:
-      - BorgModuleGeneric
-      - BorgModuleService
-    hasMindState: service_e
-    noMindState: service_e_r
-  - type: BorgTransponder
-    sprite:
-      sprite: Mobs/Silicon/chassis.rsi
-      state: service
-    name: service cyborg
-  - type: Construction
-    node: service
-  - type: IntrinsicRadioTransmitter
-    channels:
-    - Service
-    - Binary
-    - Common
-    - Science
-  - type: ActiveRadio
-    channels:
-    - Service
-    - Binary
-    - Common
-    - Science
-  - type: AccessReader
-    access: [["Service"], ["Command"], ["Research"]]
-  - type: Inventory
-    templateId: borgTall
-  - type: InteractionPopup
-    interactSuccessString: petting-success-service-cyborg
-    interactFailureString: petting-failure-service-cyborg
-    interactSuccessSound:
-      path: /Audio/Ambience/Objects/periodic_beep.ogg
+  - type: BorgSwitchableType
+    selectedBorgType: service
 
 - type: entity
   id: BorgChassisSyndicateAssault
@@ -361,8 +107,6 @@
           - BorgModuleSyndicateAssault
       hasMindState: synd_sec_e
       noMindState: synd_sec
-    - type: Construction
-      node: syndicateassault
     - type: InteractionPopup
       interactSuccessString: petting-success-syndicate-cyborg
       interactFailureString: petting-failure-syndicate-cyborg
@@ -395,11 +139,7 @@
           - BorgModuleSyndicate
       hasMindState: synd_medical_e
       noMindState: synd_medical
-    - type: Construction
-      node: syndicatemedical
     - type: ShowHealthBars
-      damageContainers:
-      - Biological
     - type: InteractionPopup
       interactSuccessString: petting-success-syndicate-cyborg
       interactFailureString: petting-failure-syndicate-cyborg
@@ -438,8 +178,6 @@
           - BorgModuleSyndicate
       hasMindState: synd_engi_e
       noMindState: synd_engi
-    - type: Construction
-      node: syndicatesaboteur
     - type: ShowHealthBars
       damageContainers:
       - Inorganic
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 6808e440419..98159d4562f 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -1772,6 +1772,11 @@
   # intended for swarms that eat pills so only temporary
   - type: TimedDespawn
     lifetime: 60
+  - type: Hunger
+    baseDecayRate: 10 # always hungry
+    starvingSlowdownModifier: 1
+  - type: Thirst
+    baseDecayRate: 10 # always thirsty
 
 - type: entity
   parent: MobMouse
@@ -3360,7 +3365,7 @@
   - type: HTN
     rootTask:
       task: RuminantCompound
-      
+
 - type: entity
   name: diona nymph
   parent: [SimpleMobBase, StripableInventoryBase]
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml b/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml
index 5d3840185e9..2bd2a5f6d7c 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml
@@ -50,12 +50,12 @@
       Dead:
         Base: goliath_dead
   - type: MovementSpeedModifier
-    baseWalkSpeed : 2.50
-    baseSprintSpeed : 2.50
+    baseWalkSpeed : 2.00
+    baseSprintSpeed : 2.00
   - type: MobThresholds
     thresholds:
       0: Alive
-      100: Dead
+      250: Dead
   - type: MeleeWeapon
     soundHit:
       path: "/Audio/Weapons/smash.ogg"
@@ -64,7 +64,7 @@
     animation: WeaponArcPunch
     damage:
       types:
-        Slash: 15
+        Slash: 10
         Piercing: 10
   - type: NpcFactionMember
     factions:
diff --git a/Resources/Prototypes/Entities/Mobs/Player/jaunt_mobs.yml b/Resources/Prototypes/Entities/Mobs/Player/jaunt_mobs.yml
new file mode 100644
index 00000000000..3002264a754
--- /dev/null
+++ b/Resources/Prototypes/Entities/Mobs/Player/jaunt_mobs.yml
@@ -0,0 +1,40 @@
+- type: entity
+  name: jaunt
+  parent: [Incorporeal, BaseMob]
+  id: BaseMobJaunt
+  description: Faint traces of a humanoid figure linger here
+  suffix: Ethereal
+  components:
+  - type: ContentEye
+    maxZoom: 1.44,1.44
+  - type: Eye
+    drawFov: false
+  - type: Input
+    context: "ghost"
+  - type: InputMover
+  - type: MovementSpeedModifier
+    baseSprintSpeed: 12
+    baseWalkSpeed: 8
+  - type: Visibility
+    layer: 2
+  - type: Spectral
+
+# Should be slow, for balance
+- type: entity
+  name: jaunt
+  parent: BaseMobJaunt
+  id: EtherealJaunt
+  suffix: Wizard
+  components:
+  - type: Sprite
+    sprite: Mobs/Ghosts/ghost_human.rsi
+    color: "#60f7eb"
+    layers:
+    - state: animated
+      shader: unshaded
+    noRot: true
+    overrideContainerOcclusion: true
+    drawdepth: Ghosts
+  - type: MovementSpeedModifier
+    baseSprintSpeed: 6
+    baseWalkSpeed: 4
diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
index be2b5a44f95..4f581be068f 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
@@ -69,8 +69,6 @@
     canShuttle: false
     title: comms-console-announcement-title-station-ai
     color: "#2ed2fd"
-  - type: Speech
-    speechVerb: Robotic
   - type: ShowJobIcons
 
 - type: entity
@@ -303,6 +301,7 @@
         unshaded:
           Empty: { state: empty }
           Occupied: { state: full }
+  - type: Intellicard
 
 - type: entity
   id: PlayerStationAiEmpty
@@ -395,6 +394,9 @@
     drawFov: false
   - type: Examiner
   - type: InputMover
+  - type: Speech
+    speechVerb: Robotic
+    speechSounds: Borg
   - type: Tag
     tags:
     - HideContextMenu
@@ -427,28 +429,9 @@
       map: ["base"]
 
 # Borgs
-- type: entity
-  id: PlayerBorgGeneric
-  parent: BorgChassisGeneric
-  suffix: Battery, Tools
-  components:
-  - type: ContainerFill
-    containers:
-      borg_brain:
-        - PositronicBrain
-      borg_module:
-        - BorgModuleTool
-  - type: ItemSlots
-    slots:
-      cell_slot:
-        name: power-cell-slot-component-slot-name-default
-        startingItem: PowerCellMedium
-  - type: RandomMetadata
-    nameSegments: [names_borg]
-
 - type: entity
   id: PlayerBorgBattery
-  parent: BorgChassisGeneric
+  parent: BorgChassisSelectable
   suffix: Battery
   components:
   - type: ContainerFill
@@ -460,6 +443,8 @@
       cell_slot:
         name: power-cell-slot-component-slot-name-default
         startingItem: PowerCellMedium
+  - type: RandomMetadata # DeltaV: give job borgs names
+    nameSegments: [names_borg]
 
 - type: entity
   id: PlayerBorgSyndicateAssaultBattery
diff --git a/Resources/Prototypes/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/Entities/Mobs/Species/moth.yml
index fb04bf8d5f9..92592116f21 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/moth.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/moth.yml
@@ -66,7 +66,7 @@
         Cold : 0.05 #per second, scales with temperature & other constants
     heatDamage:
       types:
-        Heat : 3 #per second, scales with temperature & other constants
+        Heat : 1.5 #per second, scales with temperature & other constants # DeltaV: changed to normal heat damage
   - type: TemperatureSpeed
     thresholds:
       289: 0.8
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
index 612f7da0472..48968b80c13 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
@@ -701,6 +701,36 @@
         - ReagentId: Water
           Quantity: 4 #It makes saline if you add salt!
 
+- type: entity
+  name: anomalous meat mass
+  parent: FoodMeatRawBase
+  id: FoodMeatAnomaly
+  description: An impossibly dense slab of meat. Just looking at it makes you uncomfortable.
+  components:
+  - type: Sprite
+    state: anomalymeat
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        reagents:
+        - ReagentId: UncookedAnimalProteins
+          Quantity: 90
+        - ReagentId: Fat
+          Quantity: 90
+  - type: SliceableFood
+    count: 10
+    sliceTime: 5
+    slice: FoodMeat #That's... So much meat
+  - type: InternalTemperature
+    conductivity: 0.43
+  - type: Construction
+    graph: AnomalyMeatSteak
+    node: start
+    defaultTarget: anomaly steak
+  - type: Tag
+    tags:
+    - Meat
+
 # Cooked
 
 - type: entity
@@ -1173,6 +1203,35 @@
       Burger: MeatSnail
       Taco: MeatSnail
 
+- type: entity
+  name: anomalous steak
+  parent: FoodMeatBase
+  id: FoodMeatAnomalyCooked
+  description: A gigantic mass of cooked meat. A meal for a dinner party, or someone REALLY hungry. 
+  components:
+  - type: Tag
+    tags:
+    - Cooked
+    - Meat
+  - type: Sprite
+    layers:
+    - state: anomalymeat-cooked #Kinda hard to cook this... thing evenly
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 100
+        - ReagentId: Protein
+          Quantity: 50
+  - type: SliceableFood
+    count: 10
+    sliceTime: 5
+    slice: FoodMeatCooked
+  - type: Construction
+    graph: AnomalyMeatSteak
+    node: anomaly steak
+
 # Cutlets
 
 # Raw
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/war_declarator.yml b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/war_declarator.yml
index 78009f10422..fc32cd2188d 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/war_declarator.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/war_declarator.yml
@@ -22,5 +22,6 @@
           type: WarDeclaratorBoundUserInterface
     - type: WarDeclarator
       message: war-declarator-default-message
+      sound: /Audio/Announcements/Alerts/code_red.ogg # DeltaV
     - type: AccessReader
       access: [["NuclearOperative"]]
diff --git a/Resources/Prototypes/Entities/Objects/Devices/chameleon_projector.yml b/Resources/Prototypes/Entities/Objects/Devices/chameleon_projector.yml
index ade8517c59f..b6819a18b96 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/chameleon_projector.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/chameleon_projector.yml
@@ -32,6 +32,9 @@
     state: full
   - type: Transform
     noRot: true # players rotation and anchor is used instead
+  - type: InteractionOutline
+  - type: Clickable
+  - type: Damageable
   - type: ChameleonDisguise
 
 # actions
@@ -42,6 +45,7 @@
   components:
   - type: InstantAction
     icon: Interface/VerbIcons/refresh.svg.192dpi.png
+    itemIconStyle: BigAction
     event: !type:DisguiseToggleNoRotEvent
 
 - type: entity
@@ -53,4 +57,5 @@
     icon:
       sprite: Objects/Tools/wrench.rsi
       state: icon
+    itemIconStyle: BigAction
     event: !type:DisguiseToggleAnchoredEvent
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index 75fc55f21c5..df7de6418a2 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -530,7 +530,7 @@
     state: pda-janitor
 
 - type: entity
-  parent: BaseSecurityPDA
+  parent: BasePDA
   id: CaptainPDA
   name: captain PDA
   description: Surprisingly no different from your PDA.
diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
index 5c3cd444962..e0862b88425 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
@@ -597,6 +597,10 @@
     damage:
       types:
         Blunt: 10
+  - type: Tag
+    tags:
+    - Folder
+    - HighRiskItem
   - type: StealTarget
     stealGroup: BoxFolderQmClipboard
 
diff --git a/Resources/Prototypes/Entities/Objects/Misc/plutonium_core.yml b/Resources/Prototypes/Entities/Objects/Misc/plutonium_core.yml
index 67910888871..bd2a0d871a9 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/plutonium_core.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/plutonium_core.yml
@@ -47,6 +47,7 @@
         whitelist:
           tags:
           - PlutoniumCore
+        lockedFailPopup: nuke-core-container-closed-fail-popup
         whitelistFailPopup: nuke-core-container-whitelist-fail-popup
   - type: GenericVisualizer
     visuals:
diff --git a/Resources/Prototypes/Entities/Objects/Power/portable_recharger.yml b/Resources/Prototypes/Entities/Objects/Power/portable_recharger.yml
new file mode 100644
index 00000000000..3c553fc8124
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Power/portable_recharger.yml
@@ -0,0 +1,38 @@
+- type: entity
+  parent: Clothing
+  id: PortableRecharger
+  name: portable recharger
+  description: High-tech recharger adapted for portability.
+  components:
+  - type: Item
+    size: Huge
+  - type: Sprite
+    sprite: Objects/Power/portable_recharger.rsi
+    state: charging
+  - type: Clothing
+    equippedPrefix: charging
+    quickEquip: false
+    slots:
+    - back
+  - type: Charger
+    slotId: charger_slot
+    portable: true
+  - type: PowerChargerVisuals
+  - type: ApcPowerReceiver
+    needsPower: false
+    powerLoad: 0
+  - type: StaticPrice
+    price: 500
+  - type: Tag
+    tags: [] # ignore "WhitelistChameleon" tag
+  - type: ContainerContainer
+    containers:
+      charger_slot: !type:ContainerSlot
+  - type: ItemSlots
+    slots:
+      charger_slot:
+        ejectOnInteract: true
+        whitelist:
+          components:
+          - HitscanBatteryAmmoProvider
+          - ProjectileBatteryAmmoProvider
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_parts.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_parts.yml
deleted file mode 100644
index 6df0488e28f..00000000000
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_parts.yml
+++ /dev/null
@@ -1,503 +0,0 @@
-# generic parts
-- type: entity
-  id: LeftArmBorg
-  parent: BaseBorgArmLeft
-  components:
-  - type: Sprite
-    state: borg_l_arm
-  - type: Icon
-    state: borg_l_arm
-  - type: Tag
-    tags:
-    - Trash
-    - BorgArm
-    - BorgGenericLArm
-
-- type: entity
-  id: RightArmBorg
-  parent: BaseBorgArmRight
-  components:
-  - type: Sprite
-    state: borg_r_arm
-  - type: Icon
-    state: borg_r_arm
-  - type: Tag
-    tags:
-    - Trash
-    - BorgArm
-    - BorgGenericRArm
-
-- type: entity
-  id: LeftLegBorg
-  parent: BaseBorgLegLeft
-  components:
-  - type: Sprite
-    state: borg_l_leg
-  - type: Icon
-    state: borg_l_leg
-  - type: Tag
-    tags:
-    - Trash
-    - BorgLeg
-    - BorgGenericLLeg
-
-- type: entity
-  id: RightLegBorg
-  parent: BaseBorgLegRight
-  components:
-  - type: Sprite
-    state: borg_r_leg
-  - type: Icon
-    state: borg_r_leg
-  - type: Tag
-    tags:
-    - Trash
-    - BorgLeg
-    - BorgGenericRLeg
-
-- type: entity
-  id: LightHeadBorg
-  parent: BaseBorgHead
-  components:
-  - type: Sprite
-    state: borg_head
-  - type: Icon
-    state: borg_head
-  - type: Tag
-    tags:
-    - Trash
-    - BorgHead
-    - BorgGenericHead
-
-- type: entity
-  id: TorsoBorg
-  parent: BaseBorgTorso
-  components:
-  - type: Sprite
-    state: borg_chest
-  - type: Icon
-    state: borg_chest
-  - type: Tag
-    tags:
-    - Trash
-    - BorgGenericTorso
-
-# engineer parts
-- type: entity
-  id: LeftArmBorgEngineer
-  parent: BaseBorgArmLeft
-  name: engineer cyborg left arm
-  components:
-  - type: Sprite
-    state: engineer_l_arm
-  - type: Icon
-    state: engineer_l_arm
-  - type: Tag
-    tags:
-    - Trash
-    - BorgArm
-    - BorgEngineerLArm
-
-- type: entity
-  id: RightArmBorgEngineer
-  parent: BaseBorgArmRight
-  name: engineer cyborg right arm
-  components:
-  - type: Sprite
-    state: engineer_r_arm
-  - type: Icon
-    state: engineer_r_arm
-  - type: Tag
-    tags:
-    - Trash
-    - BorgArm
-    - BorgEngineerRArm
-
-- type: entity
-  id: LeftLegBorgEngineer
-  parent: BaseBorgLegLeft
-  name: engineer cyborg left leg
-  components:
-  - type: Sprite
-    state: engineer_l_leg
-  - type: Icon
-    state: engineer_l_leg
-  - type: Tag
-    tags:
-    - Trash
-    - BorgLeg
-    - BorgEngineerLLeg
-
-- type: entity
-  id: RightLegBorgEngineer
-  parent: BaseBorgLegRight
-  name: engineer cyborg right leg
-  components:
-  - type: Sprite
-    state: engineer_r_leg
-  - type: Icon
-    state: engineer_r_leg
-  - type: Tag
-    tags:
-    - Trash
-    - BorgLeg
-    - BorgEngineerRLeg
-
-- type: entity
-  id: HeadBorgEngineer
-  parent: BaseBorgHead
-  name: engineer cyborg head
-  components:
-  - type: Sprite
-    state: engineer_head
-  - type: Icon
-    state: engineer_head
-  - type: Tag
-    tags:
-    - Trash
-    - BorgHead
-    - BorgEngineerHead
-
-- type: entity
-  id: TorsoBorgEngineer
-  parent: BaseBorgTorso
-  name: engineer cyborg torso
-  components:
-  - type: Sprite
-    state: engineer_chest
-  - type: Icon
-    state: engineer_chest
-  - type: Tag
-    tags:
-    - Trash
-    - BorgEngineerTorso
-
-# janitor parts
-- type: entity
-  id: LeftLegBorgJanitor
-  parent: BaseBorgLegLeft
-  name: janitor cyborg left leg
-  components:
-    - type: Sprite
-      state: janitor_l_leg
-    - type: Icon
-      state: janitor_l_leg
-    - type: Tag
-      tags:
-        - Trash
-        - BorgLeg
-        - BorgJanitorLLeg
-
-- type: entity
-  id: RightLegBorgJanitor
-  parent: BaseBorgLegRight
-  name: janitor cyborg right leg
-  components:
-    - type: Sprite
-      state: janitor_r_leg
-    - type: Icon
-      state: janitor_r_leg
-    - type: Tag
-      tags:
-        - Trash
-        - BorgLeg
-        - BorgJanitorRLeg
-
-- type: entity
-  id: HeadBorgJanitor
-  parent: BaseBorgHead
-  name: janitor cyborg head
-  components:
-    - type: Sprite
-      state: janitor_head
-    - type: Icon
-      state: janitor_head
-    - type: Tag
-      tags:
-        - Trash
-        - BorgHead
-        - BorgJanitorHead
-
-- type: entity
-  id: TorsoBorgJanitor
-  parent: BaseBorgTorso
-  name: janitor cyborg torso
-  components:
-    - type: Sprite
-      state: janitor_chest
-    - type: Icon
-      state: janitor_chest
-    - type: Tag
-      tags:
-        - Trash
-        - BorgJanitorTorso
-
-# medical parts
-- type: entity
-  id: LeftArmBorgMedical
-  parent: BaseBorgArmLeft
-  name: medical cyborg left arm
-  components:
-    - type: Sprite
-      state: medical_l_arm
-    - type: Icon
-      state: medical_l_arm
-    - type: Tag
-      tags:
-        - Trash
-        - BorgArm
-        - BorgMedicalLArm
-
-- type: entity
-  id: RightArmBorgMedical
-  parent: BaseBorgArmRight
-  name: medical cyborg right arm
-  components:
-    - type: Sprite
-      state: medical_r_arm
-    - type: Icon
-      state: medical_r_arm
-    - type: Tag
-      tags:
-        - Trash
-        - BorgArm
-        - BorgMedicalRArm
-
-- type: entity
-  id: LeftLegBorgMedical
-  parent: BaseBorgLegLeft
-  name: medical cyborg left leg
-  components:
-    - type: Sprite
-      state: medical_l_leg
-    - type: Icon
-      state: medical_l_leg
-    - type: Tag
-      tags:
-        - Trash
-        - BorgLeg
-        - BorgMedicalLLeg
-
-- type: entity
-  id: RightLegBorgMedical
-  parent: BaseBorgLegRight
-  name: medical cyborg right leg
-  components:
-    - type: Sprite
-      state: medical_r_leg
-    - type: Icon
-      state: medical_r_leg
-    - type: Tag
-      tags:
-        - Trash
-        - BorgLeg
-        - BorgMedicalRLeg
-
-- type: entity
-  id: HeadBorgMedical
-  parent: BaseBorgHead
-  name: medical cyborg head
-  components:
-    - type: Sprite
-      state: medical_head
-    - type: Icon
-      state: medical_head
-    - type: Tag
-      tags:
-        - Trash
-        - BorgHead
-        - BorgMedicalHead
-
-- type: entity
-  id: TorsoBorgMedical
-  parent: BaseBorgTorso
-  name: medical cyborg torso
-  components:
-    - type: Sprite
-      state: medical_chest
-    - type: Icon
-      state: medical_chest
-    - type: Tag
-      tags:
-        - Trash
-        - BorgMedicalTorso
-
-# mining parts
-- type: entity
-  id: LeftArmBorgMining
-  parent: BaseBorgArmLeft
-  name: mining cyborg left arm
-  components:
-    - type: Sprite
-      state: mining_l_arm
-    - type: Icon
-      state: mining_l_arm
-    - type: Tag
-      tags:
-        - Trash
-        - BorgArm
-        - BorgMiningLArm
-
-- type: entity
-  id: RightArmBorgMining
-  parent: BaseBorgArmRight
-  name: mining cyborg right arm
-  components:
-    - type: Sprite
-      state: mining_r_arm
-    - type: Icon
-      state: mining_r_arm
-    - type: Tag
-      tags:
-        - Trash
-        - BorgArm
-        - BorgMiningRArm
-
-- type: entity
-  id: LeftLegBorgMining
-  parent: BaseBorgLegLeft
-  name: mining cyborg left leg
-  components:
-    - type: Sprite
-      state: mining_l_leg
-    - type: Icon
-      state: mining_l_leg
-    - type: Tag
-      tags:
-        - Trash
-        - BorgLeg
-        - BorgMiningLLeg
-
-- type: entity
-  id: RightLegBorgMining
-  parent: BaseBorgLegRight
-  name: mining cyborg right leg
-  components:
-    - type: Sprite
-      state: mining_r_leg
-    - type: Icon
-      state: mining_r_leg
-    - type: Tag
-      tags:
-        - Trash
-        - BorgLeg
-        - BorgMiningRLeg
-
-- type: entity
-  id: HeadBorgMining
-  parent: BaseBorgHead
-  name: mining cyborg head
-  components:
-    - type: Sprite
-      state: mining_head
-    - type: Icon
-      state: mining_head
-    - type: Tag
-      tags:
-        - Trash
-        - BorgHead
-        - BorgMiningHead
-
-- type: entity
-  id: TorsoBorgMining
-  parent: BaseBorgTorso
-  name: mining cyborg torso
-  components:
-    - type: Sprite
-      state: mining_chest
-    - type: Icon
-      state: mining_chest
-    - type: Tag
-      tags:
-        - Trash
-        - BorgMiningTorso
-
-# service parts
-- type: entity
-  id: LeftArmBorgService
-  parent: BaseBorgArmLeft
-  name: service cyborg left arm
-  components:
-  - type: Sprite
-    state: service_l_arm
-  - type: Icon
-    state: service_l_arm
-  - type: Tag
-    tags:
-    - Trash
-    - BorgArm
-    - BorgServiceLArm
-
-- type: entity
-  id: RightArmBorgService
-  parent: BaseBorgArmRight
-  name: service cyborg right arm
-  components:
-  - type: Sprite
-    state: service_r_arm
-  - type: Icon
-    state: service_r_arm
-  - type: Tag
-    tags:
-    - Trash
-    - BorgArm
-    - BorgServiceRArm
-
-- type: entity
-  id: LeftLegBorgService
-  parent: BaseBorgLegLeft
-  name: service cyborg left leg
-  components:
-  - type: Sprite
-    state: service_l_leg
-  - type: Icon
-    state: service_l_leg
-  - type: Tag
-    tags:
-    - Trash
-    - BorgLeg
-    - BorgServiceLLeg
-
-- type: entity
-  id: RightLegBorgService
-  parent: BaseBorgLegRight
-  name: service cyborg right leg
-  components:
-  - type: Sprite
-    state: service_r_leg
-  - type: Icon
-    state: service_r_leg
-  - type: Tag
-    tags:
-    - Trash
-    - BorgLeg
-    - BorgServiceRLeg
-
-- type: entity
-  id: HeadBorgService
-  parent: BaseBorgHead
-  name: service cyborg head
-  components:
-  - type: Sprite
-    state: service_head
-  - type: Icon
-    state: service_head
-  - type: Tag
-    tags:
-    - Trash
-    - BorgHead
-    - BorgServiceHead
-
-- type: entity
-  id: TorsoBorgService
-  parent: BaseBorgTorso
-  name: service cyborg torso
-  components:
-  - type: Sprite
-    state: service_chest
-  - type: Icon
-    state: service_chest
-  - type: Tag
-    tags:
-    - Trash
-    - BorgServiceTorso
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/endoskeleton.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/endoskeleton.yml
index 66e65c73af4..6afc06a7967 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/endoskeleton.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/endoskeleton.yml
@@ -33,163 +33,27 @@
       borg_l_arm+o:
         whitelist:
           tags:
-          - BorgGenericLArm
+          - BorgLArm
       borg_r_arm+o:
         whitelist:
           tags:
-          - BorgGenericRArm
+          - BorgRArm
       borg_l_leg+o:
         whitelist:
           tags:
-          - BorgGenericLLeg
+          - BorgLLeg
       borg_r_leg+o:
         whitelist:
           tags:
-          - BorgGenericRLeg
+          - BorgRLeg
       borg_head+o:
         whitelist:
           tags:
-          - BorgGenericHead
+          - BorgHead
       borg_chest+o:
         whitelist:
           tags:
-          - BorgGenericTorso
-      service_l_arm+o:
-        whitelist:
-          tags:
-          - BorgServiceLArm
-      service_r_arm+o:
-        whitelist:
-          tags:
-          - BorgServiceRArm
-      service_l_leg+o:
-        whitelist:
-          tags:
-          - BorgServiceLLeg
-      service_r_leg+o:
-        whitelist:
-          tags:
-          - BorgServiceRLeg
-      service_head+o:
-        whitelist:
-          tags:
-          - BorgServiceHead
-      service_chest+o:
-        whitelist:
-          tags:
-          - BorgServiceTorso
-      engineer_l_arm+o:
-        whitelist:
-          tags:
-          - BorgEngineerLArm
-      engineer_r_arm+o:
-        whitelist:
-          tags:
-          - BorgEngineerRArm
-      engineer_l_leg+o:
-        whitelist:
-          tags:
-          - BorgEngineerLLeg
-      engineer_r_leg+o:
-        whitelist:
-          tags:
-          - BorgEngineerRLeg
-      engineer_head+o:
-        whitelist:
-          tags:
-          - BorgEngineerHead
-      engineer_chest+o:
-        whitelist:
-          tags:
-          - BorgEngineerTorso
-      mining_l_arm+o:
-        whitelist:
-          tags:
-            - BorgMiningLArm
-      mining_r_arm+o:
-        whitelist:
-          tags:
-            - BorgMiningRArm
-      mining_l_leg+o:
-        whitelist:
-          tags:
-            - BorgMiningLLeg
-      mining_r_leg+o:
-        whitelist:
-          tags:
-            - BorgMiningRLeg
-      mining_head+o:
-        whitelist:
-          tags:
-            - BorgMiningHead
-      mining_chest+o:
-        whitelist:
-          tags:
-            - BorgMiningTorso
-      medical_l_arm+o:
-        whitelist:
-          tags:
-            - BorgMedicalLArm
-      medical_r_arm+o:
-        whitelist:
-          tags:
-            - BorgMedicalRArm
-      medical_l_leg+o:
-        whitelist:
-          tags:
-            - BorgMedicalLLeg
-      medical_r_leg+o:
-        whitelist:
-          tags:
-            - BorgMedicalRLeg
-      medical_head+o:
-        whitelist:
-          tags:
-            - BorgMedicalHead
-      medical_chest+o:
-        whitelist:
-          tags:
-            - BorgMedicalTorso
-      janitor_l_leg+o:
-        whitelist:
-          tags:
-            - BorgJanitorLLeg
-      janitor_r_leg+o:
-        whitelist:
-          tags:
-            - BorgJanitorRLeg
-      janitor_head+o:
-        whitelist:
-          tags:
-            - BorgJanitorHead
-      janitor_chest+o:
-        whitelist:
-          tags:
-            - BorgJanitorTorso
-      security_l_arm+o: # Delta-V : Start
-        whitelist:
-          tags:
-            - BorgSecurityLArm
-      security_r_arm+o:
-        whitelist:
-          tags:
-            - BorgSecurityRArm
-      security_l_leg+o:
-        whitelist:
-          tags:
-            - BorgSecurityLLeg
-      security_r_leg+o:
-        whitelist:
-          tags:
-            - BorgSecurityRLeg
-      security_head+o:
-        whitelist:
-          tags:
-            - BorgSecurityHead
-      security_chest+o:
-        whitelist:
-          tags:
-            - BorgSecurityTorso # Delta-V : End
+          - BorgTorso
   - type: ContainerContainer
     containers:
       part-container: !type:Container
@@ -197,52 +61,12 @@
   - type: PartAssembly
     parts:
       generic:
-      - BorgGenericLArm
-      - BorgGenericRArm
-      - BorgGenericLLeg
-      - BorgGenericRLeg
-      - BorgGenericHead
-      - BorgGenericTorso
-      service:
-      - BorgServiceLArm
-      - BorgServiceRArm
-      - BorgServiceLLeg
-      - BorgServiceRLeg
-      - BorgServiceHead
-      - BorgServiceTorso
-      engineer:
-      - BorgEngineerLArm
-      - BorgEngineerRArm
-      - BorgEngineerLLeg
-      - BorgEngineerRLeg
-      - BorgEngineerHead
-      - BorgEngineerTorso
-      medical:
-      - BorgMedicalLArm
-      - BorgMedicalRArm
-      - BorgMedicalLLeg
-      - BorgMedicalRLeg
-      - BorgMedicalHead
-      - BorgMedicalTorso
-      janitor:
-      - BorgJanitorLLeg
-      - BorgJanitorRLeg
-      - BorgJanitorHead
-      - BorgJanitorTorso
-      mining:
-      - BorgMiningLArm
-      - BorgMiningRArm
-      - BorgMiningLLeg
-      - BorgMiningRLeg
-      - BorgMiningHead
-      - BorgMiningTorso
-      security: # Delta-V : Start
-      - BorgSecurityLArm
-      - BorgSecurityRArm
-      - BorgSecurityLLeg
-      - BorgSecurityRLeg
-      - BorgSecurityHead
-      - BorgSecurityTorso # Delta-V : End
+      - BorgLArm
+      - BorgRArm
+      - BorgLLeg
+      - BorgRLeg
+      - BorgHead
+      - BorgTorso
   - type: Construction
     graph: Cyborg
     node: start
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_artifacts.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_artifacts.yml
index b53a6179814..fb628fc8083 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_artifacts.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_artifacts.yml
@@ -5,61 +5,66 @@
   description: A strange alien device.
   abstract: true
   components:
-    - type: Sprite
-      drawdepth: SmallObjects
-      sprite: Objects/Specific/Xenoarchaeology/xeno_artifacts.rsi
-      noRot: true
-      layers:
-      - state: ano30
-        map: [ "enum.ArtifactsVisualLayers.Base" ]
-      - state: ano30_on
-        map: [ "enum.ArtifactsVisualLayers.Effect" ]
-        visible: false
-    - type: Damageable
-    - type: Physics
-      bodyType: Dynamic
-    - type: Transform
-      noRot: true
-    - type: UserInterface #needs to be here for certain effects
-      interfaces:
-        enum.StorageUiKey.Key:
-          type: StorageBoundUserInterface
-        enum.TransferAmountUiKey.Key:
-          type: TransferAmountBoundUserInterface
-        enum.InstrumentUiKey.Key:
-          type: InstrumentBoundUserInterface
-        enum.IntercomUiKey.Key:
-          type: IntercomBoundUserInterface
-    - type: Reactive
-      groups:
-        Acidic: [Touch]
-    - type: Fixtures
-      fixtures:
-        fix1:
-          shape:
-            !type:PhysShapeCircle
-            radius: 0.45
-          density: 75
-          layer: # doesn't collide with artifact storage
-          - Opaque
-          mask:
-          - MachineMask
-    - type: InteractionOutline
-    - type: Artifact
-    - type: RandomArtifactSprite
-      maxSprite: 36
-    - type: RandomSprite
-      available:
-      - enum.ArtifactsVisualLayers.Effect:
-          ano01_on: Rainbow
-    - type: Appearance
-    - type: Actions
-    - type: Psionic #Nyano - Summary: Makes psionic on creation.
-    - type: GuideHelp
-      guides:
-      - Xenoarchaeology
-    - type: StealTarget
-      stealGroup: XenoArtifact
+  - type: Sprite
+    drawdepth: SmallObjects
+    sprite: Objects/Specific/Xenoarchaeology/xeno_artifacts.rsi
+    noRot: true
+    layers:
+    - state: ano30
+      map: [ "enum.ArtifactsVisualLayers.Base" ]
+    - state: ano30_on
+      map: [ "enum.ArtifactsVisualLayers.Effect" ]
+      visible: false
+  - type: Damageable
+  - type: Physics
+    bodyType: Dynamic
+  - type: Transform
+    noRot: true
+  - type: UserInterface #needs to be here for certain effects
+    interfaces:
+      enum.StorageUiKey.Key:
+        type: StorageBoundUserInterface
+      enum.TransferAmountUiKey.Key:
+        type: TransferAmountBoundUserInterface
+      enum.InstrumentUiKey.Key:
+        type: InstrumentBoundUserInterface
+      enum.IntercomUiKey.Key:
+        type: IntercomBoundUserInterface
+  - type: Reactive
+    groups:
+      Acidic: [Touch]
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.45
+        density: 75
+        layer: # doesn't collide with artifact storage
+        - Opaque
+        mask:
+        - MachineMask
+  - type: InteractionOutline
+  - type: Artifact
+  - type: RandomArtifactSprite
+    maxSprite: 36
+  - type: RandomSprite
+    available:
+    - enum.ArtifactsVisualLayers.Effect:
+        ano01_on: Rainbow
+  - type: Appearance
+  - type: Actions
+  - type: Psionic #Nyano - Summary: Makes psionic on creation.
+  - type: GuideHelp
+    guides:
+    - Xenoarchaeology
+  - type: StealTarget
+    stealGroup: XenoArtifact
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container # needed for the EffectStorage artifactEffect
+        ents: [ ]
+      revolver-ammo: !type:Container # needed for the EffectBigIron artifactEffect
 
 - type: entity
   parent: BaseXenoArtifact
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
index 8d66ec2d685..11acffdabdc 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
@@ -288,6 +288,7 @@
   - type: Injector
     injectOnly: false
     ignoreMobs: true
+    ignoreClosed: false
     minTransferAmount: 1
     maxTransferAmount: 5
     transferAmount: 1
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml
index 063937aee9a..e5c2987ec3e 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml
@@ -16,114 +16,145 @@
   id: AmmoProviderShotgunShell
   abstract: true
   components:
+    - type: Sprite
+      sprite: Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi
     - type: BallisticAmmoProvider
       mayTransfer: true
       whitelist:
         tags:
         - ShellShotgun
       capacity: 16
+    - type: MagazineVisuals
+      magState: mag
+      steps: 5
+      zeroVisible: false
+    - type: Appearance
 
 # Shotgun Shells
 - type: entity
-  name: shotgun beanbag cartridges dispenser
   parent: AmmoProviderShotgunShell
   id: BoxBeanbag
-  description: A dispenser box full of beanbag shots, designed for riot shotguns.
+  name: shell box (beanbag)
   components:
     - type: BallisticAmmoProvider
       proto: ShellShotgunBeanbag
     - type: Sprite
       layers:
-        - state: boxwide
-        - state: shellbeanbag
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
+      - state: mag-1
+        map: ["enum.GunVisualLayers.Mag"]
+      - state: beanbag
 
 - type: entity
-  name: shotgun lethal cartridges dispenser
+  name: shell box (lethal)
   parent: AmmoProviderShotgunShell
   id: BoxLethalshot
-  description: A dispenser box full of lethal pellet shots, designed for riot shotguns.
   components:
     - type: BallisticAmmoProvider
       proto: ShellShotgun
     - type: Sprite
       layers:
-        - state: boxwide
-        - state: shelllethal
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
+      - state: mag-1
+        map: ["enum.GunVisualLayers.Mag"]
+      - state: lethal
 
 - type: entity
-  name: shotgun slug cartridges dispenser
+  name: shell box (slug)
   parent: AmmoProviderShotgunShell
   id: BoxShotgunSlug
-  description: A dispenser box full of slugs, designed for riot shotguns.
   components:
     - type: BallisticAmmoProvider
       proto: ShellShotgunSlug
+    - type: MagazineVisuals
+      magState: mag-alt
+      steps: 5
+      zeroVisible: false
     - type: Sprite
       layers:
-        - state: boxwide
-        - state: shellslug
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
+      - state: mag-alt-1
+        map: ["enum.GunVisualLayers.Mag"]
+      - state: slug
 
 - type: entity
-  name: shotgun flare cartridges dispenser
+  name: shell box (flare)
   parent: AmmoProviderShotgunShell
   id: BoxShotgunFlare
-  description: A dispenser box full of flare cartridges, designed for riot shotguns.
   components:
     - type: BallisticAmmoProvider
       proto: ShellShotgunFlare
     - type: Sprite
       layers:
-        - state: boxwide
-        - state: shellflare
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
+      - state: mag-1
+        map: ["enum.GunVisualLayers.Mag"]
+      - state: flare
 
 - type: entity
-  name: shotgun incendiary cartridges dispenser
+  name: shell box (incendiary)
   parent: AmmoProviderShotgunShell
   id: BoxShotgunIncendiary
-  description: A dispenser box full of incendiary cartridges, designed for riot shotguns.
   components:
     - type: BallisticAmmoProvider
       proto: ShellShotgunIncendiary
     - type: Sprite
       layers:
-        - state: boxwide
-        - state: shellincendiary
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
+      - state: mag-1
+        map: ["enum.GunVisualLayers.Mag"]
+      - state: incendiary
 
 - type: entity
-  name: shotgun uranium cartridges dispenser
+  name: shell box (uranium)
   parent: AmmoProviderShotgunShell
   id: BoxShotgunUranium
-  description: A dispenser box full of uranium cartridges, designed for riot shotguns.
   components:
     - type: BallisticAmmoProvider
       proto: ShellShotgunUranium
+    - type: MagazineVisuals
+      magState: mag-alt
+      steps: 5
+      zeroVisible: false
     - type: Sprite
       layers:
-        - state: boxwide
-        - state: shelluranium
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
+      - state: mag-alt-1
+        map: ["enum.GunVisualLayers.Mag"]
+      - state: uranium
 
 - type: entity
-  name: shotgun practice cartridges dispenser
+  name: shell box (practice)
   parent: AmmoProviderShotgunShell
   id: BoxShotgunPractice
-  description: A dispenser box full of practice cartridges, designed for riot shotguns.
   components:
     - type: BallisticAmmoProvider
       proto: ShellShotgunPractice
     - type: Sprite
       layers:
-        - state: boxwide
-        - state: shellpractice
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
+      - state: mag-1
+        map: ["enum.GunVisualLayers.Mag"]
+      - state: practice
 
 - type: entity
-  name: tranquilizer cartridges dispenser
+  name: shell box (tranquilizer)
   parent: AmmoProviderShotgunShell
   id: BoxShellTranquilizer
-  description: A dispenser box full of tranquilizer cartridges, designed for riot shotguns.
   components:
     - type: BallisticAmmoProvider
       proto: ShellTranquilizer
     - type: Sprite
       layers:
-        - state: boxwide
-        - state: shelltranquilizer
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
+      - state: mag-1
+        map: ["enum.GunVisualLayers.Mag"]
+      - state: tranquilizer
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
index 47577b0857d..dd00440eec0 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
@@ -24,6 +24,11 @@
   name: shell (.50 beanbag)
   parent: BaseShellShotgun
   components:
+  - type: Tag
+    tags:
+    - Cartridge
+    - ShellShotgun
+    - ShellShotgunLight
   - type: Sprite
     layers:
       - state: beanbag
@@ -52,6 +57,11 @@
   name: shell (.50 flare)
   parent: BaseShellShotgun
   components:
+  - type: Tag
+    tags:
+    - Cartridge
+    - ShellShotgun
+    - ShellShotgunLight
   - type: Sprite
     layers:
       - state: flare
@@ -106,6 +116,11 @@
   name: shell (.50 tranquilizer)
   parent: BaseShellShotgun
   components:
+  - type: Tag
+    tags:
+    - Cartridge
+    - ShellShotgun
+    - ShellShotgunLight
   - type: Sprite
     layers:
       - state: tranquilizer
@@ -130,6 +145,11 @@
   description: A homemade shotgun shell that shoots painful glass shrapnel. The spread is so wide that it couldn't hit the broad side of a barn.
   parent: BaseShellShotgun
   components:
+  - type: Tag
+    tags:
+    - Cartridge
+    - ShellShotgun
+    - ShellShotgunLight
   - type: Sprite
     layers:
       - state: improvised
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index 167a51e402c..2ed2f924da3 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -618,7 +618,7 @@
   - type: AnomalousParticle
     particleType: Default
     severityOverride: true
-    severityPerSeverityHit: 0.1
+    severityPerSeverityHit: 0.3 # DeltaV raised to .3 from .1
     stabilityPerDestabilizingHit: 0.05
     healthPerWeakeningeHit: 1
     stabilityPerWeakeningeHit: -0.05
@@ -626,7 +626,7 @@
     impactEffect: BulletImpactEffectKinetic
     damage:
       types:
-        Heat: 20
+        Heat: 30 # DeltaV raised to 30 from 20
 
 - type: entity
   parent: AnomalousParticleDelta
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
index 856389f0cd0..392fb0f9978 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -19,6 +19,7 @@
     minAngle: 2
     maxAngle: 16
     fireRate: 8
+    burstFireRate: 8
     angleIncrease: 3
     angleDecay: 16  
     selectedMode: FullAuto
@@ -27,6 +28,7 @@
     - FullAuto
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/smg.ogg
+    defaultDirection: 1, 0
   - type: ChamberMagazineAmmoProvider
     soundRack:
       path: /Audio/Weapons/Guns/Cock/smg_cock.ogg
@@ -140,12 +142,15 @@
     - type: Gun
       minAngle: 21
       maxAngle: 32
-      fireRate: 6
-      selectedMode: FullAuto
+      fireRate: 12
+      burstFireRate: 12
+      selectedMode: Burst
       soundGunshot:
         path: /Audio/Weapons/Guns/Gunshots/atreides.ogg
       availableModes:
-        - FullAuto
+        - Burst
+      shotsPerBurst: 3
+      burstCooldown: 0.25
     - type: ItemSlots
       slots:
         gun_magazine:
@@ -250,6 +255,8 @@
     angleDecay: 6  
     selectedMode: FullAuto
     shotsPerBurst: 5
+    burstCooldown: 0.2
+    burstFireRate: 7
     availableModes:
     - SemiAuto
     - Burst
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml
index 9b046a7aae6..224697bc93f 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml
@@ -1,39 +1,75 @@
 - type: entity
   name: flare gun
-  parent: BaseWeaponLauncher
+  parent: BaseItem
   id: WeaponFlareGun
-  description: A compact, single-shot pistol that fires shotgun shells.
+  description: A compact, single-shot pistol that fires shotgun shells. Comes with a safety feature that prevents the user from fitting lethal shells inside.
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Shotguns/flaregun.rsi
     layers:
-      - state: icon
+      - state: base
         map: ["enum.GunVisualLayers.Base"]
   - type: Item
     size: Small
     sprite: Objects/Weapons/Guns/Shotguns/flaregun.rsi
-  - type: Gun
-    fireRate: 8
-    selectedMode: SemiAuto
-    availableModes:
-      - SemiAuto
-    soundGunshot:
-      path: /Audio/Weapons/Guns/Gunshots/flaregun.ogg
-  - type: BallisticAmmoProvider
-    whitelist:
-      tags:
-        - ShellShotgun
-    proto: ShellShotgunFlare
-    capacity: 1
-    soundInsert:
-      path: /Audio/Weapons/Guns/MagIn/shotgun_insert.ogg
+  - type: ItemSlots
+    slots:
+      gun_chamber:
+        name: Chamber
+        startingItem: ShellShotgunFlare
+        priority: 1
+        whitelist:
+          tags: ## TODO: Add a risk of the gun blowing up if using non-light shotgun shells, and then re-enable them.
+            ## - ShellShotgun
+            - ShellShotgunLight
   - type: ContainerContainer
     containers:
-      ballistic-ammo: !type:Container
-        ents: []
+      gun_chamber: !type:ContainerSlot
+  - type: ChamberMagazineAmmoProvider
+    autoCycle: false
+    boltClosed: false
+    canRack: false
+    soundBoltClosed: /Audio/Weapons/Guns/Cock/revolver_cock.ogg
+    soundBoltOpened: /Audio/Weapons/Guns/Cock/revolver_cock.ogg
+    soundRack: /Audio/Weapons/Guns/Cock/revolver_cock.ogg
   - type: Clothing
     sprite: Objects/Weapons/Guns/Shotguns/flaregun.rsi
     quickEquip: false
     slots:
     - Belt
     - suitStorage
+  - type: Appearance
+  - type: Gun
+    fireRate: 8
+    selectedMode: SemiAuto
+    availableModes:
+      - SemiAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/flaregun.ogg
+
+
+- type: entity
+  name: security shell gun
+  parent: [WeaponFlareGun, BaseSecurityContraband]
+  id: WeaponFlareGunSecurity
+  description: A modified flare gun originally designed to be used by security to launch non-lethal shotgun shells, however it can also fire lethal shells without risk.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Shotguns/flaregun_security.rsi
+    layers:
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
+  - type: Item
+    size: Small
+    sprite: Objects/Weapons/Guns/Shotguns/flaregun_security.rsi
+  - type: ItemSlots
+    slots:
+      gun_chamber:
+        name: Chamber
+        priority: 1
+        whitelist:
+          tags:
+            - ShellShotgun
+  - type: Tag
+    tags:
+    - Sidearm
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
index ae5b22f8e02..711b8c49feb 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
@@ -103,6 +103,9 @@
         Slash: 10
   - type: Item
     sprite: Objects/Weapons/Melee/combat_knife.rsi
+    storedSprite:
+      state: storage
+      sprite: Objects/Weapons/Melee/combat_knife.rsi
   - type: DisarmMalus
     malus: 0.225
 
@@ -117,6 +120,9 @@
     state: icon
   - type: Item
     sprite: Objects/Weapons/Melee/survival_knife.rsi
+    storedSprite:
+      state: storage
+      sprite: Objects/Weapons/Melee/survival_knife.rsi
 
 - type: entity
   name: kukri knife
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml
index a4441b18f7f..f8d5efb8c68 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml
@@ -42,9 +42,9 @@
   - type: Ensnaring
     freeTime: 2.0
     breakoutTime: 3.5 #all bola should generally be fast to remove
-    walkSpeed: 0.7 #makeshift bola shouldn't slow too much
-    sprintSpeed: 0.7
-    staminaDamage: 55 # Sudden weight increase sapping stamina
+    walkSpeed: 0.5 #makeshift bola shouldn't slow too much
+    sprintSpeed: 0.5
+    staminaDamage: 0 # anything but this is gamebreaking
     canThrowTrigger: true
     canMoveBreakout: true
   - type: LandAtCursor
diff --git a/Resources/Prototypes/Entities/Stations/base.yml b/Resources/Prototypes/Entities/Stations/base.yml
index dfe6eb66965..d7ef82d07e0 100644
--- a/Resources/Prototypes/Entities/Stations/base.yml
+++ b/Resources/Prototypes/Entities/Stations/base.yml
@@ -73,16 +73,17 @@
           maxCount: 2
           stationGrid: false
           paths:
+          #- /Maps/Ruins/abandoned_outpost.yml # TODO
           #- /Maps/Ruins/chunked_tcomms.yml # TODO
-          - /Maps/Ruins/DeltaV/biodome_satellite.yml #Delta V - Move to DV folder
-          - /Maps/Ruins/DeltaV/derelict.yml #Delta V - Move to DV folder
-          - /Maps/Ruins/DeltaV/djstation.yml #Delta V - Move to DV folder
+          - /Maps/Ruins/DeltaV/biodome_satellite.yml # DeltaV - Move to DV folder
+          - /Maps/Ruins/DeltaV/derelict.yml # DeltaV - Move to DV folder
+          - /Maps/Ruins/DeltaV/djstation.yml # DeltaV - Move to DV folder
           #- /Maps/Ruins/empty_flagship.yml # TODO
-          - /Maps/Ruins/DeltaV/old_ai_sat.yml #Delta V - Move to DV folder
-          - /Maps/Ruins/DeltaV/relaystation.yml #Delta V - Move to DV folder
+          - /Maps/Ruins/DeltaV/old_ai_sat.yml # DeltaV - Move to DV folder
+          - /Maps/Ruins/DeltaV/relaystation.yml # DeltaV - upstream removed
           #- /Maps/Ruins/syndicate_dropship.yml # TODO
-          - /Maps/Ruins/DeltaV/whiteship_ancient.yml #Delta V - Move to DV folder
-          - /Maps/Ruins/DeltaV/whiteship_bluespacejumper.yml #Delta V - Move to DV folder
+          - /Maps/Ruins/DeltaV/whiteship_ancient.yml # DeltaV - Move to DV folder
+          - /Maps/Ruins/DeltaV/whiteship_bluespacejumper.yml # DeltaV - Move to DV folder
         vgroid: !type:DungeonSpawnGroup
           minimumDistance: 300
           maximumDistance: 350
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
index 5f9c7bac012..c83cb4b6f74 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
@@ -104,6 +104,28 @@
   - type: Wires
     layoutId: AirlockEngineering
 
+- type: entity
+  parent: AirlockExternal
+  id: AirlockExternalCommandLocked
+  suffix: External, Command, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCommand ]
+  - type: Wires
+    layoutId: AirlockCommand
+
+- type: entity
+  parent: AirlockExternalGlass
+  id: AirlockExternalGlassCommandLocked
+  suffix: External, Glass, Command, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCommand ]
+  - type: Wires
+    layoutId: AirlockCommand
+
 - type: entity
   parent: AirlockExternal
   id: AirlockExternalAtmosphericsLocked
diff --git a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
index 4e1cd5827d7..5cd4864aa7f 100644
--- a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
+++ b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
@@ -404,6 +404,37 @@
       shader: "unshaded"
       visible: false
   - type: Appearance
+  - type: Construction
+    graph: LightFixture
+    node: emergencyLight
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 100
+      behaviors: #excess damage, don't spawn entities.
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: GlassBreak
+    - trigger:
+        !type:DamageTrigger
+        damage: 25
+      behaviors:
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetSteel1:
+            min: 1
+            max: 1
+          ShardGlass:
+            min: 1
+            max: 1
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: GlassBreak
   placement:
     mode: SnapgridCenter
     snap:
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
index f918eb6c304..e31111b782e 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
@@ -666,11 +666,11 @@
   - type: AccessReader
     access: [[ "NuclearOperative" ]]
   - type: CommunicationsConsole
-    title: comms-console-announcement-title-nukie
+    title: comms-console-announcement-title-unauthorized # DeltaV
     color: "#ff0000"
     canShuttle: false
     global: true #announce to everyone they're about to fuck shit up
-    sound: /Audio/Announcements/war.ogg
+    sound: /Audio/Announcements/intercept.ogg # DeltaV
   - type: Computer
     board: SyndicateCommsComputerCircuitboard
   - type: PointLight
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index f9bb95fbf1a..c33c3c19fd6 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -631,11 +631,6 @@
     - BorgModuleFireExtinguisher
     - BorgModuleRadiationDetection
     - BorgModuleTool
-    - BorgModuleAppraisal
-    - BorgModuleConstruction
-    - BorgModuleService
-    - BorgModuleTreatment
-    - BorgModuleCleaning
     - CyborgEndoskeleton
     - LeftArmBorg
     - RightArmBorg
@@ -643,61 +638,15 @@
     - RightLegBorg
     - LightHeadBorg
     - TorsoBorg
-    - LeftArmBorgEngineer
-    - RightArmBorgEngineer
-    - LeftLegBorgEngineer
-    - RightLegBorgEngineer
-    - HeadBorgEngineer
-    - TorsoBorgEngineer
-    - LeftLegBorgJanitor
-    - RightLegBorgJanitor
-    - HeadBorgJanitor
-    - TorsoBorgJanitor
-    - LeftArmBorgMedical
-    - RightArmBorgMedical
-    - LeftLegBorgMedical
-    - RightLegBorgMedical
-    - HeadBorgMedical
-    - TorsoBorgMedical
-    - LeftArmBorgMining
-    - RightArmBorgMining
-    - LeftLegBorgMining
-    - RightLegBorgMining
-    - HeadBorgMining
-    - TorsoBorgMining
-    - LeftArmBorgService
-    - RightArmBorgService
-    - LeftLegBorgService
-    - RightLegBorgService
-    - HeadBorgService
-    - TorsoBorgService
-    # Delta-V : Start
-    - BorgModuleSecurityPeacekeeper
-    - BorgModuleSecurityPatrol
-    - BorgModuleSecurityBastion
-    - LeftArmBorgSecurity
-    - RightArmBorgSecurity
-    - LeftLegBorgSecurity
-    - RightLegBorgSecurity
-    - HeadBorgSecurity
-    - TorsoBorgSecurity
-    # Delta-V : End
     dynamicRecipes:
     - ProximitySensor
-    - BorgModuleLightReplacer
     - BorgModuleAdvancedCleaning
-    - BorgModuleMining
-    - BorgModuleGrapplingGun
     - BorgModuleAdvancedTool
     - BorgModuleGPS
-    - BorgModuleRCD
     - BorgModuleArtifact
     - BorgModuleAnomaly
     - BorgModuleGardening
     - BorgModuleHarvesting
-    - BorgModuleMusique
-    - BorgModuleClowning
-    - BorgModuleDiagnosis
     - BorgModuleDefibrillator
     - BorgModuleAdvancedTreatment
     - RipleyHarness
@@ -724,7 +673,6 @@
     - JetpackMini
   # End Nyano additions
   # DeltaV Start
-    - BorgModuleSecurityDeescalate
     - BorgModuleSecurityChase
     - BorgModuleSecurityEscalate
     - JetpackVoid
@@ -852,6 +800,7 @@
       - TargetHuman
       - TargetSyndicate
       - WeaponDisablerPractice
+      - WeaponFlareGunSecurity
       - WeaponLaserCarbinePractice
       - Zipties
       # Begin DeltaV additions
@@ -894,7 +843,7 @@
       - MagazineRifleUranium
       - MagazineShotgunBeanbag
       - MagazineShotgunIncendiary
-      #- PortableRecharger # DeltaV - removed for some reason
+      - PortableRecharger
       - PowerCageHigh
       - PowerCageMedium
       - PowerCageSmall
diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml
index 315505b81e9..568a133749e 100644
--- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml
@@ -79,6 +79,7 @@
 - type: entity
   parent: BaseAnomalyCore
   id: AnomalyCoreFlesh
+  description: The core of a destroyed flesh anomaly. Pulsates sickeningly, but might be a hearty meal if cooked.
   suffix: Flesh
   components:
   - type: Sprite
@@ -241,7 +242,8 @@
 
 - type: entity
   parent: BaseAnomalyInertCore
-  id: AnomalyCoreFleshInert
+  id: AnomalyCoreFleshInert # Can be microwaved to turn it into a massive piece of meat
+  description: The inert core of a destroyed flesh anomaly. Pulsates sickeningly, but might be good food in the right hands?
   suffix: Flesh, Inert
   components:
   - type: Sprite
@@ -306,7 +308,7 @@
 
 - type: entity
   parent: BaseAnomalyInertCore
-  id: AnomalyCoreFloraInert
+  id: AnomalyCoreFloraInert #Turns into a seed that grows into artifexium
   suffix: Flora, Inert
   components:
   - type: Seed
diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
index 58453cb8363..f8dfd793da9 100644
--- a/Resources/Prototypes/GameRules/events.yml
+++ b/Resources/Prototypes/GameRules/events.yml
@@ -126,6 +126,8 @@
   components:
   - type: StationEvent
     startAnnouncement: station-event-bureaucratic-error-announcement
+    startAudio: #Delta-V: Previously unheard announcer line for DeltaV's custom announcer
+      path: /Audio/Announcements/bureaucratic_error.ogg 
     minimumPlayers: 25
     weight: 5
     duration: 1
diff --git a/Resources/Prototypes/GameRules/roundstart.yml b/Resources/Prototypes/GameRules/roundstart.yml
index 8b72770b647..50de7c4b746 100644
--- a/Resources/Prototypes/GameRules/roundstart.yml
+++ b/Resources/Prototypes/GameRules/roundstart.yml
@@ -191,12 +191,17 @@
 
 - type: entity
   id: TraitorReinforcement
-  parent: Traitor
+  parent: BaseTraitorRule
   components:
   - type: TraitorRule
     giveUplink: false
     giveCodewords: false # It would actually give them a different set of codewords than the regular traitors, anyway
     giveBriefing: false
+  - type: AntagSelection
+    definitions:
+    - prefRoles: [ Traitor ]
+      mindRoles:
+      - MindRoleTraitor
 
 - type: entity
   id: Revolutionary
@@ -243,6 +248,13 @@
       min: 600
       max: 900
   - type: ZombieRule
+  - type: DelayedRule # DeltaV: Grace period of 5 minutes before you can turn, to avoid a random passenger ruining your plan
+    delay: 300
+    delayedComponents:
+    - type: PendingZombie
+    - type: ZombifyOnDeath
+    - type: IncurableZombie
+    endedPopup: zombie-bioterrorist-romerol-active
   - type: AntagSelection
     definitions:
     - prefRoles: [ InitialInfected ]
@@ -253,14 +265,19 @@
         - ZombieImmune
         - AntagImmune
       briefing:
-        text: zombie-patientzero-role-greeting
+        text: zombie-bioterrorist-role-greeting # DeltaV: Different greeting
         color: Plum
         sound: "/Audio/Ambience/Antag/zombie_start.ogg"
       components:
-      - type: PendingZombie
-      - type: ZombifyOnDeath
-      - type: IncurableZombie
+      # Begin DeltaV Removals: Moved to DelayedRule above
+      #- type: PendingZombie
+      #- type: ZombifyOnDeath
+      #- type: IncurableZombie
+      # End DeltaV Removals
       - type: InitialInfected
+      - type: AutoImplant # DeltaV: Let them communicate to come up with a plan of action
+        implants:
+        - SyndicateRadioImplant
       mindRoles:
       - MindRoleInitialInfected
 
@@ -280,7 +297,6 @@
         tableId: CalmPestEventsTable
       - !type:NestedSelector
         tableId: SpicyPestEventsTable
-        
 
 - type: entityTable
   id: SpaceTrafficControlTable
diff --git a/Resources/Prototypes/Hydroponics/randomMutations.yml b/Resources/Prototypes/Hydroponics/randomMutations.yml
index 77ae2288f3a..f203f845473 100644
--- a/Resources/Prototypes/Hydroponics/randomMutations.yml
+++ b/Resources/Prototypes/Hydroponics/randomMutations.yml
@@ -19,6 +19,7 @@
       baseOdds: 0.036
       appliesToProduce: false
       effect: !type:PlantSpeciesChange
+      persists: false
     - name: Unviable
       baseOdds: 0.109
       persists: false
diff --git a/Resources/Prototypes/InventoryTemplates/borg.yml b/Resources/Prototypes/InventoryTemplates/borg.yml
index d43519f61cf..3d3ef29eb03 100644
--- a/Resources/Prototypes/InventoryTemplates/borg.yml
+++ b/Resources/Prototypes/InventoryTemplates/borg.yml
@@ -26,8 +26,7 @@
   - name: head
     slotTexture: head
     slotFlags: HEAD
-    slotGroup: MainHotbar
-    uiWindowPos: 0,0
+    uiWindowPos: 1,0
     strippingWindowPos: 0,0
     displayName: Head
     offset: 0.015625, 0
diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
index 8ae7c622e3b..d81dd6c6116 100644
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -43,7 +43,6 @@
   - TowelColorPurple
   - TowelColorRed
   - TowelColorSilver
-  - TowelColorLightBlue
   - TowelColorWhite
   - TowelColorYellow
   - AACTablet # DeltaV
@@ -51,6 +50,7 @@
   - SilverRing # DeltaV
   - Cane # DeltaV
   - WhiteCane #DeltaV
+  - CDDogtags # _CD
 
 - type: loadoutGroup
   id: Glasses
diff --git a/Resources/Prototypes/Maps/glacier.yml b/Resources/Prototypes/Maps/glacier.yml
index 59dd9f381dd..1bdd98b3cee 100644
--- a/Resources/Prototypes/Maps/glacier.yml
+++ b/Resources/Prototypes/Maps/glacier.yml
@@ -22,6 +22,7 @@
       - type: StationJobs
         availableJobs:
           Captain: [ 1, 1 ]
+          StationAi: [ 1, 1 ]
         #service
           HeadOfPersonnel: [ 1, 1 ]
           Bartender: [ 2, 2 ]
@@ -57,6 +58,7 @@
           ResearchDirector: [ 1, 1 ]
           Chaplain: [ 1, 1 ]
           ForensicMantis: [ 1, 1 ]
+          Roboticist: [ 1, 2 ]
           Scientist: [ 2, 3 ]
           ResearchAssistant: [ 2, 2 ]
           Borg: [ 2, 3 ]
diff --git a/Resources/Prototypes/Maps/lighthouse.yml b/Resources/Prototypes/Maps/lighthouse.yml
index d153890b004..49872d6da78 100644
--- a/Resources/Prototypes/Maps/lighthouse.yml
+++ b/Resources/Prototypes/Maps/lighthouse.yml
@@ -17,7 +17,9 @@
           prefixCreator: '14'
       - type: StationJobs
         availableJobs:
+        #command
           Captain: [ 1, 1 ]
+          StationAi: [ 1, 1 ]
         #service
           HeadOfPersonnel: [ 1, 1 ]
           Bartender: [ 2, 4 ]
@@ -52,6 +54,7 @@
           ResearchDirector: [ 1, 1 ]
           Chaplain: [ 1, 1 ]
           ForensicMantis: [ 1, 1 ]
+          Roboticist: [ 1, 1 ]
           Scientist: [ 3, 4 ]
           ResearchAssistant: [ 2, 3 ]
           Borg: [ 1, 2 ]
diff --git a/Resources/Prototypes/Maps/shoukou.yml b/Resources/Prototypes/Maps/shoukou.yml
index 37ab1eb328a..3a2e507e2f5 100644
--- a/Resources/Prototypes/Maps/shoukou.yml
+++ b/Resources/Prototypes/Maps/shoukou.yml
@@ -59,6 +59,7 @@
             Prisoner: [ 2, 2 ]
           #Science
             ResearchDirector: [ 1, 1 ]
+            Roboticist: [ 1, 1 ]
             Scientist: [ 2, 4 ]
             ResearchAssistant: [ 2, 3 ]
             Chaplain: [ 1, 1 ]
@@ -69,5 +70,6 @@
             Courier: [ 1, 2 ]
             CargoTechnician: [ 2, 3 ]
           #Silicon
+            StationAi: [ 1, 1 ]
             Borg: [ 2, 2 ]
 
diff --git a/Resources/Prototypes/Nyanotrasen/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Nyanotrasen/Recipes/Cooking/meal_recipes.yml
index 3c024f61ef5..d2a8562df67 100644
--- a/Resources/Prototypes/Nyanotrasen/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Nyanotrasen/Recipes/Cooking/meal_recipes.yml
@@ -175,7 +175,7 @@
   #   Butter: 5
   solids:
     FoodMothBakedCorn: 1
-    FoodButter: 1
+    FoodButterSlice: 1
 
 - type: microwaveMealRecipe
   id: RecipeMothMozzarellaSticks
diff --git a/Resources/Prototypes/Nyanotrasen/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Nyanotrasen/Voice/speech_emote_sounds.yml
index b752e94020f..95371745564 100644
--- a/Resources/Prototypes/Nyanotrasen/Voice/speech_emote_sounds.yml
+++ b/Resources/Prototypes/Nyanotrasen/Voice/speech_emote_sounds.yml
@@ -36,6 +36,10 @@
       collection: FelinidGrowls
     Purr:
       collection: FelinidPurrs
+    Gasp:
+      collection: MaleGasp
+    DefaultDeathgasp:
+      collection: MaleDeathGasp
 
 - type: emoteSounds
   id: FemaleFelinid
@@ -74,3 +78,7 @@
       collection: FelinidGrowls
     Purr:
       collection: FelinidPurrs
+    Gasp:
+      collection: FemaleGasp
+    DefaultDeathgasp:
+      collection: FemaleDeathGasp
diff --git a/Resources/Prototypes/Polymorphs/polymorph.yml b/Resources/Prototypes/Polymorphs/polymorph.yml
index 96739a50d3c..fe28287cb09 100644
--- a/Resources/Prototypes/Polymorphs/polymorph.yml
+++ b/Resources/Prototypes/Polymorphs/polymorph.yml
@@ -186,3 +186,19 @@
     forced: true
     revertOnCrit: false
     revertOnDeath: false
+
+# Temporary Jaunt
+# Don't make permanent jaunts until action system can be reworked to allow do afters and cooldown pausing
+- type: polymorph
+  id: Jaunt
+  configuration:
+    entity: EtherealJaunt
+    transferName: true
+    inventory: None
+    forced: true
+    revertOnDeath: true
+    revertOnCrit: true
+    allowRepeatedMorphs: false
+    polymorphSound: /Audio/Magic/ethereal_enter.ogg
+    exitPolymorphSound: /Audio/Magic/ethereal_exit.ogg
+    duration: 3
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/food/steak.yml b/Resources/Prototypes/Recipes/Construction/Graphs/food/steak.yml
index 4c104003319..61cb844037b 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/food/steak.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/food/steak.yml
@@ -174,6 +174,22 @@
   - node: bacon
     entity: FoodMeatBaconCooked
 
+# anomaly meat steak
+- type: constructionGraph
+  id: AnomalyMeatSteak
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: anomaly steak
+      completed:
+      - !type:PlaySound
+        sound: /Audio/Effects/sizzle.ogg
+      steps:
+      - minTemperature: 335
+  - node: anomaly steak
+    entity: FoodMeatAnomalyCooked
+
 # cutlets
 
 - type: constructionGraph
@@ -294,4 +310,4 @@
       steps:
       - minTemperature: 345
   - node: xeno cutlet
-    entity: FoodMeatXenoCutletCooked
\ No newline at end of file
+    entity: FoodMeatXenoCutletCooked
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/meatspike.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/meatspike.yml
index 02e141826cb..29252110a88 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/meatspike.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/meatspike.yml
@@ -13,7 +13,7 @@
           steps:
             - material: Steel
               amount: 15
-              doAfter: 2
+              doAfter: 30 # DeltaV - Was 2
     - node: MeatSpike
       entity: KitchenSpike
       edges:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/machines/cyborg.yml b/Resources/Prototypes/Recipes/Construction/Graphs/machines/cyborg.yml
index 01f32d09edd..4ebc43667c5 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/machines/cyborg.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/machines/cyborg.yml
@@ -5,18 +5,6 @@
   - node: start
     entity: CyborgEndoskeleton
     edges:
-
-    # empty the parts via prying
-    - to: start
-      conditions:
-      - !type:ContainerNotEmpty
-        container: part-container
-      steps:
-      - tool: Prying
-        doAfter: 0.5
-        completed:
-          - !type:EmptyAllContainers
-
     - to: cyborg
       steps:
       - assemblyId: generic
@@ -44,216 +32,5 @@
       - tool: Screwing
         doAfter: 0.5
 
-    - to: engineer
-      steps:
-      - assemblyId: engineer
-        guideString: borg-construction-guide-string
-
-      - material: Cable
-        amount: 1
-        doAfter: 1
-        store: part-container
-
-      - component: Flash
-        name: flash
-        store: part-container
-        icon:
-          sprite: Objects/Weapons/Melee/flash.rsi
-          state: flash
-
-      - component: Flash
-        name: second flash
-        store: part-container
-        icon:
-          sprite: Objects/Weapons/Melee/flash.rsi
-          state: flash
-
-      - tool: Screwing
-        doAfter: 0.5
-
-    - to: janitor
-      steps:
-      - assemblyId: janitor
-        guideString: borg-construction-guide-string
-
-      - material: Cable
-        amount: 1
-        doAfter: 1
-        store: part-container
-
-      - component: Flash
-        name: flash
-        store: part-container
-        icon:
-          sprite: Objects/Weapons/Melee/flash.rsi
-          state: flash
-
-      - component: Flash
-        name: second flash
-        store: part-container
-        icon:
-          sprite: Objects/Weapons/Melee/flash.rsi
-          state: flash
-
-      - tool: Screwing
-        doAfter: 0.5
-
-    - to: medical
-      steps:
-      - assemblyId: medical
-        guideString: borg-construction-guide-string
-
-      - material: Cable
-        amount: 1
-        doAfter: 1
-        store: part-container
-
-      - component: Flash
-        name: flash
-        store: part-container
-        icon:
-          sprite: Objects/Weapons/Melee/flash.rsi
-          state: flash
-
-      - component: Flash
-        name: second flash
-        store: part-container
-        icon:
-          sprite: Objects/Weapons/Melee/flash.rsi
-          state: flash
-
-      - tool: Screwing
-        doAfter: 0.5
-
-    - to: mining
-      steps:
-      - assemblyId: mining
-        guideString: borg-construction-guide-string
-
-      - material: Cable
-        amount: 1
-        doAfter: 1
-        store: part-container
-
-      - component: Flash
-        name: flash
-        store: part-container
-        icon:
-          sprite: Objects/Weapons/Melee/flash.rsi
-          state: flash
-
-      - component: Flash
-        name: second flash
-        store: part-container
-        icon:
-          sprite: Objects/Weapons/Melee/flash.rsi
-          state: flash
-
-      - tool: Screwing
-        doAfter: 0.5
-
-    - to: service
-      steps:
-      - assemblyId: service
-        guideString: borg-construction-guide-string
-
-      - material: Cable
-        amount: 1
-        doAfter: 1
-        store: part-container
-
-      - component: Flash
-        name: flash
-        store: part-container
-        icon:
-          sprite: Objects/Weapons/Melee/flash.rsi
-          state: flash
-
-      - component: Flash
-        name: second flash
-        store: part-container
-        icon:
-          sprite: Objects/Weapons/Melee/flash.rsi
-          state: flash
-
-      - tool: Screwing
-        doAfter: 0.5
-
-
-    - to: security # Delta-V Security Borg Start
-      steps:
-      - assemblyId: security
-        guideString: borg-construction-guide-string
-
-      - material: Cable
-        amount: 1
-        doAfter: 1
-        store: part-container
-
-      - component: Flash
-        name: flash
-        store: part-container
-        icon:
-          sprite: Objects/Weapons/Melee/flash.rsi
-          state: flash
-
-      - component: Flash
-        name: second flash
-        store: part-container
-        icon:
-          sprite: Objects/Weapons/Melee/flash.rsi
-          state: flash
-
-      - tool: Screwing
-        doAfter: 2
-
-      - material: Plasteel
-        amount: 2
-        doAfter: 1
-        store: part-container
-
-      - tool: Welding
-        doAfter: 2
-
-      - tag: BorgSecurityArmour
-        name: one of security's armour vests
-        store: part-container
-        icon:
-          sprite: DeltaV/Clothing/OuterClothing/Armor/platecarrier.rsi
-          state: icon
-
-      - tool: Cutting
-        doAfter: 1
-
-      - tool: Welding
-        doAfter: 2 # Delta-V : End
-
   - node: cyborg
-    entity: BorgChassisGeneric
-
-  - node: engineer
-    entity: BorgChassisEngineer
-
-  - node: janitor
-    entity: BorgChassisJanitor
-
-  - node: mining
-    entity: BorgChassisMining
-
-  - node: medical
-    entity: BorgChassisMedical
-
-  - node: service
-    entity: BorgChassisService
-
-  - node: security # Delta-V Security Borg
-    entity: BorgChassisSecurity # Delta-V Security Borg
-
-  - node: syndicateassault
-    entity: BorgChassisSyndicateAssault
-
-  - node: syndicatemedical
-    entity: BorgChassisSyndicateMedical
-
-  - node: syndicatesaboteur
-    entity: BorgChassisSyndicateSaboteur
+    entity: BorgChassisSelectable
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/lighting.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/lighting.yml
index f70a44efe3c..fe9bca8b785 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/lighting.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/lighting.yml
@@ -24,6 +24,14 @@
             - material: Steel
               amount: 1
               doAfter: 2.0
+        - to: emergencyLight
+          steps:
+            - material: Steel
+              amount: 1
+              doAfter: 1.0
+            - material: Glass
+              amount: 1
+              doAfter: 1.0
     - node: tubeLight
       entity: PoweredlightEmpty
       edges:
@@ -83,4 +91,19 @@
             - !type:SpawnPrototype
               prototype: SheetSteel1
               amount: 1
-            - !type:DeleteEntity {}
\ No newline at end of file
+            - !type:DeleteEntity {}
+    - node: emergencyLight
+      entity: EmergencyLight
+      edges:
+        - to: start
+          steps:
+            - tool: Screwing
+              doAfter: 2.0
+          completed:
+            - !type:SpawnPrototype
+              prototype: SheetSteel1
+              amount: 1
+            - !type:SpawnPrototype
+              prototype: SheetGlass1
+              amount: 1
+            - !type:DeleteEntity {}
diff --git a/Resources/Prototypes/Recipes/Construction/structures.yml b/Resources/Prototypes/Recipes/Construction/structures.yml
index 3d36254bce8..4dcdaa772ba 100644
--- a/Resources/Prototypes/Recipes/Construction/structures.yml
+++ b/Resources/Prototypes/Recipes/Construction/structures.yml
@@ -1456,6 +1456,24 @@
   # Same here. - 20kdc
     - !type:TileNotBlocked
 
+- type: construction
+  name: emergency light
+  id: EmergencyLightFixture
+  graph: LightFixture
+  startNode: start
+  targetNode: emergencyLight
+  category: construction-category-structures
+  description: An emergency light.
+  icon:
+    sprite: Structures/Wallmounts/Lighting/emergency_light.rsi
+    state: base
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canRotate: true
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
+
 - type: construction
   name: ground light post
   id: LightGroundFixture
diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
index 173cf9e9dbd..da66f7a0d8a 100644
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -2050,3 +2050,27 @@
     FoodCroissantRaw: 1
     FoodButterSlice: 1
     ShardGlass: 1
+
+- type: microwaveMealRecipe
+  id: RecipeInertAnomalyMeat
+  name: inert meat anomaly recipe
+  result: FoodMeatAnomaly
+  time: 5
+  solids:
+    AnomalyCoreFleshInert: 1
+
+- type: microwaveMealRecipe
+  id: RecipeAnomalyMeat
+  name: meat anomaly recipe
+  result: FoodMeatAnomaly
+  time: 5
+  solids:
+    AnomalyCoreFlesh: 1
+
+- type: microwaveMealRecipe
+  id: RecipeAnomalyMeatCooked
+  name: cooked meat anomaly recipe
+  result: FoodMeatAnomalyCooked
+  time: 5
+  solids:
+    FoodMeatAnomaly: 1
diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/web.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/web.yml
index 7c17cbc0806..7e303f8ba30 100644
--- a/Resources/Prototypes/Recipes/Crafting/Graphs/web.yml
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/web.yml
@@ -41,13 +41,13 @@
       - material: WebSilk
         amount: 12
         doAfter: 6
-        
+
     - to: boots
       steps:
       - material: WebSilk
         amount: 2
         doAfter: 4
-        
+
   # Deconstruction
   - node: tile
     entity: FloorTileItemWeb
diff --git a/Resources/Prototypes/Recipes/Lathes/robotics.yml b/Resources/Prototypes/Recipes/Lathes/robotics.yml
index bf8deba9840..a4413e01ebe 100644
--- a/Resources/Prototypes/Recipes/Lathes/robotics.yml
+++ b/Resources/Prototypes/Recipes/Lathes/robotics.yml
@@ -61,8 +61,6 @@
   materials:
     Steel: 1500
 
-# Generic
-
 - type: latheRecipe
   parent: BaseBorgLimbRecipe
   id: LeftArmBorg
@@ -93,162 +91,6 @@
   id: TorsoBorg
   result: TorsoBorg
 
-# Engineer
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: LeftArmBorgEngineer
-  result: LeftArmBorgEngineer
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: RightArmBorgEngineer
-  result: RightArmBorgEngineer
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: LeftLegBorgEngineer
-  result: LeftLegBorgEngineer
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: RightLegBorgEngineer
-  result: RightLegBorgEngineer
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: HeadBorgEngineer
-  result: HeadBorgEngineer
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: TorsoBorgEngineer
-  result: TorsoBorgEngineer
-
-# Medical
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: LeftArmBorgMedical
-  result: LeftArmBorgMedical
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: RightArmBorgMedical
-  result: RightArmBorgMedical
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: LeftLegBorgMedical
-  result: LeftLegBorgMedical
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: RightLegBorgMedical
-  result: RightLegBorgMedical
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: HeadBorgMedical
-  result: HeadBorgMedical
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: TorsoBorgMedical
-  result: TorsoBorgMedical
-
-# Mining
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: LeftArmBorgMining
-  result: LeftArmBorgMining
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: RightArmBorgMining
-  result: RightArmBorgMining
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: LeftLegBorgMining
-  result: LeftLegBorgMining
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: RightLegBorgMining
-  result: RightLegBorgMining
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: HeadBorgMining
-  result: HeadBorgMining
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: TorsoBorgMining
-  result: TorsoBorgMining
-
-# Service
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: LeftArmBorgService
-  result: LeftArmBorgService
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: RightArmBorgService
-  result: RightArmBorgService
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: LeftLegBorgService
-  result: LeftLegBorgService
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: RightLegBorgService
-  result: RightLegBorgService
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: HeadBorgService
-  result: HeadBorgService
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: TorsoBorgService
-  result: TorsoBorgService
-
-# Janitor
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: LeftLegBorgJanitor
-  result: LeftLegBorgJanitor
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: RightLegBorgJanitor
-  result: RightLegBorgJanitor
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: HeadBorgJanitor
-  result: HeadBorgJanitor
-  materials:
-    Steel: 500
-    Glass: 200
-
-- type: latheRecipe
-  parent: BaseBorgLimbRecipe
-  id: TorsoBorgJanitor
-  result: TorsoBorgJanitor
-  materials:
-    Steel: 500
-    Glass: 200
-
 # Parts
 
 - type: latheRecipe
@@ -304,23 +146,6 @@
   id: BorgModuleTool
   result: BorgModuleTool
 
-# Mining Modules
-
-- type: latheRecipe
-  parent: BaseBorgModuleRecipe
-  id: BorgModuleAppraisal
-  result: BorgModuleAppraisal
-
-- type: latheRecipe
-  parent: BaseBorgModuleRecipe
-  id: BorgModuleMining
-  result: BorgModuleMining
-
-- type: latheRecipe
-  parent: BaseGoldBorgModuleRecipe
-  id: BorgModuleGrapplingGun
-  result: BorgModuleGrapplingGun
-
 # Engineering Modules
 
 - type: latheRecipe
@@ -328,28 +153,8 @@
   id: BorgModuleAdvancedTool
   result: BorgModuleAdvancedTool
 
-- type: latheRecipe
-  parent: BaseBorgModuleRecipe
-  id: BorgModuleConstruction
-  result: BorgModuleConstruction
-
-- type: latheRecipe
-  parent: BaseGoldBorgModuleRecipe
-  id: BorgModuleRCD
-  result: BorgModuleRCD
-
 # Janitor Modules
 
-- type: latheRecipe
-  parent: BaseBorgModuleRecipe
-  id: BorgModuleLightReplacer
-  result: BorgModuleLightReplacer
-
-- type: latheRecipe
-  parent: BaseBorgModuleRecipe
-  id: BorgModuleCleaning
-  result: BorgModuleCleaning
-
 - type: latheRecipe
   parent: BaseGoldBorgModuleRecipe
   id: BorgModuleAdvancedCleaning
@@ -357,16 +162,6 @@
 
 # Medical Modules
 
-- type: latheRecipe
-  parent: BaseBorgModuleRecipe
-  id: BorgModuleDiagnosis
-  result: BorgModuleDiagnosis
-
-- type: latheRecipe
-  parent: BaseBorgModuleRecipe
-  id: BorgModuleTreatment
-  result: BorgModuleTreatment
-
 - type: latheRecipe
   parent: BaseGoldBorgModuleRecipe
   id: BorgModuleAdvancedTreatment
@@ -391,16 +186,6 @@
 
 # Service Modules
 
-- type: latheRecipe
-  parent: BaseBorgModuleRecipe
-  id: BorgModuleService
-  result: BorgModuleService
-
-- type: latheRecipe
-  parent: BaseBorgModuleRecipe
-  id: BorgModuleMusique
-  result: BorgModuleMusique
-
 - type: latheRecipe
   parent: BaseBorgModuleRecipe
   id: BorgModuleGardening
@@ -410,8 +195,3 @@
   parent: BaseBorgModuleRecipe
   id: BorgModuleHarvesting
   result: BorgModuleHarvesting
-
-- type: latheRecipe
-  parent: BaseBorgModuleRecipe
-  id: BorgModuleClowning
-  result: BorgModuleClowning
diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml
index 5a7ad143ac7..f6f303e5e3b 100644
--- a/Resources/Prototypes/Recipes/Lathes/security.yml
+++ b/Resources/Prototypes/Recipes/Lathes/security.yml
@@ -603,6 +603,15 @@
     Plastic: 320
     Uranium: 240
 
+- type: latheRecipe
+  parent: BaseWeaponRecipe
+  id: WeaponFlareGunSecurity
+  result: WeaponFlareGunSecurity
+  completetime: 6
+  materials:
+    Plastic: 100
+    Steel: 400
+
 - type: latheRecipe
   parent: BaseWeaponRecipe
   id: WeaponDisabler
@@ -657,14 +666,13 @@
     Plastic: 100
     Glass: 20
 
-# DeltaV: removed, idk why
-#- type: latheRecipe
-#  id: PortableRecharger
-#  result: PortableRecharger
-#  completetime: 15
-#  materials:
-#    Steel: 2000
-#    Uranium: 2000
-#    Plastic: 1000
-#    Plasma: 500
-#    Glass: 500
+- type: latheRecipe
+  id: PortableRecharger
+  result: PortableRecharger
+  completetime: 15
+  materials:
+    Steel: 2000
+    Uranium: 2000
+    Plastic: 1000
+    Plasma: 500
+    Glass: 500
diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml
index 1cd05a9c80e..ca7c0f1935d 100644
--- a/Resources/Prototypes/Research/arsenal.yml
+++ b/Resources/Prototypes/Research/arsenal.yml
@@ -59,8 +59,8 @@
   cost: 5000
   recipeUnlocks:
   - MagazineShotgunBeanbag
-  - BoxShellTranquilizer 
-  - BoxBeanbag 
+  - BoxShellTranquilizer
+  - BoxBeanbag
   - WeaponDisabler
   # DeltaV - rubber ammo which upstream removed
   - MagazineRifleRubber
@@ -113,9 +113,7 @@
   - TelescopicShield
   - HoloprojectorSecurity
   - WeaponDisablerSMG
-  - BorgModuleSecurityDeescalate # Delta-V : SecBorg Research
   - BorgModuleSecurityEscalate # Delta-V : SecBorg Research
- 
 
 - type: technology
   id: ExplosiveTechnology
@@ -211,6 +209,7 @@
   cost: 15000
   recipeUnlocks:
   - WeaponAdvancedLaser
+  - PortableRecharger
 
 - type: technology
   id: ExperimentalBatteryAmmo
diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml
index 32730d1bcf9..fd2fa5a206e 100644
--- a/Resources/Prototypes/Research/civilianservices.yml
+++ b/Resources/Prototypes/Research/civilianservices.yml
@@ -67,8 +67,6 @@
   recipeUnlocks:
     - ComputerTelevisionCircuitboard
     - SynthesizerInstrument
-    - BorgModuleMusique
-    - BorgModuleClowning
     - DawInstrumentMachineCircuitboard
     - MassMediaCircuitboard
     - JukeboxCircuitBoard
@@ -83,7 +81,6 @@
   tier: 1
   cost: 5000
   recipeUnlocks:
-  - BorgModuleLightReplacer
   - BorgModuleAdvancedCleaning
 
 - type: technology
diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml
index cbbbf62ca80..37496484b79 100644
--- a/Resources/Prototypes/Research/industrial.yml
+++ b/Resources/Prototypes/Research/industrial.yml
@@ -12,8 +12,6 @@
   recipeUnlocks:
   - MiningDrill
   - MineralScannerEmpty
-  - BorgModuleMining
-  - BorgModuleGrapplingGun
   - OreProcessorIndustrialMachineCircuitboard
   - SalvageExpeditionsComputerCircuitboard # DeltaV
   - ClothingMaskWeldingGas
@@ -170,7 +168,6 @@
     - PowerDrill
     - JawsOfLife
     - BorgModuleAdvancedTool
-    - BorgModuleRCD
 
 - type: technology
   id: MassExcavation
diff --git a/Resources/Prototypes/Roles/Jobs/Science/borg.yml b/Resources/Prototypes/Roles/Jobs/Science/borg.yml
index 441583c0ca4..0d53e93ee7a 100644
--- a/Resources/Prototypes/Roles/Jobs/Science/borg.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/borg.yml
@@ -27,5 +27,5 @@
   canBeAntag: false
   icon: JobIconBorg
   supervisors: job-supervisors-rd
-  jobEntity: PlayerBorgGeneric
+  jobEntity: PlayerBorgBattery
   applyTraits: false
diff --git a/Resources/Prototypes/XenoArch/Effects/utility_effects.yml b/Resources/Prototypes/XenoArch/Effects/utility_effects.yml
index a3261dc4de3..354bbb3740a 100644
--- a/Resources/Prototypes/XenoArch/Effects/utility_effects.yml
+++ b/Resources/Prototypes/XenoArch/Effects/utility_effects.yml
@@ -49,10 +49,6 @@
   permanentComponents:
   - type: Item
     size: Huge
-  - type: ContainerContainer
-    containers:
-      storagebase: !type:Container
-        ents: [ ]
   - type: Storage
     maxItemSize: Huge
     grid:
@@ -163,9 +159,6 @@
     components:
     - Item
   permanentComponents:
-  - type: ContainerContainer
-    containers:
-      revolver-ammo: !type:Container
   - type: RevolverAmmoProvider
     whitelist:
       tags:
diff --git a/Resources/Prototypes/_CD/Entities/Objects/Misc/dogtags.yml b/Resources/Prototypes/_CD/Entities/Objects/Misc/dogtags.yml
new file mode 100644
index 00000000000..22a1b22a72f
--- /dev/null
+++ b/Resources/Prototypes/_CD/Entities/Objects/Misc/dogtags.yml
@@ -0,0 +1,14 @@
+- type: entity
+  id: CDDogtags
+  parent: ClothingNeckBase 
+  name: dogtags
+  description: A set of dogtags, hanging from a small piece of cord for wearing and carrying.
+  components:
+  - type: Sprite
+    sprite: _CD/Objects/Misc/dogtags.rsi
+    layers:
+    - state: dogtag
+  - type: Clothing
+    sprite: _CD/Objects/Misc/dogtags.rsi
+  - type: Appearance
+  - type: Engraveable
diff --git a/Resources/Prototypes/_CD/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/_CD/Loadouts/Miscellaneous/trinkets.yml
new file mode 100644
index 00000000000..5c04fc51dac
--- /dev/null
+++ b/Resources/Prototypes/_CD/Loadouts/Miscellaneous/trinkets.yml
@@ -0,0 +1,5 @@
+- type: loadout
+  id: CDDogtags
+  storage:
+    back:
+    - CDDogtags
diff --git a/Resources/Prototypes/_CD/Reagents/medicine.yml b/Resources/Prototypes/_CD/Reagents/medicine.yml
index a99aafb7057..1a6d4d6ad5f 100644
--- a/Resources/Prototypes/_CD/Reagents/medicine.yml
+++ b/Resources/Prototypes/_CD/Reagents/medicine.yml
@@ -206,36 +206,36 @@
         damage:
           types:
             Poison: 0.5
-      - !type:GenericStatusEffect
-        conditions:
-        - !type:ReagentThreshold
-          reagent: Tranquinase # conflicts with many other meds
-          min: 2.0
-        key: ForcedSleep
-        component: ForcedSleeping
-        refresh: false
-        type: Add
-        probability: 0.4
-      - !type:GenericStatusEffect
-        conditions:
-        - !type:ReagentThreshold
-          reagent: Soretizone # conflicts with many other meds
-          min: 3.0
-        key: ForcedSleep
-        component: ForcedSleeping
-        refresh: false
-        type: Add
-        probability: 0.3
-      - !type:GenericStatusEffect
-        conditions:
-        - !type:ReagentThreshold
-          reagent: Agonolexyne # conflicts with many other meds
-          min: 0.25
-        key: ForcedSleep
-        component: ForcedSleeping
-        refresh: false
-        type: Add
-        probability: 0.3
+     #- !type:GenericStatusEffect
+       #conditions:
+       #- !type:ReagentThreshold
+         #reagent: Tranquinase # conflicts with many other meds
+         #min: 2.0
+       #key: ForcedSleep
+       #component: ForcedSleeping
+       #refresh: false
+       #type: Add
+       #probability: 0.4
+     #- !type:GenericStatusEffect # DeltaV - Removed all psych med forcesleeps
+       #conditions:
+       #- !type:ReagentThreshold
+         #reagent: Soretizone # conflicts with many other meds
+         #min: 3.0
+       #key: ForcedSleep
+       #component: ForcedSleeping
+       #refresh: false
+       #type: Add
+       #probability: 0.3
+     #- !type:GenericStatusEffect # DeltaV - Removed all psych med forcesleeps
+       #conditions:
+       #- !type:ReagentThreshold
+         #reagent: Agonolexyne # conflicts with many other meds
+         #min: 0.25
+       #key: ForcedSleep
+       #component: ForcedSleeping
+       #refresh: false
+       #type: Add
+       #probability: 0.3
       - !type:PopupMessage
         type: Local
         visualType: Medium
@@ -344,15 +344,15 @@
         conditions:
         - !type:ReagentThreshold
           min: 16.5
-      - !type:GenericStatusEffect
-        conditions:
-        - !type:ReagentThreshold
-          min: 20.0
-        key: ForcedSleep
-        component: ForcedSleeping
-        refresh: false
-        type: Add
-        probability: 0.1
+     #- !type:GenericStatusEffect # DeltaV - Removed all psych med forcesleeps
+       #conditions:
+       #- !type:ReagentThreshold
+         #min: 20.0
+       #key: ForcedSleep
+       #component: ForcedSleeping
+       #refresh: false
+       #type: Add
+       #probability: 0.1
       - !type:HealthChange # poisons you if you take way too much
         conditions:
         - !type:ReagentThreshold
@@ -525,25 +525,25 @@
           - "reagent-effect-painkiller-normal3"
           - "reagent-effect-painkiller-normal4"
         probability: 0.085
-      - !type:GenericStatusEffect
-        probability: 0.1
-        conditions:
-        - !type:ReagentThreshold
-          min: 14.5 # overdose knocks you out
-        key: ForcedSleep
-        component: ForcedSleeping
-        refresh: false
-        type: Add
-      - !type:GenericStatusEffect
-        probability: 0.08
-        conditions:
-        - !type:ReagentThreshold
-          reagent: Stubantazine
-          min: 5 # taking with other painkillers will knock you out
-        key: ForcedSleep
-        component: ForcedSleeping
-        refresh: false
-        type: Add
+     #- !type:GenericStatusEffect # DeltaV - Removed all psych med forcesleeps
+       #probability: 0.1
+       #conditions:
+       #- !type:ReagentThreshold
+         #min: 14.5 # overdose knocks you out
+       #key: ForcedSleep
+       #component: ForcedSleeping
+       #refresh: false
+       #type: Add
+     #- !type:GenericStatusEffect # DeltaV - Removed all psych med forcesleeps
+       #probability: 0.08
+       #conditions:
+       #- !type:ReagentThreshold
+         #reagent: Stubantazine
+         #min: 5 # taking with other painkillers will knock you out
+       #key: ForcedSleep
+       #component: ForcedSleeping
+       #refresh: false
+       #type: Add
       - !type:AdjustReagent
         conditions:
         - !type:ReagentThreshold
@@ -592,26 +592,26 @@
           - "reagent-effect-painkiller-strong5"
           - "reagent-effect-painkiller-strong6"
         probability: 0.1
-      - !type:GenericStatusEffect
-        probability: 0.1
-        conditions:
-        - !type:ReagentThreshold
-          reagent: Stubantazine
-          min: 4 # taking with other painkillers will knock you out
-        key: ForcedSleep
-        component: ForcedSleeping
-        refresh: false
-        type: Add
-      - !type:GenericStatusEffect
-        probability: 0.15
-        conditions:
-        - !type:ReagentThreshold
-          reagent: Soretizone
-          min: 2 # taking with other painkillers will knock you out
-        key: ForcedSleep
-        component: ForcedSleeping
-        refresh: false
-        type: Add
+     #- !type:GenericStatusEffect # DeltaV - Removed all psych med forcesleeps
+       #probability: 0.1
+       #conditions:
+       #- !type:ReagentThreshold
+         #reagent: Stubantazine
+         #min: 4 # taking with other painkillers will knock you out
+       #key: ForcedSleep
+       #component: ForcedSleeping
+       #refresh: false
+       #type: Add
+     #- !type:GenericStatusEffect # DeltaV - Removed all psych med forcesleeps
+       #probability: 0.15
+       #conditions:
+       #- !type:ReagentThreshold
+         #reagent: Soretizone
+         #min: 2 # taking with other painkillers will knock you out
+       #key: ForcedSleep
+       #component: ForcedSleeping
+       #refresh: false
+       #type: Add
       - !type:AdjustReagent
         conditions:
         - !type:ReagentThreshold
diff --git a/Resources/Prototypes/borg_types.yml b/Resources/Prototypes/borg_types.yml
new file mode 100644
index 00000000000..72b5c954eb8
--- /dev/null
+++ b/Resources/Prototypes/borg_types.yml
@@ -0,0 +1,225 @@
+# Generic borg
+- type: borgType
+  id: generic
+
+  # Description
+  dummyPrototype: BorgChassisGeneric
+
+  # Functional
+  extraModuleCount: 5
+  moduleWhitelist:
+    tags:
+    - BorgModuleGeneric
+
+  defaultModules:
+  - BorgModuleTool
+
+  radioChannels:
+  - Science
+
+  # Visual
+  inventoryTemplateId: borgShort
+  spriteBodyState: robot
+  spriteHasMindState: robot_e
+  spriteNoMindState: robot_e_r
+  spriteToggleLightState: robot_l
+
+  # Pet
+  petSuccessString: petting-success-generic-cyborg
+  petFailureString: petting-failure-generic-cyborg
+
+
+# Engineering borg
+- type: borgType
+  id: engineering
+
+  # Description
+  dummyPrototype: BorgChassisEngineer
+
+  # Functional
+  extraModuleCount: 3
+  moduleWhitelist:
+    tags:
+    - BorgModuleGeneric
+    - BorgModuleEngineering
+
+  defaultModules:
+  - BorgModuleTool
+  - BorgModuleConstruction
+  - BorgModuleRCD
+  - BorgModuleCable
+
+  lawset: Engineer # DeltaV: Custom lawset
+
+  radioChannels:
+  - Engineering
+  - Science
+
+  # Visual
+  inventoryTemplateId: borgShort
+  spriteBodyState: engineer
+  spriteHasMindState: engineer_e
+  spriteNoMindState: engineer_e_r
+  spriteToggleLightState: engineer_l
+
+  # Pet
+  petSuccessString: petting-success-engineer-cyborg
+  petFailureString: petting-failure-engineer-cyborg
+
+
+# Salvage borg
+- type: borgType
+  id: mining
+
+  # Description
+  dummyPrototype: BorgChassisMining
+
+  # Functional
+  extraModuleCount: 3
+  moduleWhitelist:
+    tags:
+    - BorgModuleGeneric
+    - BorgModuleCargo
+
+  defaultModules:
+  - BorgModuleGrapplingGun
+  - BorgModuleMining
+  - BorgModuleAppraisal
+
+  radioChannels:
+  - Supply
+  - Science
+
+  # Visual
+  inventoryTemplateId: borgTall
+  spriteBodyState: miner
+  spriteBodyMovementState: miner_moving
+  spriteHasMindState: miner_e
+  spriteNoMindState: miner_e_r
+  spriteToggleLightState: miner_l
+
+  # Pet
+  petSuccessString: petting-success-salvage-cyborg
+  petFailureString: petting-failure-salvage-cyborg
+
+
+# Janitor borg
+- type: borgType
+  id: janitor
+
+  # Description
+  dummyPrototype: BorgChassisJanitor
+
+  # Functional
+  extraModuleCount: 3
+  moduleWhitelist:
+    tags:
+    - BorgModuleGeneric
+    - BorgModuleJanitor
+
+  defaultModules:
+  - BorgModuleLightReplacer
+  - BorgModuleCleaning
+
+  lawset: Janitor # DeltaV: Custom lawset
+
+  radioChannels:
+  - Science
+  - Service
+
+  # Visual
+  inventoryTemplateId: borgShort
+  spriteBodyState: janitor
+  spriteBodyMovementState: janitor_moving
+  spriteHasMindState: janitor_e
+  spriteNoMindState: janitor_e_r
+  spriteToggleLightState: janitor_l
+
+  # Pet
+  petSuccessString: petting-success-janitor-cyborg
+  petFailureString: petting-failure-janitor-cyborg
+
+
+# Medical borg
+- type: borgType
+  id: medical
+
+  # Description
+  dummyPrototype: BorgChassisMedical
+
+  # Functional
+  extraModuleCount: 3
+  moduleWhitelist:
+    tags:
+    - BorgModuleGeneric
+    - BorgModuleMedical
+
+  defaultModules:
+  - BorgModuleTreatment
+
+  radioChannels:
+  - Science
+  - Medical
+
+  lawset: Medical # DeltaV: Custom lawset
+
+  addComponents:
+  - type: SolutionScanner
+  - type: ShowHealthBars
+    damageContainers:
+    - Biological
+  - type: ShowHealthIcons
+    damageContainers:
+    - Biological
+  - type: FabricateCandy # Nyanotrasen - The medical cyborg can generate candies filled with medicine.
+
+  # Visual
+  inventoryTemplateId: borgDutch
+  spriteBodyState: medical
+  spriteBodyMovementState: medical_moving
+  spriteHasMindState: medical_e
+  spriteNoMindState: medical_e_r
+  spriteToggleLightState: medical_l
+
+  # Pet
+  petSuccessString: petting-success-medical-cyborg
+  petFailureString: petting-failure-medical-cyborg
+
+  # Sounds
+  footstepCollection:
+    collection: FootstepHoverBorg
+
+
+# Service borg
+- type: borgType
+  id: service
+
+  # Description
+  dummyPrototype: BorgChassisService
+
+  # Functional
+  extraModuleCount: 3
+  moduleWhitelist:
+    tags:
+    - BorgModuleGeneric
+    - BorgModuleService
+
+  defaultModules:
+  - BorgModuleMusique
+  - BorgModuleService
+  - BorgModuleClowning
+
+  radioChannels:
+  - Science
+  - Service
+
+  # Visual
+  inventoryTemplateId: borgTall
+  spriteBodyState: service
+  spriteHasMindState: service_e
+  spriteNoMindState: service_e_r
+  spriteToggleLightState: service_l
+
+  # Pet
+  petSuccessString: petting-success-service-cyborg
+  petFailureString: petting-failure-service-cyborg
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index fdf9de78d18..bac4a54d53b 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -75,95 +75,26 @@
 - type: Tag
   id: BorgArm
 
-- type: Tag
-  id: BorgEngineerHead
-
-- type: Tag
-  id: BorgEngineerLArm
-
-- type: Tag
-  id: BorgEngineerLLeg
-
-- type: Tag
-  id: BorgEngineerRArm
-
-- type: Tag
-  id: BorgEngineerRLeg
-
-- type: Tag
-  id: BorgEngineerTorso
-
-- type: Tag
-  id: BorgGenericHead
-
-- type: Tag
-  id: BorgGenericLArm
-
-- type: Tag
-  id: BorgGenericLLeg
-
-- type: Tag
-  id: BorgGenericRArm
-
-- type: Tag
-  id: BorgGenericRLeg
-
-- type: Tag
-  id: BorgGenericTorso
-
 - type: Tag
   id: BorgHead
 
 - type: Tag
-  id: BorgJanitorHead
-
-- type: Tag
-  id: BorgJanitorLLeg
-
-- type: Tag
-  id: BorgJanitorRLeg
-
-- type: Tag
-  id: BorgJanitorTorso
-
-- type: Tag
-  id: BorgLeg
-
-- type: Tag
-  id: BorgMedicalHead
-
-- type: Tag
-  id: BorgMedicalLArm
-
-- type: Tag
-  id: BorgMedicalLLeg
-
-- type: Tag
-  id: BorgMedicalRArm
-
-- type: Tag
-  id: BorgMedicalRLeg
-
-- type: Tag
-  id: BorgMedicalTorso
-
-- type: Tag
-  id: BorgMiningHead
+  id: BorgLArm
 
 - type: Tag
-  id: BorgMiningLArm
+  id: BorgLLeg
 
 - type: Tag
-  id: BorgMiningLLeg
+  id: BorgRArm
 
 - type: Tag
-  id: BorgMiningRArm
+  id: BorgRLeg
 
 - type: Tag
-  id: BorgMiningRLeg
+  id: BorgTorso
 
 - type: Tag
-  id: BorgMiningTorso
+  id: BorgLeg
 
 - type: Tag
   id: BorgModuleCargo
@@ -189,24 +120,6 @@
 - type: Tag
   id: BorgModuleSyndicateAssault
 
-- type: Tag
-  id: BorgServiceHead
-
-- type: Tag
-  id: BorgServiceLArm
-
-- type: Tag
-  id: BorgServiceLLeg
-
-- type: Tag
-  id: BorgServiceRArm
-
-- type: Tag
-  id: BorgServiceRLeg
-
-- type: Tag
-  id: BorgServiceTorso
-
 - type: Tag
   id: Bot
 
@@ -1201,6 +1114,9 @@
 - type: Tag
   id: ShellShotgun
 
+- type: Tag
+  id: ShellShotgunLight # shotgun shells that are compatible with the flare gun.
+
 - type: Tag
   id: Shiv
 
diff --git a/Resources/ServerInfo/Guidebook/DeltaV/Rules/GameRules/1_Behave.xml b/Resources/ServerInfo/Guidebook/DeltaV/Rules/GameRules/1_Behave.xml
index 66c51439daa..80cc7b96181 100644
--- a/Resources/ServerInfo/Guidebook/DeltaV/Rules/GameRules/1_Behave.xml
+++ b/Resources/ServerInfo/Guidebook/DeltaV/Rules/GameRules/1_Behave.xml
@@ -21,7 +21,7 @@ You must roleplay. Your character's actions, feelings, and knowledge in-game sho
   - Do not engage in meta-communications (i.e. using external channels to communicate with other players in the same game).
 
 ## Rule B1.3: If you die and return to life, follow the new life rules.
-If a player dies, they forget the specific details of their death. [color=#ff0000]Please report players who break this rule.[/color] A borg being removed from its chassis is not a death, and there is no memory loss. 
+If a player dies, they forget the specific details of their death. [color=#ff0000]Please report players who break this rule.[/color] A borg being removed from its chassis is not a death, and may decide for itself whether or not it experiences memory loss. 
   - If they are revived by using a defibrillator, they can only recall vague information such as “Someone shot me” or “I was set ablaze”. 
   - If they are revived by any other method, they forget the last five minutes leading up to their death, and cannot describe their death in any capacity.
 
diff --git a/Resources/ServerInfo/Guidebook/Science/Cyborgs.xml b/Resources/ServerInfo/Guidebook/Science/Cyborgs.xml
index 2b8defb0705..c1507ca5396 100644
--- a/Resources/ServerInfo/Guidebook/Science/Cyborgs.xml
+++ b/Resources/ServerInfo/Guidebook/Science/Cyborgs.xml
@@ -18,28 +18,28 @@
   </Box>
   Both brains can be fabricated without requiring any additional research.
 
-  ## Chassis
-  While all cyborgs share the same endoskeleton, not all share the same chassis. The chassis determines what modules the cyborg can have, along with the [color=#a4885c]departmental radio channel[/color] they correspond to. By default, they will always have access to [color=#D381C9]Science[/color] and [color=green]station-wide[/color] frequencies, along with having [color=#a4885c]all-access[/color].
+  ## Cyborg types
+  Once created, a cyborg needs to specialize its chassis to a duty on the station. This determines what modules it starts with, which additional modules can be installed, and what [color=#a4885c]departmental radio channel[/color] it has access to. All cyborgs have access to the [color=#D381C9]Science[/color] and [color=green]station-wide[/color] radio channels. All cyborg types have [color=#a4885c]all-access[/color].
   <Box>
     <GuideEntityEmbed Entity="BorgChassisGeneric" Caption="Generic"/>
     <GuideEntityEmbed Entity="BorgChassisEngineer" Caption="Engineering"/>
-    <GuideEntityEmbed Entity="BorgChassisMining" Caption="Mining"/>
+    <GuideEntityEmbed Entity="BorgChassisMining" Caption="Salvage"/>
     <GuideEntityEmbed Entity="BorgChassisJanitor" Caption="Janitor"/>
     <GuideEntityEmbed Entity="BorgChassisService" Caption="Service"/>
     <GuideEntityEmbed Entity="BorgChassisMedical" Caption="Medical"/>
   </Box>
   <Box>
-    [italic]Examples of various cyborg chassis[/italic]
+    [italic]Examples of various cyborg types[/italic]
   </Box>
-  If you wish to change the chassis of an already existing cyborg, you have to construct a whole new one, limbs and frame included. The brain, power cell and modules [italic](if it can fit in the new chassis,)[/italic] can be carried over from the old chassis, if desired.
+  Once a cyborg chassis has been specialized, it cannot be changed. To change types, a new chassis must be constructed. The brain, power cell, and any modules [italic](if they are compatible with the new chassis)[/italic] can be carried over from the old chassis if desired.
 
   ## Modules
   <Box>
     <GuideEntityEmbed Entity="BorgModuleTool" Caption="Tool Cyborg Module"/>
   </Box>
-  A cyborg isn't able to do much without [color=#a4885c]modules[/color]. These printed circuit boards are specific to cyborgs and grant additional functionality to them. They are printed at the [color=#a4885c]Exosuit Fabricator[/color].
+  Cyborgs do not have hands, and therefore cannot pick things up like most other players. Instead, their equipment is provided by various [color=#a4885c]modules[/color]. Every cyborg type starts with its own specific set of modules, but additional modules can be inserted as upgrades. These additional modules can be printed at the [color=#a4885c]Exosuit Fabricator[/color].
 
-  [color=#a4885c]Generic[/color] modules add versatility. They can be fitted into any chassis, granting useful tools such as crowbars, GPS, and the ability to interact with cables. [bold]The generic borg chassis can fit up to 6 modules in total.[/bold]
+  [color=#a4885c]Generic[/color] modules add versatility. They can be fitted into any chassis, granting useful tools such as crowbars, GPS, and the ability to interact with cables. [bold]The generic cyborg chassis can fit up to five additional modules.[/bold]
   <Box>
     <GuideEntityEmbed Entity="BorgModuleCable" Caption="Cable"/>
     <GuideEntityEmbed Entity="BorgModuleGPS" Caption="GPS"/>
@@ -49,7 +49,7 @@
     [italic]Examples of generic modules[/italic]
   </Box>
 
-  For more specific needs, [color=#a4885c]specialized[/color] modules are available, granting capabilities like scanning anomalies, constructing walls, reviving crew mates, or cleaning a space lube spill. These modules are typically colored with the same palette as the department [italic](or occupation)[/italic] they relate to. These modules [italic](with exception to [color=#D381C9]science[/color] modules, which can fit any chassis,)[/italic] can only be fitted in their associated borg chassis. [bold]The specialized borg chassis, being the engineering, janitorial, service, medical, and mining chassis, can fit up to 4 modules.[/bold]
+  For more specific needs, [color=#a4885c]specialized[/color] modules are available, granting capabilities like scanning anomalies, constructing walls, reviving crew mates, or cleaning a space lube spill. These modules are typically colored with the same palette as the department [italic](or occupation)[/italic] they relate to. These modules [italic](with exception to [color=#D381C9]science[/color] modules, which can fit any chassis,)[/italic] can only be fitted in their associated borg chassis. [bold]The specialized borg chassis, being the engineering, janitorial, service, medical, and mining chassis, can fit up to three additional modules.[/bold]
   <Box>
     <GuideEntityEmbed Entity="BorgModuleAnomaly" Caption="Anomaly"/>
     <GuideEntityEmbed Entity="BorgModuleRCD" Caption="RCD"/>
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/equipped-INNERCLOTHING.png
index 3faba7285ff..4df4336458d 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/icon.png
index 64642a11589..f91b903f4ee 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/inhand-left.png
index 0b131234865..265b1f6f8bd 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/inhand-right.png
index ba6769d59d5..8e272ea03a8 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/meta.json
index 7e6832bd12c..82edfe13a02 100644
--- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/meta.json
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 and modified by Flareguy for Space Station 14",
+  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/993de554ecfc30cc45f8340819c5a60ef1eee7e1 and modified by Flareguy & P3MOIRA, with the lower half of the jumpskirt taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 and modified by Flareguy for SS14.",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/prisoner-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/prisoner-inhand-left.png
index f6ff6866ffc..6b40ed5af0e 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/prisoner-inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/prisoner-inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/prisoner-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/prisoner-inhand-right.png
index 45393e81a66..e43a9b42dbc 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/prisoner-inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/prisoner-inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/trinkets-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/trinkets-equipped-INNERCLOTHING.png
index cee5a50d2ca..bb9dd4f505e 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/trinkets-equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/trinkets-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/equipped-INNERCLOTHING.png
index 5c333dfc118..2d86990cb8b 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/icon.png
index c0087d4d250..84a603429e8 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/inhand-left.png
index 0b131234865..29ed754ec1d 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/inhand-right.png
index ba6769d59d5..3ea39f3463e 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/meta.json
index 7e6832bd12c..797ea180d8e 100644
--- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/meta.json
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 and modified by Flareguy for Space Station 14",
+  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/993de554ecfc30cc45f8340819c5a60ef1eee7e1 and modified for SS14 by Flareguy & P3MOIRA",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/prisoner-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/prisoner-equipped-INNERCLOTHING.png
index 320db64b579..ef35d8c80c5 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/prisoner-equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/prisoner-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/prisoner-icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/prisoner-icon.png
index faebe0e0550..819e7ac9d9c 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/prisoner-icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/prisoner-icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/prisoner-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/prisoner-inhand-left.png
index f6ff6866ffc..e0191d45d52 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/prisoner-inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/prisoner-inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-equipped-INNERCLOTHING.png
index e21afe8d4eb..c97a78f0477 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-icon.png
index c9e8398b47d..683e91de958 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-inhand-left.png
index 9bbcac8268a..b0e2998c0d4 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-inhand-right.png
index cfd72583152..ec1962dde48 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-inhand-right.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/icon-open.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/icon-open.png
new file mode 100644
index 00000000000..ddccc536a65
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/icon-open.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/icon-order-dairy.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/icon-order-dairy.png
new file mode 100644
index 00000000000..f83b746104f
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/icon-order-dairy.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/icon-order-juices.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/icon-order-juices.png
new file mode 100644
index 00000000000..050af5368b9
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/icon-order-juices.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/icon.png
new file mode 100644
index 00000000000..1207db777ea
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/icon.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/meta.json
new file mode 100644
index 00000000000..244894f967a
--- /dev/null
+++ b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Original image of canned beans (beans.rsi) taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24. Modified by DisposableCrewmember42.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon-open"
+    },
+    {
+      "name": "overlay-container"
+    },
+    {
+      "name": "icon-order-juices"
+    },
+    {
+      "name": "icon-order-dairy"
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/overlay-container.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/overlay-container.png
new file mode 100644
index 00000000000..7e01d12b377
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/overlay-container.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/meta.json
index b4d6a7706ca..caefa7f4992 100644
--- a/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Original source: https://github.com/tgstation/tgstation/blob/master/icons/obj/vending_restock.dmi @ commit 014c44ef6279beb02a5f3e76824439fa57181c22 - Additions and cleanup by @Vordenburg. Refill_pride made by Dorragon for Delta-V",
+  "copyright": "Original source: https://github.com/tgstation/tgstation/blob/master/icons/obj/vending_restock.dmi @ commit 014c44ef6279beb02a5f3e76824439fa57181c22 - Additions and cleanup by @Vordenburg. Refill_pride made by Dorragon for Delta-V. refill_sustenance made by Kr8 for Delta-V",
   "size": {
     "x": 32,
     "y": 32
@@ -23,6 +23,9 @@
     },
     {
       "name": "refill_pride"
+    },
+    {
+      "name": "refill_sustenance"
     }
   ]
 }
diff --git a/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/refill_sustenance.png b/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/refill_sustenance.png
new file mode 100644
index 00000000000..237ff98de11
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/refill_sustenance.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Power/Generation/solar_panel.rsi/meta.json b/Resources/Textures/DeltaV/Structures/Power/Generation/solar_panel.rsi/meta.json
new file mode 100644
index 00000000000..c9d3d472dd5
--- /dev/null
+++ b/Resources/Textures/DeltaV/Structures/Power/Generation/solar_panel.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/d1e0161af146835f4fb79d21a6200caa9cc842d0/icons/obj/power.dmi and modified. Modified by Radezolid for random solar spawner",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+	{
+	  "name": "random_solar"
+	}
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Structures/Power/Generation/solar_panel.rsi/random_solar.png b/Resources/Textures/DeltaV/Structures/Power/Generation/solar_panel.rsi/random_solar.png
new file mode 100644
index 00000000000..b2a32bd1aae
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Power/Generation/solar_panel.rsi/random_solar.png differ
diff --git a/Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json b/Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json
index dc8a6fcf9c6..2ebb6eddcf5 100644
--- a/Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json
+++ b/Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json
@@ -48,7 +48,7 @@
         },
         {
             "name":"light-replacer-module"
-        }, 
+        },
         {
             "name":"cleaning-module"
         },
@@ -102,6 +102,9 @@
         },
         {
             "name":"syndicate-martyr-module"
+        },
+        {
+            "name": "select-type"
         }
     ]
 }
diff --git a/Resources/Textures/Interface/Actions/actions_borg.rsi/select-type.png b/Resources/Textures/Interface/Actions/actions_borg.rsi/select-type.png
new file mode 100644
index 00000000000..766fd71abd0
Binary files /dev/null and b/Resources/Textures/Interface/Actions/actions_borg.rsi/select-type.png differ
diff --git a/Resources/Textures/Interface/Alerts/walking.rsi/meta.json b/Resources/Textures/Interface/Alerts/walking.rsi/meta.json
new file mode 100644
index 00000000000..88238a60e32
--- /dev/null
+++ b/Resources/Textures/Interface/Alerts/walking.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Created by SlamBamActionman",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "walking"
+        }
+    ]
+}
diff --git a/Resources/Textures/Interface/Alerts/walking.rsi/walking.png b/Resources/Textures/Interface/Alerts/walking.rsi/walking.png
new file mode 100644
index 00000000000..a0169368a60
Binary files /dev/null and b/Resources/Textures/Interface/Alerts/walking.rsi/walking.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/anomalymeat-cooked.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/anomalymeat-cooked.png
new file mode 100644
index 00000000000..19c0040f3a1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/anomalymeat-cooked.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/anomalymeat.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/anomalymeat.png
new file mode 100644
index 00000000000..005107ab4ec
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/anomalymeat.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/meat.rsi/meta.json
index 4ad75849d1a..99084d8c958 100644
--- a/Resources/Textures/Objects/Consumable/Food/meat.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/meat.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation and modified by Swept, potato1234x and deltanedas at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa, snail by IproduceWidgets (github) and Kezu (discord)",
+  "copyright": "Taken from tgstation and modified by Swept, potato1234x and deltanedas at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa, snail by IproduceWidgets (github) and Kezu (discord), anomalymeat/cooked by august-sun",
   "size": {
     "x": 32,
     "y": 32
@@ -200,6 +200,12 @@
     },
     {
       "name": "rouny-cooked"
+    },
+    {
+      "name": "anomalymeat"
+    },
+    {
+      "name": "anomalymeat-cooked"
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Magic/magicactions.rsi/jaunt.png b/Resources/Textures/Objects/Magic/magicactions.rsi/jaunt.png
new file mode 100644
index 00000000000..f66002b4695
Binary files /dev/null and b/Resources/Textures/Objects/Magic/magicactions.rsi/jaunt.png differ
diff --git a/Resources/Textures/Objects/Magic/magicactions.rsi/meta.json b/Resources/Textures/Objects/Magic/magicactions.rsi/meta.json
index 9bf76bbe774..a8da3d8bc3a 100644
--- a/Resources/Textures/Objects/Magic/magicactions.rsi/meta.json
+++ b/Resources/Textures/Objects/Magic/magicactions.rsi/meta.json
@@ -25,8 +25,11 @@
     {
       "name": "magicmissile"
     },
+    {
+      "name": "jaunt"
+    },
     {
       "name": "gib"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Power/portable_recharger.rsi/charging-equipped-BACKPACK.png b/Resources/Textures/Objects/Power/portable_recharger.rsi/charging-equipped-BACKPACK.png
new file mode 100644
index 00000000000..500ad05704c
Binary files /dev/null and b/Resources/Textures/Objects/Power/portable_recharger.rsi/charging-equipped-BACKPACK.png differ
diff --git a/Resources/Textures/Objects/Power/portable_recharger.rsi/charging-unlit.png b/Resources/Textures/Objects/Power/portable_recharger.rsi/charging-unlit.png
new file mode 100644
index 00000000000..6c902b7d7ef
Binary files /dev/null and b/Resources/Textures/Objects/Power/portable_recharger.rsi/charging-unlit.png differ
diff --git a/Resources/Textures/Objects/Power/portable_recharger.rsi/charging.png b/Resources/Textures/Objects/Power/portable_recharger.rsi/charging.png
new file mode 100644
index 00000000000..6105bb4ad3b
Binary files /dev/null and b/Resources/Textures/Objects/Power/portable_recharger.rsi/charging.png differ
diff --git a/Resources/Textures/Objects/Power/portable_recharger.rsi/inhand-left.png b/Resources/Textures/Objects/Power/portable_recharger.rsi/inhand-left.png
new file mode 100644
index 00000000000..e3bc6d82993
Binary files /dev/null and b/Resources/Textures/Objects/Power/portable_recharger.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Power/portable_recharger.rsi/inhand-right.png b/Resources/Textures/Objects/Power/portable_recharger.rsi/inhand-right.png
new file mode 100644
index 00000000000..8c651922317
Binary files /dev/null and b/Resources/Textures/Objects/Power/portable_recharger.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Power/portable_recharger.rsi/meta.json b/Resources/Textures/Objects/Power/portable_recharger.rsi/meta.json
new file mode 100644
index 00000000000..794f491bdb9
--- /dev/null
+++ b/Resources/Textures/Objects/Power/portable_recharger.rsi/meta.json
@@ -0,0 +1,92 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprited by Lomovar",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "charging",
+      "delays": [
+        [
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3
+        ]
+      ]
+    },
+    {
+      "name": "charging-equipped-BACKPACK",
+      "directions": 4,
+      "delays": [
+        [
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3
+        ],
+        [
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3
+        ],
+        [
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3
+        ],
+        [
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3
+        ]
+      ]
+    },
+    {
+      "name": "charging-unlit",
+      "delays": [
+        [
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3,
+          0.3
+        ]
+      ]
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
+
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/base.png
new file mode 100644
index 00000000000..f460615079d
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/base.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/beanbag.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/beanbag.png
new file mode 100644
index 00000000000..a2fe9e8f1d2
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/beanbag.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/flare.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/flare.png
new file mode 100644
index 00000000000..3b65c7acbe0
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/flare.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/incendiary.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/incendiary.png
new file mode 100644
index 00000000000..7841707b120
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/incendiary.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/lethal.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/lethal.png
new file mode 100644
index 00000000000..d3a282afbfc
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/lethal.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-1.png
new file mode 100644
index 00000000000..d77e6507b00
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-2.png
new file mode 100644
index 00000000000..eaff18cf288
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-2.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-3.png
new file mode 100644
index 00000000000..1563f21fe71
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-3.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-4.png
new file mode 100644
index 00000000000..9a3c99707fe
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-4.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-alt-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-alt-1.png
new file mode 100644
index 00000000000..0b8f096ef92
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-alt-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-alt-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-alt-2.png
new file mode 100644
index 00000000000..81649769f4b
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-alt-2.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-alt-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-alt-3.png
new file mode 100644
index 00000000000..80505d3934c
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-alt-3.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-alt-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-alt-4.png
new file mode 100644
index 00000000000..60be778fdfd
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-alt-4.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/meta.json
new file mode 100644
index 00000000000..3df588a845e
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/meta.json
@@ -0,0 +1,62 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprites by SpaceRox1244",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-1"
+        },
+        {
+            "name": "mag-2"
+        },
+        {
+            "name": "mag-3"
+        },
+        {
+            "name": "mag-4"
+        },
+        {
+            "name": "mag-alt-1"
+        },
+        {
+            "name": "mag-alt-2"
+        },
+        {
+            "name": "mag-alt-3"
+        },
+        {
+            "name": "mag-alt-4"
+        },
+        {
+            "name": "lethal"
+        },
+        {
+            "name": "beanbag"
+        },
+        {
+            "name": "slug"
+        },
+        {
+            "name": "incendiary"
+        },
+        {
+            "name": "practice"
+        },
+        {
+            "name": "uranium"
+        },
+        {
+            "name": "flare"
+        },
+        {
+            "name": "tranquilizer"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/practice.png
new file mode 100644
index 00000000000..4ece8a0c1e5
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/practice.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/slug.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/slug.png
new file mode 100644
index 00000000000..b55085e398e
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/slug.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/tranquilizer.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/tranquilizer.png
new file mode 100644
index 00000000000..373d6a2a0c9
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/tranquilizer.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/uranium.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/uranium.png
new file mode 100644
index 00000000000..03a0244fda5
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/uranium.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/base.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/icon.png
rename to Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/base.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/meta.json
index fc96d8d5194..43840761498 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/meta.json
@@ -8,7 +8,7 @@
   },
     "states": [
         {
-            "name": "icon"
+            "name": "base"
         },
         {
             "name": "bolt-open"
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/base.png
new file mode 100644
index 00000000000..0b39a08c921
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/base.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/bolt-open.png
new file mode 100644
index 00000000000..65052544c72
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/bolt-open.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/equipped-BELT.png
new file mode 100644
index 00000000000..fb2854b6fe2
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/equipped-BELT.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 00000000000..fb2854b6fe2
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/inhand-left.png
new file mode 100644
index 00000000000..bff3d731c47
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/inhand-right.png
new file mode 100644
index 00000000000..50297902ee8
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/meta.json
new file mode 100644
index 00000000000..04abe1a4e05
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/meta.json
@@ -0,0 +1,33 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/3f9ebb72931ff884427c3004a594ec61aaaa7041/icons/obj/guns/projectile/flaregun.dmi and edited",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "bolt-open"
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-left.png
index a7ea7539408..e014cf5110f 100644
Binary files a/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-right.png
index 368c73da327..20efe6dd876 100644
Binary files a/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json
index 08894a12a7b..56602b6ea13 100644
--- a/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken/modified from desertrose at https://github.com/DesertRose2/desertrose/pull/378/commits/9e081bd2a0d7614be5a9dabbca34886ce204105d",
+    "copyright": "Taken/modified from desertrose at https://github.com/DesertRose2/desertrose/pull/378/commits/9e081bd2a0d7614be5a9dabbca34886ce204105d, storage & inhand sprites by RiceMar1244",
     "size": {
         "x": 32,
         "y": 32
@@ -10,6 +10,9 @@
         {
             "name": "icon"
         },
+        {
+            "name": "storage"
+        },
         {
             "name": "inhand-left",
             "directions": 4
diff --git a/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/storage.png b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/storage.png
new file mode 100644
index 00000000000..6b88c9a3aa2
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/storage.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-left.png
index b2f253c30b7..c352ccfab67 100644
Binary files a/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-right.png
index ac3aec22479..5a284c02301 100644
Binary files a/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/meta.json
index 455734e0447..56602b6ea13 100644
--- a/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/meta.json
@@ -1,26 +1,29 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from /tg/station at commit https://github.com/tgstation/tgstation/commit/6cdc0503d32e249125151e369edf951e93bccd1a",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken/modified from desertrose at https://github.com/DesertRose2/desertrose/pull/378/commits/9e081bd2a0d7614be5a9dabbca34886ce204105d, storage & inhand sprites by RiceMar1244",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "equipped-BELT",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "storage"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/storage.png b/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/storage.png
new file mode 100644
index 00000000000..173f66035b3
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/storage.png differ
diff --git a/Resources/Textures/Structures/Machines/computers.rsi/broken.png b/Resources/Textures/Structures/Machines/computers.rsi/broken.png
index 38d2fd88a37..5adb4f73f2e 100644
Binary files a/Resources/Textures/Structures/Machines/computers.rsi/broken.png and b/Resources/Textures/Structures/Machines/computers.rsi/broken.png differ
diff --git a/Resources/Textures/Structures/Windows/clockwork_diagonal.rsi/meta.json b/Resources/Textures/Structures/Windows/clockwork_diagonal.rsi/meta.json
index 06b6f4a5505..9f0945a8701 100644
--- a/Resources/Textures/Structures/Windows/clockwork_diagonal.rsi/meta.json
+++ b/Resources/Textures/Structures/Windows/clockwork_diagonal.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/b8fc9b367ebb26def792a68bcb25294e518698d8/icons/obj/smooth_structures/clockwork_window.dmi diagonalized by MACMAN2003",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/b8fc9b367ebb26def792a68bcb25294e518698d8/icons/obj/smooth_structures/clockwork_window.dmi diagonalized by MACMAN2003, transparency tweaked by Ubaser.",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Structures/Windows/clockwork_diagonal.rsi/state0.png b/Resources/Textures/Structures/Windows/clockwork_diagonal.rsi/state0.png
index 084563bfa29..84e8da95e5b 100644
Binary files a/Resources/Textures/Structures/Windows/clockwork_diagonal.rsi/state0.png and b/Resources/Textures/Structures/Windows/clockwork_diagonal.rsi/state0.png differ
diff --git a/Resources/Textures/Structures/Windows/clockwork_diagonal.rsi/state1.png b/Resources/Textures/Structures/Windows/clockwork_diagonal.rsi/state1.png
index 0e48f9c9227..0f139a44c4c 100644
Binary files a/Resources/Textures/Structures/Windows/clockwork_diagonal.rsi/state1.png and b/Resources/Textures/Structures/Windows/clockwork_diagonal.rsi/state1.png differ
diff --git a/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow0.png b/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow0.png
index 48ba09f6577..f29440596bc 100644
Binary files a/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow0.png and b/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow0.png differ
diff --git a/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow1.png b/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow1.png
index 025376834dc..e7803052232 100644
Binary files a/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow1.png and b/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow1.png differ
diff --git a/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow2.png b/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow2.png
index 48ba09f6577..f29440596bc 100644
Binary files a/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow2.png and b/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow2.png differ
diff --git a/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow3.png b/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow3.png
index 025376834dc..e7803052232 100644
Binary files a/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow3.png and b/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow3.png differ
diff --git a/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow4.png b/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow4.png
index aa4ed12cbc5..228081ad5b9 100644
Binary files a/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow4.png and b/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow4.png differ
diff --git a/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow5.png b/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow5.png
index 6bf733f81ae..89c88d12e2a 100644
Binary files a/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow5.png and b/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow5.png differ
diff --git a/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow6.png b/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow6.png
index aa4ed12cbc5..228081ad5b9 100644
Binary files a/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow6.png and b/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow6.png differ
diff --git a/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow7.png b/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow7.png
index 6d2c0e0650e..aafe2b5051d 100644
Binary files a/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow7.png and b/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow7.png differ
diff --git a/Resources/Textures/Structures/Windows/clockwork_window.rsi/full.png b/Resources/Textures/Structures/Windows/clockwork_window.rsi/full.png
index d50a9f18d87..0899b57b6f6 100644
Binary files a/Resources/Textures/Structures/Windows/clockwork_window.rsi/full.png and b/Resources/Textures/Structures/Windows/clockwork_window.rsi/full.png differ
diff --git a/Resources/Textures/Structures/Windows/clockwork_window.rsi/meta.json b/Resources/Textures/Structures/Windows/clockwork_window.rsi/meta.json
index be03eb5f1a2..dfd0d929100 100644
--- a/Resources/Textures/Structures/Windows/clockwork_window.rsi/meta.json
+++ b/Resources/Textures/Structures/Windows/clockwork_window.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/b8fc9b367ebb26def792a68bcb25294e518698d8/icons/obj/smooth_structures/clockwork_window.dmi",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/b8fc9b367ebb26def792a68bcb25294e518698d8/icons/obj/smooth_structures/clockwork_window.dmi, transparency tweaked by Ubaser.",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Structures/Windows/mining.rsi/full.png b/Resources/Textures/Structures/Windows/mining.rsi/full.png
index a38121d202c..ce03d5ab5bb 100644
Binary files a/Resources/Textures/Structures/Windows/mining.rsi/full.png and b/Resources/Textures/Structures/Windows/mining.rsi/full.png differ
diff --git a/Resources/Textures/Structures/Windows/mining.rsi/meta.json b/Resources/Textures/Structures/Windows/mining.rsi/meta.json
index 86047804207..562553add6a 100644
--- a/Resources/Textures/Structures/Windows/mining.rsi/meta.json
+++ b/Resources/Textures/Structures/Windows/mining.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from Paradise station https://github.com/ParadiseSS13/Paradise/blob/master/icons/obj/smooth_structures/windows/pod_window.dmi and modified by NULL882",
+  "copyright": "Taken from Paradise station https://github.com/ParadiseSS13/Paradise/blob/master/icons/obj/smooth_structures/windows/pod_window.dmi and modified by NULL882, transparency tweaked by Ubaser.",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Structures/Windows/mining.rsi/mwindow0.png b/Resources/Textures/Structures/Windows/mining.rsi/mwindow0.png
index 1416a381def..a46de9e1e51 100644
Binary files a/Resources/Textures/Structures/Windows/mining.rsi/mwindow0.png and b/Resources/Textures/Structures/Windows/mining.rsi/mwindow0.png differ
diff --git a/Resources/Textures/Structures/Windows/mining.rsi/mwindow1.png b/Resources/Textures/Structures/Windows/mining.rsi/mwindow1.png
index 48c34617699..9358df081f8 100644
Binary files a/Resources/Textures/Structures/Windows/mining.rsi/mwindow1.png and b/Resources/Textures/Structures/Windows/mining.rsi/mwindow1.png differ
diff --git a/Resources/Textures/Structures/Windows/mining.rsi/mwindow2.png b/Resources/Textures/Structures/Windows/mining.rsi/mwindow2.png
index 1416a381def..a46de9e1e51 100644
Binary files a/Resources/Textures/Structures/Windows/mining.rsi/mwindow2.png and b/Resources/Textures/Structures/Windows/mining.rsi/mwindow2.png differ
diff --git a/Resources/Textures/Structures/Windows/mining.rsi/mwindow3.png b/Resources/Textures/Structures/Windows/mining.rsi/mwindow3.png
index 48c34617699..9358df081f8 100644
Binary files a/Resources/Textures/Structures/Windows/mining.rsi/mwindow3.png and b/Resources/Textures/Structures/Windows/mining.rsi/mwindow3.png differ
diff --git a/Resources/Textures/Structures/Windows/mining.rsi/mwindow4.png b/Resources/Textures/Structures/Windows/mining.rsi/mwindow4.png
index ced25ea4156..8b1e5d52394 100644
Binary files a/Resources/Textures/Structures/Windows/mining.rsi/mwindow4.png and b/Resources/Textures/Structures/Windows/mining.rsi/mwindow4.png differ
diff --git a/Resources/Textures/Structures/Windows/mining.rsi/mwindow5.png b/Resources/Textures/Structures/Windows/mining.rsi/mwindow5.png
index 84ce6f1696f..6d1ed85f336 100644
Binary files a/Resources/Textures/Structures/Windows/mining.rsi/mwindow5.png and b/Resources/Textures/Structures/Windows/mining.rsi/mwindow5.png differ
diff --git a/Resources/Textures/Structures/Windows/mining.rsi/mwindow6.png b/Resources/Textures/Structures/Windows/mining.rsi/mwindow6.png
index ced25ea4156..8b1e5d52394 100644
Binary files a/Resources/Textures/Structures/Windows/mining.rsi/mwindow6.png and b/Resources/Textures/Structures/Windows/mining.rsi/mwindow6.png differ
diff --git a/Resources/Textures/Structures/Windows/mining.rsi/mwindow7.png b/Resources/Textures/Structures/Windows/mining.rsi/mwindow7.png
index f0ac5b6b90c..24733c9b3e5 100644
Binary files a/Resources/Textures/Structures/Windows/mining.rsi/mwindow7.png and b/Resources/Textures/Structures/Windows/mining.rsi/mwindow7.png differ
diff --git a/Resources/Textures/Structures/Windows/mining_diagonal.rsi/meta.json b/Resources/Textures/Structures/Windows/mining_diagonal.rsi/meta.json
index 439147564dd..7d12528bb20 100644
--- a/Resources/Textures/Structures/Windows/mining_diagonal.rsi/meta.json
+++ b/Resources/Textures/Structures/Windows/mining_diagonal.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Made by NULL882 (github)",
+    "copyright": "Made by NULL882 (github), transparency tweaked by Ubaser.",
     "states": [
         {
             "name": "state0"
diff --git a/Resources/Textures/Structures/Windows/mining_diagonal.rsi/state0.png b/Resources/Textures/Structures/Windows/mining_diagonal.rsi/state0.png
index 54af8484b2f..c7e717a6e70 100644
Binary files a/Resources/Textures/Structures/Windows/mining_diagonal.rsi/state0.png and b/Resources/Textures/Structures/Windows/mining_diagonal.rsi/state0.png differ
diff --git a/Resources/Textures/Structures/Windows/mining_diagonal.rsi/state1.png b/Resources/Textures/Structures/Windows/mining_diagonal.rsi/state1.png
index f790c761bc3..d6ad5b0dcd4 100644
Binary files a/Resources/Textures/Structures/Windows/mining_diagonal.rsi/state1.png and b/Resources/Textures/Structures/Windows/mining_diagonal.rsi/state1.png differ
diff --git a/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/meta.json b/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/meta.json
index 453a3797223..8477687a8c7 100644
--- a/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/meta.json
+++ b/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Made by brainfood1183 (github)",
+    "copyright": "Made by brainfood1183 (github), transparency tweaked by Ubaser.",
     "states": [
         {
             "name": "state0"
diff --git a/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state0.png b/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state0.png
index 60d1c0421b3..0d13c29e148 100644
Binary files a/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state0.png and b/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state0.png differ
diff --git a/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state1.png b/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state1.png
index 1ae08dba887..7469c63afe4 100644
Binary files a/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state1.png and b/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state1.png differ
diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/full.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/full.png
index b20d5ebd5ef..b27e173b7ad 100644
Binary files a/Resources/Textures/Structures/Windows/plasma_window.rsi/full.png and b/Resources/Textures/Structures/Windows/plasma_window.rsi/full.png differ
diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/meta.json b/Resources/Textures/Structures/Windows/plasma_window.rsi/meta.json
index 4a033410903..fc08ccccbd4 100644
--- a/Resources/Textures/Structures/Windows/plasma_window.rsi/meta.json
+++ b/Resources/Textures/Structures/Windows/plasma_window.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/9c7d509354ee030300f63c701da63c17928c3b3b and modified by Swept",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/9c7d509354ee030300f63c701da63c17928c3b3b and modified by Swept, transparency tweaked by Ubaser.",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow0.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow0.png
index fe379e2fef5..9a55b8c3aff 100644
Binary files a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow0.png and b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow0.png differ
diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow1.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow1.png
index d75684f5d06..1227c1d01a3 100644
Binary files a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow1.png and b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow1.png differ
diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow2.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow2.png
index fe379e2fef5..9a55b8c3aff 100644
Binary files a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow2.png and b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow2.png differ
diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow3.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow3.png
index d75684f5d06..1227c1d01a3 100644
Binary files a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow3.png and b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow3.png differ
diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow4.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow4.png
index 051ddb5681d..b42ca67a170 100644
Binary files a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow4.png and b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow4.png differ
diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow5.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow5.png
index af6c01d9069..bb7ce055738 100644
Binary files a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow5.png and b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow5.png differ
diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow6.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow6.png
index 051ddb5681d..b42ca67a170 100644
Binary files a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow6.png and b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow6.png differ
diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow7.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow7.png
index dba4e93a8aa..ea9f89c32f3 100644
Binary files a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow7.png and b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow7.png differ
diff --git a/Resources/Textures/Structures/Windows/plastitanium_window.rsi/full.png b/Resources/Textures/Structures/Windows/plastitanium_window.rsi/full.png
index 62927488905..8a6165b2e1e 100644
Binary files a/Resources/Textures/Structures/Windows/plastitanium_window.rsi/full.png and b/Resources/Textures/Structures/Windows/plastitanium_window.rsi/full.png differ
diff --git a/Resources/Textures/Structures/Windows/plastitanium_window.rsi/meta.json b/Resources/Textures/Structures/Windows/plastitanium_window.rsi/meta.json
index 4b89f3cdb00..c0a1a18425f 100644
--- a/Resources/Textures/Structures/Windows/plastitanium_window.rsi/meta.json
+++ b/Resources/Textures/Structures/Windows/plastitanium_window.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/0b906c6916ce3803473fa6caa65f5b8661118c46",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/0b906c6916ce3803473fa6caa65f5b8661118c46, transparency tweaked by Ubaser.",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow0.png b/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow0.png
index 1704c25c218..fe2ddcf1ed4 100644
Binary files a/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow0.png and b/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow0.png differ
diff --git a/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow1.png b/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow1.png
index 3c2aad6b261..17fdd1e0457 100644
Binary files a/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow1.png and b/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow1.png differ
diff --git a/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow2.png b/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow2.png
index 1704c25c218..fe2ddcf1ed4 100644
Binary files a/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow2.png and b/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow2.png differ
diff --git a/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow3.png b/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow3.png
index 3c2aad6b261..17fdd1e0457 100644
Binary files a/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow3.png and b/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow3.png differ
diff --git a/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow4.png b/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow4.png
index dda14b70141..8623349c4f3 100644
Binary files a/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow4.png and b/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow4.png differ
diff --git a/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow5.png b/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow5.png
index a4a28e41bf9..08d493bb62a 100644
Binary files a/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow5.png and b/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow5.png differ
diff --git a/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow6.png b/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow6.png
index dda14b70141..8623349c4f3 100644
Binary files a/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow6.png and b/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow6.png differ
diff --git a/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow7.png b/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow7.png
index cc1f21f692a..82b23102f54 100644
Binary files a/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow7.png and b/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow7.png differ
diff --git a/Resources/Textures/Structures/Windows/plastitanium_window_diagonal.rsi/meta.json b/Resources/Textures/Structures/Windows/plastitanium_window_diagonal.rsi/meta.json
index 769ebe5b39a..9c854c61ce7 100644
--- a/Resources/Textures/Structures/Windows/plastitanium_window_diagonal.rsi/meta.json
+++ b/Resources/Textures/Structures/Windows/plastitanium_window_diagonal.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Modified from plastitanium_window.rsi by Flareguy for Space Station 14",
+    "copyright": "Modified from plastitanium_window.rsi by Flareguy for Space Station 14, transparency tweaked by Ubaser.",
     "states": [
         {
             "name": "state0"
diff --git a/Resources/Textures/Structures/Windows/plastitanium_window_diagonal.rsi/state0.png b/Resources/Textures/Structures/Windows/plastitanium_window_diagonal.rsi/state0.png
index 7737feb5032..b25ae0a4a06 100644
Binary files a/Resources/Textures/Structures/Windows/plastitanium_window_diagonal.rsi/state0.png and b/Resources/Textures/Structures/Windows/plastitanium_window_diagonal.rsi/state0.png differ
diff --git a/Resources/Textures/Structures/Windows/plastitanium_window_diagonal.rsi/state1.png b/Resources/Textures/Structures/Windows/plastitanium_window_diagonal.rsi/state1.png
index 834b6261fd3..7185af8426c 100644
Binary files a/Resources/Textures/Structures/Windows/plastitanium_window_diagonal.rsi/state1.png and b/Resources/Textures/Structures/Windows/plastitanium_window_diagonal.rsi/state1.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/meta.json b/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/meta.json
index 453a3797223..8477687a8c7 100644
--- a/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/meta.json
+++ b/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Made by brainfood1183 (github)",
+    "copyright": "Made by brainfood1183 (github), transparency tweaked by Ubaser.",
     "states": [
         {
             "name": "state0"
diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state0.png b/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state0.png
index 8ad1f325b35..9f76902acf6 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state0.png and b/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state0.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state1.png b/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state1.png
index e724d3b9f78..0d651dedf6e 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state1.png and b/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state1.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/full.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/full.png
index 4cfc4c45da5..ffb90335d93 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/full.png and b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/full.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/meta.json b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/meta.json
index f66453a57d8..f8bf1f627ed 100644
--- a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/meta.json
+++ b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/9c7d509354ee030300f63c701da63c17928c3b3b",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/9c7d509354ee030300f63c701da63c17928c3b3b, transparency tweaked by Ubaser.",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow0.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow0.png
index faeb000b4af..e73ef0c5aff 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow0.png and b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow0.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow1.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow1.png
index 46547d6b996..9aa576f6253 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow1.png and b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow1.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow2.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow2.png
index faeb000b4af..e73ef0c5aff 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow2.png and b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow2.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow3.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow3.png
index 46547d6b996..9aa576f6253 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow3.png and b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow3.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow4.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow4.png
index 66dddef140f..695cf7e2ce4 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow4.png and b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow4.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow5.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow5.png
index 8ebeed21a9f..6654332c366 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow5.png and b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow5.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow6.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow6.png
index 66dddef140f..695cf7e2ce4 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow6.png and b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow6.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow7.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow7.png
index 4d0ff4bf731..e140c63e4ff 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow7.png and b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow7.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/meta.json b/Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/meta.json
index 453a3797223..8477687a8c7 100644
--- a/Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/meta.json
+++ b/Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Made by brainfood1183 (github)",
+    "copyright": "Made by brainfood1183 (github), transparency tweaked by Ubaser.",
     "states": [
         {
             "name": "state0"
diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state0.png b/Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state0.png
index facbfda3ade..eb68e7866f4 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state0.png and b/Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state0.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state1.png b/Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state1.png
index 3799df51bf9..a6295e02f87 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state1.png and b/Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state1.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/full.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/full.png
index 10342c57058..7902a3672bc 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/full.png and b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/full.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/meta.json b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/meta.json
index 739d63b2474..a4945c043fa 100644
--- a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/meta.json
+++ b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "resprited by AsikKEsel | Original source: from vgstation at commit https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi and modified by Swept ",
+    "copyright": "resprited by AsikKEsel | Original source: from vgstation at commit https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi and modified by Swept, transparency tweaked by Ubaser.",
     "size": {
       "x": 32,
       "y": 32
diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow0.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow0.png
index dfe885bf853..42ed925e056 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow0.png and b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow0.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow1.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow1.png
index e1ca7ea3639..26f6290c6b4 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow1.png and b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow1.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow2.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow2.png
index 773a2b3fff3..42ed925e056 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow2.png and b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow2.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow3.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow3.png
index e10cff828ea..26f6290c6b4 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow3.png and b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow3.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow4.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow4.png
index 2dff7e5127d..9b0463bd4cd 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow4.png and b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow4.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow5.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow5.png
index 0a54faafb0d..8863ee94bd8 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow5.png and b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow5.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow6.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow6.png
index 1f9ba05446a..9b0463bd4cd 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow6.png and b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow6.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow7.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow7.png
index 5fb5fb0c7f7..fa9de9ba506 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow7.png and b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow7.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/full.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/full.png
index 34c51d7c3d6..e8b90728e41 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_window.rsi/full.png and b/Resources/Textures/Structures/Windows/reinforced_window.rsi/full.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/meta.json b/Resources/Textures/Structures/Windows/reinforced_window.rsi/meta.json
index 456d8a28909..4cff125e3ac 100644
--- a/Resources/Textures/Structures/Windows/reinforced_window.rsi/meta.json
+++ b/Resources/Textures/Structures/Windows/reinforced_window.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi and modified by Swept",
+  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi and modified by Swept, transparency tweaked by Ubaser.",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow0.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow0.png
index 8beafa06dbb..e1459332aee 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow0.png and b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow0.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow1.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow1.png
index ba95fde9e59..2c1d944a619 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow1.png and b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow1.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow2.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow2.png
index 8beafa06dbb..e1459332aee 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow2.png and b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow2.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow3.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow3.png
index ba95fde9e59..2c1d944a619 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow3.png and b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow3.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow4.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow4.png
index 754af67ca37..6e9e88d1e90 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow4.png and b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow4.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow5.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow5.png
index 6f16899eded..ef1e6f98354 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow5.png and b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow5.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow6.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow6.png
index 754af67ca37..6e9e88d1e90 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow6.png and b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow6.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow7.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow7.png
index f7fe3b63651..effdcbcab63 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow7.png and b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow7.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/meta.json b/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/meta.json
index 453a3797223..8477687a8c7 100644
--- a/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/meta.json
+++ b/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Made by brainfood1183 (github)",
+    "copyright": "Made by brainfood1183 (github), transparency tweaked by Ubaser.",
     "states": [
         {
             "name": "state0"
diff --git a/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state0.png b/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state0.png
index eb9489ddb47..c5e45b5edee 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state0.png and b/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state0.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state1.png b/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state1.png
index 65254207165..454ab882de1 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state1.png and b/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state1.png differ
diff --git a/Resources/Textures/Structures/Windows/shuttle_window.rsi/full.png b/Resources/Textures/Structures/Windows/shuttle_window.rsi/full.png
index 91973e59ade..2753f7be44b 100644
Binary files a/Resources/Textures/Structures/Windows/shuttle_window.rsi/full.png and b/Resources/Textures/Structures/Windows/shuttle_window.rsi/full.png differ
diff --git a/Resources/Textures/Structures/Windows/shuttle_window.rsi/meta.json b/Resources/Textures/Structures/Windows/shuttle_window.rsi/meta.json
index 825c4ae1139..3d311cdc22b 100644
--- a/Resources/Textures/Structures/Windows/shuttle_window.rsi/meta.json
+++ b/Resources/Textures/Structures/Windows/shuttle_window.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/0b906c6916ce3803473fa6caa65f5b8661118c46",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/0b906c6916ce3803473fa6caa65f5b8661118c46, transparency tweaked by Ubaser.",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow0.png b/Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow0.png
index f2e2df2b624..d6ad5cbb232 100644
Binary files a/Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow0.png and b/Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow0.png differ
diff --git a/Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow1.png b/Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow1.png
index 99442012a47..bc3e876fad4 100644
Binary files a/Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow1.png and b/Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow1.png differ
diff --git a/Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow2.png b/Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow2.png
index f2e2df2b624..d6ad5cbb232 100644
Binary files a/Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow2.png and b/Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow2.png differ
diff --git a/Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow3.png b/Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow3.png
index 99442012a47..bc3e876fad4 100644
Binary files a/Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow3.png and b/Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow3.png differ
diff --git a/Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow4.png b/Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow4.png
index 5b20f48ef2a..58c822ff785 100644
Binary files a/Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow4.png and b/Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow4.png differ
diff --git a/Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow5.png b/Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow5.png
index f3d4e6fe0d1..6d72cafc90e 100644
Binary files a/Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow5.png and b/Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow5.png differ
diff --git a/Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow6.png b/Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow6.png
index 5b20f48ef2a..58c822ff785 100644
Binary files a/Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow6.png and b/Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow6.png differ
diff --git a/Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow7.png b/Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow7.png
index e0c99e0f540..62faa53e63c 100644
Binary files a/Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow7.png and b/Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow7.png differ
diff --git a/Resources/Textures/Structures/Windows/shuttle_window_diagonal.rsi/meta.json b/Resources/Textures/Structures/Windows/shuttle_window_diagonal.rsi/meta.json
index 453a3797223..8477687a8c7 100644
--- a/Resources/Textures/Structures/Windows/shuttle_window_diagonal.rsi/meta.json
+++ b/Resources/Textures/Structures/Windows/shuttle_window_diagonal.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Made by brainfood1183 (github)",
+    "copyright": "Made by brainfood1183 (github), transparency tweaked by Ubaser.",
     "states": [
         {
             "name": "state0"
diff --git a/Resources/Textures/Structures/Windows/shuttle_window_diagonal.rsi/state0.png b/Resources/Textures/Structures/Windows/shuttle_window_diagonal.rsi/state0.png
index d218355a78d..f3a4f8bca59 100644
Binary files a/Resources/Textures/Structures/Windows/shuttle_window_diagonal.rsi/state0.png and b/Resources/Textures/Structures/Windows/shuttle_window_diagonal.rsi/state0.png differ
diff --git a/Resources/Textures/Structures/Windows/shuttle_window_diagonal.rsi/state1.png b/Resources/Textures/Structures/Windows/shuttle_window_diagonal.rsi/state1.png
index 810b7039002..08bde9a23c4 100644
Binary files a/Resources/Textures/Structures/Windows/shuttle_window_diagonal.rsi/state1.png and b/Resources/Textures/Structures/Windows/shuttle_window_diagonal.rsi/state1.png differ
diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/full.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/full.png
index 6baa538dad9..6e1e863798b 100644
Binary files a/Resources/Textures/Structures/Windows/tinted_window.rsi/full.png and b/Resources/Textures/Structures/Windows/tinted_window.rsi/full.png differ
diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/meta.json b/Resources/Textures/Structures/Windows/tinted_window.rsi/meta.json
index 30517fd0ac6..90748bedfde 100644
--- a/Resources/Textures/Structures/Windows/tinted_window.rsi/meta.json
+++ b/Resources/Textures/Structures/Windows/tinted_window.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/           f141c349e063f7318d8c8a2417d840f0b2d06600, modified",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f141c349e063f7318d8c8a2417d840f0b2d06600, modified, transparency tweaked by Ubaser.",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow0.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow0.png
index 414ffd9f3ee..162cfa0cfac 100644
Binary files a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow0.png and b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow0.png differ
diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow1.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow1.png
index 90131a48bf9..f022a67d812 100644
Binary files a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow1.png and b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow1.png differ
diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow2.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow2.png
index ae12f39860f..162cfa0cfac 100644
Binary files a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow2.png and b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow2.png differ
diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow3.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow3.png
index bbfee9bce7f..f022a67d812 100644
Binary files a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow3.png and b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow3.png differ
diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow4.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow4.png
index b79db5f7893..41b69347b0b 100644
Binary files a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow4.png and b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow4.png differ
diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow5.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow5.png
index 83797163f22..8f02050ca08 100644
Binary files a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow5.png and b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow5.png differ
diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow6.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow6.png
index 2cae7c43a4c..41b69347b0b 100644
Binary files a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow6.png and b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow6.png differ
diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow7.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow7.png
index 17304ce1044..7ca4d7214fb 100644
Binary files a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow7.png and b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow7.png differ
diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/full.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/full.png
index f7b6e10f869..0e5df9bea5d 100644
Binary files a/Resources/Textures/Structures/Windows/uranium_window.rsi/full.png and b/Resources/Textures/Structures/Windows/uranium_window.rsi/full.png differ
diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/meta.json b/Resources/Textures/Structures/Windows/uranium_window.rsi/meta.json
index 099201b4184..8d594817c68 100644
--- a/Resources/Textures/Structures/Windows/uranium_window.rsi/meta.json
+++ b/Resources/Textures/Structures/Windows/uranium_window.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "resprited by AsikKEsel | Original source: from vgstation at commit https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi and modified by Swept",
+    "copyright": "resprited by AsikKEsel | Original source: from vgstation at commit https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi and modified by Swept, transparency tweaked by Ubaser.",
     "size": {
       "x": 32,
       "y": 32
diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow0.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow0.png
index 7be507678d4..ff5619c5194 100644
Binary files a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow0.png and b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow0.png differ
diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow1.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow1.png
index 9979f28e945..cabe60b5579 100644
Binary files a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow1.png and b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow1.png differ
diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow2.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow2.png
index 7be507678d4..ff5619c5194 100644
Binary files a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow2.png and b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow2.png differ
diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow3.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow3.png
index 9979f28e945..cabe60b5579 100644
Binary files a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow3.png and b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow3.png differ
diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow4.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow4.png
index 9fa452a61bf..45ff01e1907 100644
Binary files a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow4.png and b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow4.png differ
diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow5.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow5.png
index bd46092739e..473bc3ffede 100644
Binary files a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow5.png and b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow5.png differ
diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow6.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow6.png
index eabc47c84b8..45ff01e1907 100644
Binary files a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow6.png and b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow6.png differ
diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow7.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow7.png
index f75790a4187..1a0ec49fd54 100644
Binary files a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow7.png and b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow7.png differ
diff --git a/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/meta.json b/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/meta.json
index 453a3797223..8477687a8c7 100644
--- a/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/meta.json
+++ b/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Made by brainfood1183 (github)",
+    "copyright": "Made by brainfood1183 (github), transparency tweaked by Ubaser.",
     "states": [
         {
             "name": "state0"
diff --git a/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state0.png b/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state0.png
index 45b3c99189f..43bfb93bac1 100644
Binary files a/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state0.png and b/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state0.png differ
diff --git a/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state1.png b/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state1.png
index 5286b1e17e6..423848b583a 100644
Binary files a/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state1.png and b/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state1.png differ
diff --git a/Resources/Textures/Structures/Windows/window.rsi/full.png b/Resources/Textures/Structures/Windows/window.rsi/full.png
index 5ed08bac420..a42b6b77f7f 100644
Binary files a/Resources/Textures/Structures/Windows/window.rsi/full.png and b/Resources/Textures/Structures/Windows/window.rsi/full.png differ
diff --git a/Resources/Textures/Structures/Windows/window.rsi/meta.json b/Resources/Textures/Structures/Windows/window.rsi/meta.json
index 41b8be18b43..58cb4182e9e 100644
--- a/Resources/Textures/Structures/Windows/window.rsi/meta.json
+++ b/Resources/Textures/Structures/Windows/window.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi and modified by Swept",
+  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi and modified by Swept, transparency tweaked by Ubaser.",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Structures/Windows/window.rsi/window0.png b/Resources/Textures/Structures/Windows/window.rsi/window0.png
index 37bade4a4a7..1a4220a38e1 100644
Binary files a/Resources/Textures/Structures/Windows/window.rsi/window0.png and b/Resources/Textures/Structures/Windows/window.rsi/window0.png differ
diff --git a/Resources/Textures/Structures/Windows/window.rsi/window1.png b/Resources/Textures/Structures/Windows/window.rsi/window1.png
index 4495aca459d..3c1e2ce801a 100644
Binary files a/Resources/Textures/Structures/Windows/window.rsi/window1.png and b/Resources/Textures/Structures/Windows/window.rsi/window1.png differ
diff --git a/Resources/Textures/Structures/Windows/window.rsi/window2.png b/Resources/Textures/Structures/Windows/window.rsi/window2.png
index 37bade4a4a7..1a4220a38e1 100644
Binary files a/Resources/Textures/Structures/Windows/window.rsi/window2.png and b/Resources/Textures/Structures/Windows/window.rsi/window2.png differ
diff --git a/Resources/Textures/Structures/Windows/window.rsi/window3.png b/Resources/Textures/Structures/Windows/window.rsi/window3.png
index 4495aca459d..3c1e2ce801a 100644
Binary files a/Resources/Textures/Structures/Windows/window.rsi/window3.png and b/Resources/Textures/Structures/Windows/window.rsi/window3.png differ
diff --git a/Resources/Textures/Structures/Windows/window.rsi/window4.png b/Resources/Textures/Structures/Windows/window.rsi/window4.png
index 13aaa2107eb..4a47d0859ae 100644
Binary files a/Resources/Textures/Structures/Windows/window.rsi/window4.png and b/Resources/Textures/Structures/Windows/window.rsi/window4.png differ
diff --git a/Resources/Textures/Structures/Windows/window.rsi/window5.png b/Resources/Textures/Structures/Windows/window.rsi/window5.png
index df8dd36cf54..2acdba184c9 100644
Binary files a/Resources/Textures/Structures/Windows/window.rsi/window5.png and b/Resources/Textures/Structures/Windows/window.rsi/window5.png differ
diff --git a/Resources/Textures/Structures/Windows/window.rsi/window6.png b/Resources/Textures/Structures/Windows/window.rsi/window6.png
index 13aaa2107eb..4a47d0859ae 100644
Binary files a/Resources/Textures/Structures/Windows/window.rsi/window6.png and b/Resources/Textures/Structures/Windows/window.rsi/window6.png differ
diff --git a/Resources/Textures/Structures/Windows/window.rsi/window7.png b/Resources/Textures/Structures/Windows/window.rsi/window7.png
index 1a2e65fad78..8c0fc72e2ad 100644
Binary files a/Resources/Textures/Structures/Windows/window.rsi/window7.png and b/Resources/Textures/Structures/Windows/window.rsi/window7.png differ
diff --git a/Resources/Textures/Structures/Windows/window_diagonal.rsi/meta.json b/Resources/Textures/Structures/Windows/window_diagonal.rsi/meta.json
index 453a3797223..8477687a8c7 100644
--- a/Resources/Textures/Structures/Windows/window_diagonal.rsi/meta.json
+++ b/Resources/Textures/Structures/Windows/window_diagonal.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Made by brainfood1183 (github)",
+    "copyright": "Made by brainfood1183 (github), transparency tweaked by Ubaser.",
     "states": [
         {
             "name": "state0"
diff --git a/Resources/Textures/Structures/Windows/window_diagonal.rsi/state0.png b/Resources/Textures/Structures/Windows/window_diagonal.rsi/state0.png
index df5805957d6..428ed238a76 100644
Binary files a/Resources/Textures/Structures/Windows/window_diagonal.rsi/state0.png and b/Resources/Textures/Structures/Windows/window_diagonal.rsi/state0.png differ
diff --git a/Resources/Textures/Structures/Windows/window_diagonal.rsi/state1.png b/Resources/Textures/Structures/Windows/window_diagonal.rsi/state1.png
index 83737b8cefe..9861698bb2a 100644
Binary files a/Resources/Textures/Structures/Windows/window_diagonal.rsi/state1.png and b/Resources/Textures/Structures/Windows/window_diagonal.rsi/state1.png differ
diff --git a/Resources/Textures/Structures/conveyor_old.rsi/conveyor_loose.png b/Resources/Textures/Structures/conveyor_old.rsi/conveyor_loose.png
deleted file mode 100644
index 97b955cc6e0..00000000000
Binary files a/Resources/Textures/Structures/conveyor_old.rsi/conveyor_loose.png and /dev/null differ
diff --git a/Resources/Textures/Structures/conveyor_old.rsi/conveyor_started_ccw.png b/Resources/Textures/Structures/conveyor_old.rsi/conveyor_started_ccw.png
deleted file mode 100644
index 7ad5f8fc70d..00000000000
Binary files a/Resources/Textures/Structures/conveyor_old.rsi/conveyor_started_ccw.png and /dev/null differ
diff --git a/Resources/Textures/Structures/conveyor_old.rsi/conveyor_started_ccw_r.png b/Resources/Textures/Structures/conveyor_old.rsi/conveyor_started_ccw_r.png
deleted file mode 100644
index 8bd276e82e4..00000000000
Binary files a/Resources/Textures/Structures/conveyor_old.rsi/conveyor_started_ccw_r.png and /dev/null differ
diff --git a/Resources/Textures/Structures/conveyor_old.rsi/conveyor_started_cw.png b/Resources/Textures/Structures/conveyor_old.rsi/conveyor_started_cw.png
deleted file mode 100644
index 5625aa681de..00000000000
Binary files a/Resources/Textures/Structures/conveyor_old.rsi/conveyor_started_cw.png and /dev/null differ
diff --git a/Resources/Textures/Structures/conveyor_old.rsi/conveyor_started_cw_r.png b/Resources/Textures/Structures/conveyor_old.rsi/conveyor_started_cw_r.png
deleted file mode 100644
index d2e18ca0caa..00000000000
Binary files a/Resources/Textures/Structures/conveyor_old.rsi/conveyor_started_cw_r.png and /dev/null differ
diff --git a/Resources/Textures/Structures/conveyor_old.rsi/conveyor_stopped_ccw.png b/Resources/Textures/Structures/conveyor_old.rsi/conveyor_stopped_ccw.png
deleted file mode 100644
index cbdeaf6f8d3..00000000000
Binary files a/Resources/Textures/Structures/conveyor_old.rsi/conveyor_stopped_ccw.png and /dev/null differ
diff --git a/Resources/Textures/Structures/conveyor_old.rsi/conveyor_stopped_cw.png b/Resources/Textures/Structures/conveyor_old.rsi/conveyor_stopped_cw.png
deleted file mode 100644
index 116b3aed504..00000000000
Binary files a/Resources/Textures/Structures/conveyor_old.rsi/conveyor_stopped_cw.png and /dev/null differ
diff --git a/Resources/Textures/Structures/conveyor_old.rsi/meta.json b/Resources/Textures/Structures/conveyor_old.rsi/meta.json
deleted file mode 100644
index 71aefcdba1d..00000000000
--- a/Resources/Textures/Structures/conveyor_old.rsi/meta.json
+++ /dev/null
@@ -1,238 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/discordia-space/CEV-Eris/blob/a846799c53f8ee9dcec4b075d7645f591f3ec19d/icons/obj/machines/conveyor.dmi",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "conveyor_loose"
-    },
-    {
-      "name": "conveyor_started_ccw",
-      "directions": 8,
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "conveyor_started_ccw_r",
-      "directions": 8,
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "conveyor_started_cw",
-      "directions": 8,
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "conveyor_started_cw_r",
-      "directions": 8,
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "conveyor_stopped_ccw",
-      "directions": 8
-    },
-    {
-      "name": "conveyor_stopped_cw",
-      "directions": 8
-    }
-  ]
-}
diff --git a/Resources/Textures/_CD/Objects/Misc/dogtags.rsi/dogtag.png b/Resources/Textures/_CD/Objects/Misc/dogtags.rsi/dogtag.png
new file mode 100644
index 00000000000..05a5b71bc5e
Binary files /dev/null and b/Resources/Textures/_CD/Objects/Misc/dogtags.rsi/dogtag.png differ
diff --git a/Resources/Textures/_CD/Objects/Misc/dogtags.rsi/equipped-NECK.png b/Resources/Textures/_CD/Objects/Misc/dogtags.rsi/equipped-NECK.png
new file mode 100644
index 00000000000..4d837168da6
Binary files /dev/null and b/Resources/Textures/_CD/Objects/Misc/dogtags.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/_CD/Objects/Misc/dogtags.rsi/meta.json b/Resources/Textures/_CD/Objects/Misc/dogtags.rsi/meta.json
new file mode 100644
index 00000000000..da1b490e53b
--- /dev/null
+++ b/Resources/Textures/_CD/Objects/Misc/dogtags.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from cmss13 at https://github.com/cmss13-devs/cmss13/blob/a2d5ca6e69725341f0fa261a4a3f89c737e843b3/icons/obj/items/card.dmi",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "dogtag"
+        },
+        {
+            "name": "equipped-NECK",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/_EE/Effects/footprints.rsi/dragging-1.png b/Resources/Textures/_EE/Effects/footprints.rsi/dragging-1.png
index 74d2aeb0743..3c934fb3e2a 100644
Binary files a/Resources/Textures/_EE/Effects/footprints.rsi/dragging-1.png and b/Resources/Textures/_EE/Effects/footprints.rsi/dragging-1.png differ
diff --git a/Resources/Textures/_EE/Effects/footprints.rsi/dragging-2.png b/Resources/Textures/_EE/Effects/footprints.rsi/dragging-2.png
index cc45f4f8ae8..c06b3bb95b7 100644
Binary files a/Resources/Textures/_EE/Effects/footprints.rsi/dragging-2.png and b/Resources/Textures/_EE/Effects/footprints.rsi/dragging-2.png differ
diff --git a/Resources/Textures/_EE/Effects/footprints.rsi/dragging-3.png b/Resources/Textures/_EE/Effects/footprints.rsi/dragging-3.png
index d0f7274dd3c..6ec658808a0 100644
Binary files a/Resources/Textures/_EE/Effects/footprints.rsi/dragging-3.png and b/Resources/Textures/_EE/Effects/footprints.rsi/dragging-3.png differ
diff --git a/Resources/Textures/_EE/Effects/footprints.rsi/dragging-4.png b/Resources/Textures/_EE/Effects/footprints.rsi/dragging-4.png
index 5eb34b5d570..0d1c955526f 100644
Binary files a/Resources/Textures/_EE/Effects/footprints.rsi/dragging-4.png and b/Resources/Textures/_EE/Effects/footprints.rsi/dragging-4.png differ
diff --git a/Resources/Textures/_EE/Effects/footprints.rsi/dragging-5.png b/Resources/Textures/_EE/Effects/footprints.rsi/dragging-5.png
index 6b1b34d1456..5dd6587541d 100644
Binary files a/Resources/Textures/_EE/Effects/footprints.rsi/dragging-5.png and b/Resources/Textures/_EE/Effects/footprints.rsi/dragging-5.png differ
diff --git a/Resources/Textures/_EE/Effects/footprints.rsi/meta.json b/Resources/Textures/_EE/Effects/footprints.rsi/meta.json
index 0ce2e096ac5..ddcf5fd40a4 100644
--- a/Resources/Textures/_EE/Effects/footprints.rsi/meta.json
+++ b/Resources/Textures/_EE/Effects/footprints.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "IMPERIAL SPACE",
+    "copyright": "IMPERIAL SPACE (all besides following), dotCatshark (Dragging-2 & -5), Ratwood keep (https://github.com/Rotwood-Vale/Ratwood-Keep) (Dragging-1 & -3), (Goonstation https://github.com/goonstation/goonstation/) (Dragging-4)",
     "states": [
         {
             "name": "footprint-left-bare-diona"
diff --git a/RobustToolbox b/RobustToolbox
index 32bca7cfd41..92b0e7f1a85 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 32bca7cfd417edcad9a60c2b1703eba8675f56af
+Subproject commit 92b0e7f1a853979a1361ed24d2fb5ffc11f43f66