From 735ed9ea25467dd2551626e0a23464328083ca0a Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sat, 4 Jul 2026 07:42:50 -0300
Subject: [PATCH 01/14] feat: loadout rework start

---
 .../Lobby/UI/HumanoidProfileEditor.xaml       |   4 +
 .../_DEN/Lobby/UI/DenCategoryContainer.xaml   |  13 ++
 .../Lobby/UI/DenCategoryContainer.xaml.cs     |  16 ++
 .../_DEN/Lobby/UI/DenLoadoutButtons.xaml      |  28 +++
 .../_DEN/Lobby/UI/DenLoadoutButtons.xaml.cs   |  18 ++
 .../_DEN/Lobby/UI/DenLoadoutTab.xaml          |  20 ++
 .../_DEN/Lobby/UI/DenLoadoutTab.xaml.cs       |  16 ++
 Content.Server/Antag/AntagSelectionSystem.cs  |   2 +-
 .../Station/Systems/StationSpawningSystem.cs  |   2 +-
 .../Systems/StationSpawningSystem.DEN.cs      |  51 +++++
 Content.Shared/Clothing/LoadoutSystem.cs      |   2 +
 Content.Shared/_DEN/Loadout/DenLoadout.cs     |  24 ++
 .../_DEN/Loadout/EntityLoadoutPrototype.cs    | 106 +++++++++
 .../_DEN/Loadout/LoadoutCategoryPrototype.cs  |  29 +++
 .../SharedStationSpawningSystem.DEN.cs        | 213 ++++++++++++++++++
 .../en-US/_DEN/loadout/test/loadout_test.ftl  |   4 +
 .../_DEN/Loadouts/Test/loadout_test.yml       |   6 +
 17 files changed, 552 insertions(+), 2 deletions(-)
 create mode 100644 Content.Client/_DEN/Lobby/UI/DenCategoryContainer.xaml
 create mode 100644 Content.Client/_DEN/Lobby/UI/DenCategoryContainer.xaml.cs
 create mode 100644 Content.Client/_DEN/Lobby/UI/DenLoadoutButtons.xaml
 create mode 100644 Content.Client/_DEN/Lobby/UI/DenLoadoutButtons.xaml.cs
 create mode 100644 Content.Client/_DEN/Lobby/UI/DenLoadoutTab.xaml
 create mode 100644 Content.Client/_DEN/Lobby/UI/DenLoadoutTab.xaml.cs
 create mode 100644 Content.Server/_DEN/Station/Systems/StationSpawningSystem.DEN.cs
 create mode 100644 Content.Shared/_DEN/Loadout/DenLoadout.cs
 create mode 100644 Content.Shared/_DEN/Loadout/EntityLoadoutPrototype.cs
 create mode 100644 Content.Shared/_DEN/Loadout/LoadoutCategoryPrototype.cs
 create mode 100644 Content.Shared/_DEN/Station/Systems/SharedStationSpawningSystem.DEN.cs
 create mode 100644 Resources/Locale/en-US/_DEN/loadout/test/loadout_test.ftl
 create mode 100644 Resources/Prototypes/_DEN/Loadouts/Test/loadout_test.yml

diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml
index 84c5b75d1cb..e4679d4c84f 100644
--- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml
+++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml
@@ -4,6 +4,7 @@
          xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
          xmlns:ui="clr-namespace:Content.Client.Lobby.UI"
          xmlns:profile="clr-namespace:Content.Client.Lobby.UI.ProfileEditorControls"
+         xmlns:den="clr-namespace:Content.Client._DEN.Lobby.UI"
          HorizontalExpand="True">
         <!-- Left side -->
         <BoxContainer Orientation="Vertical" Margin="10 10 10 10" HorizontalExpand="True">
@@ -130,6 +131,9 @@
                     <!-- Markings -->
                     <humanoid:MarkingPicker Name="Markings" HorizontalExpand="True" VerticalExpand="True" />
                 </BoxContainer>
+                <BoxContainer Name="LoadoutTab">
+                    <den:DenLoadoutTab HorizontalExpand="True" VerticalExpand="True" />
+                </BoxContainer>
             </TabContainer>
         </BoxContainer>
         <!-- Right side -->
diff --git a/Content.Client/_DEN/Lobby/UI/DenCategoryContainer.xaml b/Content.Client/_DEN/Lobby/UI/DenCategoryContainer.xaml
new file mode 100644
index 00000000000..df667dc310c
--- /dev/null
+++ b/Content.Client/_DEN/Lobby/UI/DenCategoryContainer.xaml
@@ -0,0 +1,13 @@
+<ui:DenCategoryContainer xmlns="https://spacestation14.io"
+                         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                         xmlns:ui="clr-namespace:Content.Client._DEN.Lobby.UI">
+    <PanelContainer StyleClasses="LoadoutBackground"
+                    HorizontalExpand="True">
+        <BoxContainer VerticalAlignment="Center"
+                      Orientation="Horizontal"
+                      SeparationOverride="4"
+                      Margin="5 5">
+
+        </BoxContainer>
+    </PanelContainer>
+</ui:DenCategoryContainer>
diff --git a/Content.Client/_DEN/Lobby/UI/DenCategoryContainer.xaml.cs b/Content.Client/_DEN/Lobby/UI/DenCategoryContainer.xaml.cs
new file mode 100644
index 00000000000..f83b467f245
--- /dev/null
+++ b/Content.Client/_DEN/Lobby/UI/DenCategoryContainer.xaml.cs
@@ -0,0 +1,16 @@
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client._DEN.Lobby.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class DenCategoryContainer : ContainerButton
+{
+    public DenCategoryContainer()
+    {
+        RobustXamlLoader.Load(this);
+
+
+    }
+}
diff --git a/Content.Client/_DEN/Lobby/UI/DenLoadoutButtons.xaml b/Content.Client/_DEN/Lobby/UI/DenLoadoutButtons.xaml
new file mode 100644
index 00000000000..94e01dcf85a
--- /dev/null
+++ b/Content.Client/_DEN/Lobby/UI/DenLoadoutButtons.xaml
@@ -0,0 +1,28 @@
+<ui:DenLoadoutButtons xmlns="https://spacestation14.io"
+              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+              xmlns:ui="clr-namespace:Content.Client._DEN.Lobby.UI">
+    <PanelContainer StyleClasses="ChatPanel"
+                    HorizontalExpand="True">
+        <BoxContainer VerticalAlignment="Center"
+                      Orientation="Horizontal"
+                      Margin="5">
+            <Label Name="LoadoutNameLabel"
+                   StyleClasses="TraitsEntryNameLabel"
+                   Text="My Loadout"
+                   Margin="5 0 0 0"/>
+            <Control HorizontalExpand="True" />
+            <Button Text="Edit Jobs"
+                    Margin="0 2 0 0"
+                    StyleClasses="OpenRight"/>
+            <Button Text="Edit Loadout"
+                    Margin="0 2 0 0"
+                    StyleClasses="OpenBoth"/>
+            <Button Text="Rename"
+                    Margin="0 2 0 0"
+                    StyleClasses="OpenBoth"/>
+            <Button Text="Delete"
+                    Margin="0 2 0 0"
+                    StyleClasses="OpenLeft"/>
+        </BoxContainer>
+    </PanelContainer>
+</ui:DenLoadoutButtons>
diff --git a/Content.Client/_DEN/Lobby/UI/DenLoadoutButtons.xaml.cs b/Content.Client/_DEN/Lobby/UI/DenLoadoutButtons.xaml.cs
new file mode 100644
index 00000000000..c7e64209a8e
--- /dev/null
+++ b/Content.Client/_DEN/Lobby/UI/DenLoadoutButtons.xaml.cs
@@ -0,0 +1,18 @@
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client._DEN.Lobby.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class DenLoadoutButtons : ContainerButton
+{
+    public string Text { get; set; } = "Loadout";
+
+    public DenLoadoutButtons()
+    {
+        RobustXamlLoader.Load(this);
+
+
+    }
+}
diff --git a/Content.Client/_DEN/Lobby/UI/DenLoadoutTab.xaml b/Content.Client/_DEN/Lobby/UI/DenLoadoutTab.xaml
new file mode 100644
index 00000000000..cece372781f
--- /dev/null
+++ b/Content.Client/_DEN/Lobby/UI/DenLoadoutTab.xaml
@@ -0,0 +1,20 @@
+<ContainerButton xmlns="https://spacestation14.io"
+         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+         xmlns:ui="clr-namespace:Content.Client._DEN.Lobby.UI">
+    <BoxContainer Orientation="Vertical"
+                  HorizontalExpand="True"
+                  VerticalExpand="True">
+        <BoxContainer HorizontalExpand="True"
+                      VerticalExpand="True"
+                      Orientation="Vertical"
+                      SeparationOverride="5"
+                      Margin="5">
+            <ui:DenLoadoutButtons HorizontalExpand="True" />
+            <ui:DenLoadoutButtons HorizontalExpand="True" />
+            <ui:DenLoadoutButtons HorizontalExpand="True" />
+            <ui:DenLoadoutButtons HorizontalExpand="True" />
+            <ui:DenLoadoutButtons HorizontalExpand="True" />
+            <ui:DenLoadoutButtons HorizontalExpand="True" />
+        </BoxContainer>
+    </BoxContainer>
+</ContainerButton>
diff --git a/Content.Client/_DEN/Lobby/UI/DenLoadoutTab.xaml.cs b/Content.Client/_DEN/Lobby/UI/DenLoadoutTab.xaml.cs
new file mode 100644
index 00000000000..28c0aec43cf
--- /dev/null
+++ b/Content.Client/_DEN/Lobby/UI/DenLoadoutTab.xaml.cs
@@ -0,0 +1,16 @@
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client._DEN.Lobby.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class DenLoadoutTab : ContainerButton
+{
+
+    public DenLoadoutTab()
+    {
+        RobustXamlLoader.Load(this);
+
+    }
+}
diff --git a/Content.Server/Antag/AntagSelectionSystem.cs b/Content.Server/Antag/AntagSelectionSystem.cs
index eab89e2af70..d43bb85b2e5 100644
--- a/Content.Server/Antag/AntagSelectionSystem.cs
+++ b/Content.Server/Antag/AntagSelectionSystem.cs
@@ -789,7 +789,7 @@ private void InitializeAntag(Entity<AntagSelectionComponent> gameRule, AntagSpec
         if (prototype.StartingGear is not null)
             gear.Add(prototype.StartingGear.Value);
 
-        _loadout.Equip(antag, gear, prototype.RoleLoadout);
+        // _loadout.Equip(antag, gear, prototype.RoleLoadout); - DEN: Custom Loadout System
 
         // Ensure that we have the right mind for our entity.
         if (!_mind.TryGetMind(player, out var mind, out var mindComp) || mindComp.OwnedEntity != antag)
diff --git a/Content.Server/Station/Systems/StationSpawningSystem.cs b/Content.Server/Station/Systems/StationSpawningSystem.cs
index ba515ffcd01..91511f94383 100644
--- a/Content.Server/Station/Systems/StationSpawningSystem.cs
+++ b/Content.Server/Station/Systems/StationSpawningSystem.cs
@@ -83,7 +83,7 @@ public sealed partial class StationSpawningSystem : SharedStationSpawningSystem
     /// <param name="station">The station this player is being spawned on.</param>
     /// <param name="entity">The entity to use, if one already exists.</param>
     /// <returns>The spawned entity</returns>
-    public EntityUid SpawnPlayerMob(
+    public EntityUid SpawnPlayerMobUpstream(
         EntityCoordinates coordinates,
         ProtoId<JobPrototype>? job,
         HumanoidCharacterProfile? profile,
diff --git a/Content.Server/_DEN/Station/Systems/StationSpawningSystem.DEN.cs b/Content.Server/_DEN/Station/Systems/StationSpawningSystem.DEN.cs
new file mode 100644
index 00000000000..80d6679ae9b
--- /dev/null
+++ b/Content.Server/_DEN/Station/Systems/StationSpawningSystem.DEN.cs
@@ -0,0 +1,51 @@
+using Content.Shared._DEN.Loadout;
+using Content.Shared.CCVar;
+using Content.Shared.DetailExaminable;
+using Content.Shared.Humanoid.Prototypes;
+using Content.Shared.Preferences;
+using Content.Shared.Roles;
+using Robust.Shared.Map;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Station.Systems;
+
+public sealed partial class StationSpawningSystem
+{
+    private const string LoadoutTest1 = "test1";
+
+    private readonly HashSet<ProtoId<EntityLoadoutPrototype>> _testingLoadouts = new()
+    {
+        LoadoutTest1
+    };
+
+    public EntityUid SpawnPlayerMob(
+        EntityCoordinates coordinates,
+        ProtoId<JobPrototype>? job,
+        HumanoidCharacterProfile? profile,
+        EntityUid? station,
+        EntityUid? entity = null)
+    {
+        string speciesId = profile?.Species ?? HumanoidCharacterProfile.DefaultSpecies;
+
+        if (!_prototypeManager.TryIndex<SpeciesPrototype>(speciesId, out var species))
+            throw new ArgumentException($"Invalid species prototype was used: {speciesId}");
+
+        entity ??= Spawn(species.Prototype, coordinates);
+
+        if (profile != null)
+        {
+            _visualBody.ApplyProfileTo(entity.Value, profile);
+            _humanoidProfile.ApplyProfileTo(entity.Value, profile);
+            _metaSystem.SetEntityName(entity.Value, profile.Name);
+
+            if (profile.FlavorText != "" && _configurationManager.GetCVar(CCVars.FlavorText))
+            {
+                AddComp<DetailExaminableComponent>(entity.Value).Content = profile.FlavorText;
+            }
+
+            SpawnCharacterLoadout(_testingLoadouts, entity.Value, coordinates);
+        }
+
+        return entity.Value;
+    }
+}
diff --git a/Content.Shared/Clothing/LoadoutSystem.cs b/Content.Shared/Clothing/LoadoutSystem.cs
index 4a87d00dac6..494a992dae5 100644
--- a/Content.Shared/Clothing/LoadoutSystem.cs
+++ b/Content.Shared/Clothing/LoadoutSystem.cs
@@ -24,6 +24,7 @@ public sealed partial class LoadoutSystem : EntitySystem
     [Dependency] private IPrototypeManager _protoMan = default!;
     [Dependency] private IRobustRandom _random = default!;
 
+    /* DEN: Custom Loadout System
     public override void Initialize()
     {
         base.Initialize();
@@ -31,6 +32,7 @@ public override void Initialize()
         // Wait until the character has all their organs before we give them their loadout
         SubscribeLocalEvent<LoadoutComponent, MapInitEvent>(OnMapInit, after: [typeof(InitialBodySystem)]);
     }
+    */
 
     public static string GetJobPrototype(string? loadout)
     {
diff --git a/Content.Shared/_DEN/Loadout/DenLoadout.cs b/Content.Shared/_DEN/Loadout/DenLoadout.cs
new file mode 100644
index 00000000000..540a563e158
--- /dev/null
+++ b/Content.Shared/_DEN/Loadout/DenLoadout.cs
@@ -0,0 +1,24 @@
+using Content.Shared.Preferences.Loadouts;
+using Content.Shared.Roles;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared._DEN.Loadout;
+
+[Serializable, NetSerializable]
+public record struct DenLoadout
+{
+    public Guid Id;
+    public int Priority;
+
+    public Dictionary<Guid, ProtoId<LoadoutPrototype>> Loadouts;
+    public Dictionary<Guid, DenCustomLoadoutInfo> CustomLoadouts;
+}
+
+[Serializable, NetSerializable]
+public record struct DenCustomLoadoutInfo
+{
+    public string? CustomName;
+    public string? CustomDescription;
+    public string? CustomColor;
+}
diff --git a/Content.Shared/_DEN/Loadout/EntityLoadoutPrototype.cs b/Content.Shared/_DEN/Loadout/EntityLoadoutPrototype.cs
new file mode 100644
index 00000000000..7ce6f564327
--- /dev/null
+++ b/Content.Shared/_DEN/Loadout/EntityLoadoutPrototype.cs
@@ -0,0 +1,106 @@
+using Content.Shared._DEN.Requirements.PlayerRequirements;
+using Content.Shared._DEN.Traits.TraitFunctions;
+using Content.Shared.Whitelist;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared._DEN.Loadout;
+
+public sealed class EntityLoadoutPrototype : IInheritingPrototype, IPrototype
+{
+    [ViewVariables]
+    [IdDataField]
+    public string ID { get; private set; } = default!;
+
+    /// <inheritdoc/>
+    [DataField]
+    public string[]? Parents { get; private set; }
+
+    /// <inheritdoc/>
+    [DataField]
+    public bool Abstract { get; private set; }
+
+    /// <summary>
+    /// The name of this loadout.
+    /// </summary>
+    [DataField]
+    public LocId Name { get; private set; } = string.Empty;
+
+    /// <summary>
+    /// The description of this loadout.
+    /// </summary>
+    [DataField]
+    public LocId? Description { get; private set; }
+
+    [DataField]
+    public int Priority;
+
+    /// <summary>
+    /// Don't apply this loadout to entities this whitelist IS NOT valid for.
+    /// </summary>
+    [DataField]
+    public EntityWhitelist? Whitelist;
+
+    /// <summary>
+    /// Don't apply this loadout to entities this whitelist IS valid for. (hence, a blacklist)
+    /// </summary>
+    [DataField]
+    public EntityWhitelist? Blacklist;
+
+    /// <summary>
+    /// Adds a trait to a category, allowing you to limit the selection of some traits to the settings of that category.
+    /// </summary>
+    [DataField]
+    public ProtoId<LoadoutCategoryPrototype>? Category;
+
+    /// <summary>
+    /// A list of functions associated with this loadout item.
+    /// </summary>
+    [DataField("functions")]
+    public List<ITraitFunction> TraitFunctions = new();
+
+    /// <summary>
+    /// Whether or not this loadout can be selected in the character editor.
+    /// </summary>
+    [DataField("characterEditorSelectable")]
+    public bool Selectable = true;
+
+    /// <summary>
+    ///     A list of requirements to use this trait.
+    /// </summary>
+    [DataField]
+    public List<IPlayerRequirement> Requirements = new();
+
+    /// <summary>
+    /// The full list of items to spawn in this loadout.
+    /// </summary>
+    [DataField(required: true)]
+    public List<EntProtoId> Items = new();
+
+    /// <summary>
+    /// Any items that, by default, spawn in specific equipment slots.
+    /// </summary>
+    /// <remarks>
+    /// Players can override this.
+    /// </remarks>
+    [DataField]
+    public Dictionary<string, EntProtoId> Equipment { get; set; } = new();
+
+    /// <summary>
+    /// Any items that, by default, spawn in available inhand slots.
+    /// </summary>
+    /// <remarks>
+    /// Players can override this.
+    /// </remarks>
+    [DataField]
+    public List<EntProtoId> Inhand { get; set; } = new();
+
+    /// <summary>
+    /// Any items that, by default, spawn in specific storages.
+    /// </summary>
+    /// <remarks>
+    /// Players can override this.
+    /// </remarks>
+    [DataField]
+    public Dictionary<string, List<EntProtoId>> Storage { get; set; } = new();
+}
+
diff --git a/Content.Shared/_DEN/Loadout/LoadoutCategoryPrototype.cs b/Content.Shared/_DEN/Loadout/LoadoutCategoryPrototype.cs
new file mode 100644
index 00000000000..791e413765d
--- /dev/null
+++ b/Content.Shared/_DEN/Loadout/LoadoutCategoryPrototype.cs
@@ -0,0 +1,29 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared._DEN.Loadout;
+
+/// <summary>
+/// This is a prototype for defining loadout categories.
+/// </summary>
+[Prototype]
+public sealed partial class LoadoutCategoryPrototype : IPrototype
+{
+    /// <inheritdoc/>
+    [IdDataField, ViewVariables]
+    public string ID { get; private set;  } = default!;
+
+    [DataField]
+    public LocId Name = string.Empty;
+
+    [DataField]
+    public bool Root;
+
+    [DataField]
+    public HashSet<ProtoId<LoadoutCategoryPrototype>> SubCategories = new();
+
+    [DataField]
+    public int Priority;
+
+    [DataField]
+    public int MaxItems;
+}
diff --git a/Content.Shared/_DEN/Station/Systems/SharedStationSpawningSystem.DEN.cs b/Content.Shared/_DEN/Station/Systems/SharedStationSpawningSystem.DEN.cs
new file mode 100644
index 00000000000..89682197ac5
--- /dev/null
+++ b/Content.Shared/_DEN/Station/Systems/SharedStationSpawningSystem.DEN.cs
@@ -0,0 +1,213 @@
+using Content.Shared._DEN.Loadout;
+using Robust.Shared.Map;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Station;
+
+public abstract partial class SharedStationSpawningSystem
+{
+    private const string DefaultItemsSlot = "BACK";
+
+    public void SpawnCharacterLoadout(HashSet<ProtoId<EntityLoadoutPrototype>> loadouts,
+        EntityUid character,
+        EntityCoordinates coordinates)
+    {
+        var sortedLoadouts = GetSortedPrototypes(loadouts);
+        var items = GetItems(sortedLoadouts);
+        var equipment = GetEquipment(sortedLoadouts);
+        var inhand = GetInhand(sortedLoadouts, character);
+        var storage = GetStorage(sortedLoadouts);
+
+        SpawnCharacterEquipment(character, equipment, coordinates);
+        SpawnCharacterInhand(character, inhand, coordinates);
+        SpawnCharacterStorage(character, storage, coordinates);
+        SpawnCharacterItems(character, items, coordinates);
+    }
+
+    private List<EntityLoadoutPrototype> GetSortedPrototypes(HashSet<ProtoId<EntityLoadoutPrototype>> loadouts)
+    {
+        var result = new List<EntityLoadoutPrototype>();
+
+        foreach (var loadoutId in loadouts)
+        {
+            if (!PrototypeManager.TryIndex(loadoutId, out var loadout))
+                continue;
+
+            result.Add(loadout);
+        }
+
+        result.Sort((a, b) =>
+            a.Priority.CompareTo(b.Priority));
+        return  result;
+    }
+
+    private void SpawnCharacterEquipment(EntityUid character,
+        Dictionary<string, EntProtoId> equipment,
+        EntityCoordinates coordinates
+    )
+    {
+        if (!InventorySystem.TryGetSlots(character, out var slotDefinitions))
+            return;
+
+        foreach (var slot in slotDefinitions)
+        {
+            if (!equipment.TryGetValue(slot.Name, out var equipmentId)
+                || string.IsNullOrEmpty(equipmentId))
+                continue;
+
+            var equipmentEntity = Spawn(equipmentId, coordinates);
+            InventorySystem.TryEquip(character, equipmentEntity, slot.Name, silent: true, force: true);
+        }
+    }
+
+    private void SpawnCharacterInhand(EntityUid character,
+        List<EntProtoId> inhand,
+        EntityCoordinates coordinates
+    )
+    {
+        if (!_handsQuery.TryComp(character, out var handsComponent))
+            return;
+
+        var coords = coordinates;
+
+        // ReSharper disable once ForeachCanBePartlyConvertedToQueryUsingAnotherGetEnumerator
+        foreach (var prototype in inhand)
+        {
+            var inhandEntity = Spawn(prototype, coords);
+
+            if (_handsSystem.TryGetEmptyHand((character, handsComponent), out var emptyHand))
+            {
+                _handsSystem.TryPickup(character, inhandEntity, emptyHand, checkActionBlocker: false, handsComp: handsComponent);
+            }
+        }
+    }
+
+    private void SpawnCharacterStorage(EntityUid character,
+        Dictionary<string, List<EntProtoId>> storage,
+        EntityCoordinates coordinates
+    )
+    {
+        if (storage.Count <= 0)
+            return;
+
+        _inventoryQuery.TryComp(character, out var inventoryComp);
+
+        foreach (var (slotName, entProtos) in storage)
+        {
+            if (entProtos.Count == 0)
+                continue;
+
+            if (inventoryComp == null ||
+                !InventorySystem.TryGetSlotEntity(character,
+                    slotName,
+                    out var slotEnt,
+                    inventoryComponent: inventoryComp) ||
+                !_storageQuery.TryComp(slotEnt, out var storageComponent))
+                continue;
+
+            // ReSharper disable once ForeachCanBePartlyConvertedToQueryUsingAnotherGetEnumerator
+            foreach (var entProto in entProtos)
+            {
+                var spawnedEntity = Spawn(entProto, coordinates);
+                _storage.Insert(slotEnt.Value, spawnedEntity, out _, storageComp: storageComponent, playSound: false);
+            }
+        }
+    }
+
+    // TODO: go through every possible slot for an item
+    private void SpawnCharacterItems(EntityUid character,
+        List<EntProtoId> items,
+        EntityCoordinates coordinates
+    )
+    {
+        _inventoryQuery.TryComp(character, out var inventoryComp);
+
+        if (inventoryComp == null)
+            return;
+
+        // ReSharper disable once ForeachCanBePartlyConvertedToQueryUsingAnotherGetEnumerator
+        foreach (var item in items)
+        {
+            var spawnedEntity = Spawn(item, coordinates);
+
+            if (!InventorySystem.TryGetSlotEntity(character, DefaultItemsSlot, out var storageUid, inventoryComp)
+                || !_storageQuery.TryComp(storageUid, out var storageComponent))
+                continue;
+
+            _storage.Insert(storageUid.Value,
+                spawnedEntity,
+                out _,
+                storageComp: storageComponent,
+                playSound: false);
+        }
+    }
+
+    private List<EntProtoId> GetItems(List<EntityLoadoutPrototype> sortedLoadouts)
+    {
+        var result = new List<EntProtoId>();
+
+        foreach (var loadout in sortedLoadouts)
+        {
+            foreach (var item in loadout.Items)
+            {
+                result.Add(item);
+            }
+        }
+
+        return result;
+    }
+
+    private Dictionary<string, EntProtoId> GetEquipment(List<EntityLoadoutPrototype> sortedLoadouts)
+    {
+        var result = new Dictionary<string, EntProtoId>();
+
+        foreach (var loadout in sortedLoadouts)
+        {
+            foreach (var (key, value) in loadout.Equipment)
+            {
+                result[key] = value;
+            }
+        }
+
+        return result;
+    }
+
+    private List<EntProtoId> GetInhand(List<EntityLoadoutPrototype> sortedLoadouts,
+        EntityUid character)
+    {
+        var result = new List<EntProtoId>();
+
+        foreach (var loadout in sortedLoadouts)
+        {
+            foreach (var inhand in loadout.Inhand)
+            {
+                result.Add(inhand);
+            }
+        }
+
+        var hands = _handsSystem.GetHandCount(character);
+        var length = result.Count - hands;
+
+        result.RemoveRange(hands, length);
+
+        return result;
+    }
+
+    private Dictionary<string, List<EntProtoId>> GetStorage(List<EntityLoadoutPrototype> sortedLoadouts)
+    {
+        var result = new Dictionary<string, List<EntProtoId>>();
+
+        foreach (var loadout in sortedLoadouts)
+        {
+            foreach (var (key, value) in loadout.Storage)
+            {
+                if (!result.ContainsKey(key))
+                    result[key] = new();
+
+                result[key].AddRange(value);
+            }
+        }
+
+        return result;
+    }
+}
diff --git a/Resources/Locale/en-US/_DEN/loadout/test/loadout_test.ftl b/Resources/Locale/en-US/_DEN/loadout/test/loadout_test.ftl
new file mode 100644
index 00000000000..00c2d4961b1
--- /dev/null
+++ b/Resources/Locale/en-US/_DEN/loadout/test/loadout_test.ftl
@@ -0,0 +1,4 @@
+loadout-name-test1 = Test 1
+loadout-name-test2 = Test 2
+
+loadout-desc-test = This is a test loadout.
\ No newline at end of file
diff --git a/Resources/Prototypes/_DEN/Loadouts/Test/loadout_test.yml b/Resources/Prototypes/_DEN/Loadouts/Test/loadout_test.yml
new file mode 100644
index 00000000000..d99fa036d7c
--- /dev/null
+++ b/Resources/Prototypes/_DEN/Loadouts/Test/loadout_test.yml
@@ -0,0 +1,6 @@
+- type: entityLoadout
+  id: test1
+  name: loadout-name-test1
+  description: loadout-desc-test
+  items:
+  - WeaponSubMachineGunDrozd
\ No newline at end of file

From 57daba3c511ad053c47d34c73028ee40f45a169d Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sat, 4 Jul 2026 07:44:14 -0300
Subject: [PATCH 02/14] fix: i forgor

---
 Content.Shared/_DEN/Loadout/EntityLoadoutPrototype.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Content.Shared/_DEN/Loadout/EntityLoadoutPrototype.cs b/Content.Shared/_DEN/Loadout/EntityLoadoutPrototype.cs
index 7ce6f564327..076cfd7b5b3 100644
--- a/Content.Shared/_DEN/Loadout/EntityLoadoutPrototype.cs
+++ b/Content.Shared/_DEN/Loadout/EntityLoadoutPrototype.cs
@@ -5,7 +5,8 @@
 
 namespace Content.Shared._DEN.Loadout;
 
-public sealed class EntityLoadoutPrototype : IInheritingPrototype, IPrototype
+[Prototype]
+public sealed partial class EntityLoadoutPrototype : IInheritingPrototype, IPrototype
 {
     [ViewVariables]
     [IdDataField]

From 3b83a54a754af22b5b0ec47b101d89a2be17985a Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sat, 4 Jul 2026 09:44:59 -0300
Subject: [PATCH 03/14] i no longer care about proper commit names.

---
 .../Systems/StationSpawningSystem.DEN.cs      |   3 +-
 .../_DEN/Loadout/EntityLoadoutPrototype.cs    |   7 +-
 .../SharedStationSpawningSystem.DEN.cs        | 106 +++++++++++++++---
 .../_DEN/Loadouts/Test/loadout_test.yml       |   9 +-
 4 files changed, 103 insertions(+), 22 deletions(-)

diff --git a/Content.Server/_DEN/Station/Systems/StationSpawningSystem.DEN.cs b/Content.Server/_DEN/Station/Systems/StationSpawningSystem.DEN.cs
index 80d6679ae9b..d85b54a4b87 100644
--- a/Content.Server/_DEN/Station/Systems/StationSpawningSystem.DEN.cs
+++ b/Content.Server/_DEN/Station/Systems/StationSpawningSystem.DEN.cs
@@ -12,10 +12,11 @@ namespace Content.Server.Station.Systems;
 public sealed partial class StationSpawningSystem
 {
     private const string LoadoutTest1 = "test1";
+    private const string LoadoutTest2 = "test2";
 
     private readonly HashSet<ProtoId<EntityLoadoutPrototype>> _testingLoadouts = new()
     {
-        LoadoutTest1
+        LoadoutTest1, LoadoutTest2
     };
 
     public EntityUid SpawnPlayerMob(
diff --git a/Content.Shared/_DEN/Loadout/EntityLoadoutPrototype.cs b/Content.Shared/_DEN/Loadout/EntityLoadoutPrototype.cs
index 076cfd7b5b3..0609e7a67bd 100644
--- a/Content.Shared/_DEN/Loadout/EntityLoadoutPrototype.cs
+++ b/Content.Shared/_DEN/Loadout/EntityLoadoutPrototype.cs
@@ -2,6 +2,7 @@
 using Content.Shared._DEN.Traits.TraitFunctions;
 using Content.Shared.Whitelist;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Array;
 
 namespace Content.Shared._DEN.Loadout;
 
@@ -13,11 +14,11 @@ public sealed partial class EntityLoadoutPrototype : IInheritingPrototype, IProt
     public string ID { get; private set; } = default!;
 
     /// <inheritdoc/>
-    [DataField]
+    [ParentDataField(typeof(AbstractPrototypeIdArraySerializer<EntityLoadoutPrototype>))]
     public string[]? Parents { get; private set; }
 
     /// <inheritdoc/>
-    [DataField]
+    [AbstractDataField]
     public bool Abstract { get; private set; }
 
     /// <summary>
@@ -74,7 +75,7 @@ public sealed partial class EntityLoadoutPrototype : IInheritingPrototype, IProt
     /// <summary>
     /// The full list of items to spawn in this loadout.
     /// </summary>
-    [DataField(required: true)]
+    [DataField]
     public List<EntProtoId> Items = new();
 
     /// <summary>
diff --git a/Content.Shared/_DEN/Station/Systems/SharedStationSpawningSystem.DEN.cs b/Content.Shared/_DEN/Station/Systems/SharedStationSpawningSystem.DEN.cs
index 89682197ac5..9546174bdc2 100644
--- a/Content.Shared/_DEN/Station/Systems/SharedStationSpawningSystem.DEN.cs
+++ b/Content.Shared/_DEN/Station/Systems/SharedStationSpawningSystem.DEN.cs
@@ -1,4 +1,8 @@
 using Content.Shared._DEN.Loadout;
+using Content.Shared.Clothing.Components;
+using Content.Shared.Hands.Components;
+using Content.Shared.Inventory;
+using Robust.Shared.Containers;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
 
@@ -6,7 +10,7 @@ namespace Content.Shared.Station;
 
 public abstract partial class SharedStationSpawningSystem
 {
-    private const string DefaultItemsSlot = "BACK";
+    private const string DefaultItemsSlot = "back";
 
     public void SpawnCharacterLoadout(HashSet<ProtoId<EntityLoadoutPrototype>> loadouts,
         EntityUid character,
@@ -114,34 +118,100 @@ EntityCoordinates coordinates
         }
     }
 
-    // TODO: go through every possible slot for an item
     private void SpawnCharacterItems(EntityUid character,
         List<EntProtoId> items,
         EntityCoordinates coordinates
     )
     {
-        _inventoryQuery.TryComp(character, out var inventoryComp);
-
-        if (inventoryComp == null)
+        if (!_inventoryQuery.TryComp(character, out var inventoryComp))
+        {
+            Log.Info("6");
             return;
+        }
 
         // ReSharper disable once ForeachCanBePartlyConvertedToQueryUsingAnotherGetEnumerator
         foreach (var item in items)
         {
             var spawnedEntity = Spawn(item, coordinates);
+            var (bestSlot, inside) = GetSlotSpawnable((character, inventoryComp), spawnedEntity);
 
-            if (!InventorySystem.TryGetSlotEntity(character, DefaultItemsSlot, out var storageUid, inventoryComp)
-                || !_storageQuery.TryComp(storageUid, out var storageComponent))
+            if (bestSlot == null
+                && TryComp<HandsComponent>(character, out var handsComponent)
+                && _handsSystem.TryGetEmptyHand((character, handsComponent), out var emptyHand))
+            {
+                _handsSystem.TryPickup(character, spawnedEntity, emptyHand, checkActionBlocker: false, handsComp: handsComponent);
                 continue;
+            }
 
-            _storage.Insert(storageUid.Value,
-                spawnedEntity,
-                out _,
-                storageComp: storageComponent,
-                playSound: false);
+            if (bestSlot == null)
+            {
+                Log.Info("4");
+                continue;
+            }
+
+            if (inside
+                && !InventorySystem.TryGetSlotEntity(character,
+                    bestSlot.Name,
+                    out var slotEnt,
+                    inventoryComponent: inventoryComp)
+                && _storageQuery.TryComp(slotEnt, out var storageComponent)
+                && _storage.Insert(slotEnt.Value, spawnedEntity, out _, storageComp: storageComponent, playSound: false))
+            {
+                continue;
+            }
+
+            InventorySystem.TryEquip(character, spawnedEntity, bestSlot.Name, silent: true, force: true);
+            Log.Info("bitch##&^$&^#$&#");
         }
     }
 
+    private (SlotDefinition?, bool inside) GetSlotSpawnable(Entity<InventoryComponent> character, EntityUid item)
+    {
+        var slotFlags = SlotFlags.All;
+
+        if (TryComp<ClothingComponent>(item, out var clothingComponent))
+        {
+            slotFlags = clothingComponent.Slots;
+        }
+
+        var enumerator = InventorySystem.GetSlotEnumerator(character.Owner, slotFlags);
+
+        while (enumerator.MoveNext(out var slot))
+        {
+            if (!InventorySystem.TryGetSlot(character, slot.ID, out var slotDefinition, character.Comp))
+            {
+                Log.Info("1");
+                continue;
+            }
+
+            if ((slotDefinition.SlotFlags & slotFlags) != 0x0)
+            {
+                return (slotDefinition, false);
+            }
+
+            if (slot.ContainedEntity == null)
+            {
+                Log.Info("2");
+                continue;
+            }
+
+            if (!InventorySystem.TryGetSlotEntity(character,
+                    slotDefinition.Name,
+                    out var slotEnt,
+                    inventoryComponent: character.Comp) ||
+                !_storageQuery.TryComp(slotEnt, out var storageComponent))
+            {
+                Log.Info("3");
+                continue;
+            }
+
+            if (_storage.HasSpace((slotEnt.Value, storageComponent)))
+                return (slotDefinition, true);
+        }
+
+        return (null, false);
+    }
+
     private List<EntProtoId> GetItems(List<EntityLoadoutPrototype> sortedLoadouts)
     {
         var result = new List<EntProtoId>();
@@ -176,20 +246,22 @@ private List<EntProtoId> GetInhand(List<EntityLoadoutPrototype> sortedLoadouts,
         EntityUid character)
     {
         var result = new List<EntProtoId>();
+        var hands = _handsSystem.GetHandCount(character);
+        var inhandItems = 0;
 
         foreach (var loadout in sortedLoadouts)
         {
             foreach (var inhand in loadout.Inhand)
             {
+                inhandItems++;
+
+                if (inhandItems > hands)
+                    break;
+
                 result.Add(inhand);
             }
         }
 
-        var hands = _handsSystem.GetHandCount(character);
-        var length = result.Count - hands;
-
-        result.RemoveRange(hands, length);
-
         return result;
     }
 
diff --git a/Resources/Prototypes/_DEN/Loadouts/Test/loadout_test.yml b/Resources/Prototypes/_DEN/Loadouts/Test/loadout_test.yml
index d99fa036d7c..70af43763ac 100644
--- a/Resources/Prototypes/_DEN/Loadouts/Test/loadout_test.yml
+++ b/Resources/Prototypes/_DEN/Loadouts/Test/loadout_test.yml
@@ -3,4 +3,11 @@
   name: loadout-name-test1
   description: loadout-desc-test
   items:
-  - WeaponSubMachineGunDrozd
\ No newline at end of file
+  - WeaponSubMachineGunDrozd
+
+- type: entityLoadout
+  id: test2
+  name: loadout-name-test2
+  description: loadout-desc-test
+  equipment:
+    back: ClothingBackpackHolding

From 95e69e91f9933ed156801131a0c6c8ab1f861c96 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sat, 4 Jul 2026 11:10:16 -0300
Subject: [PATCH 04/14] FSEDHJBINOUSDHNIFJUBBNJHDKSFGVSDFMB
 NJDFJGHIUNDFSBHUDHFBSGJUKFHJBJBDFGKSFHBDJKRWEDFUDHYUHIFWEYUHIGEFDUYHIASRREGYUHYGURHIFDFRUHYEBHUYDJFJERHUIUHIJFDSEUIHDSF

FUCK INVENTORY CODE
---
 .../SharedStationSpawningSystem.DEN.cs        | 54 +++++++++----------
 1 file changed, 25 insertions(+), 29 deletions(-)

diff --git a/Content.Shared/_DEN/Station/Systems/SharedStationSpawningSystem.DEN.cs b/Content.Shared/_DEN/Station/Systems/SharedStationSpawningSystem.DEN.cs
index 9546174bdc2..5858345fee1 100644
--- a/Content.Shared/_DEN/Station/Systems/SharedStationSpawningSystem.DEN.cs
+++ b/Content.Shared/_DEN/Station/Systems/SharedStationSpawningSystem.DEN.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Clothing.Components;
 using Content.Shared.Hands.Components;
 using Content.Shared.Inventory;
+using Content.Shared.Storage;
 using Robust.Shared.Containers;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
@@ -124,10 +125,7 @@ EntityCoordinates coordinates
     )
     {
         if (!_inventoryQuery.TryComp(character, out var inventoryComp))
-        {
-            Log.Info("6");
             return;
-        }
 
         // ReSharper disable once ForeachCanBePartlyConvertedToQueryUsingAnotherGetEnumerator
         foreach (var item in items)
@@ -135,6 +133,7 @@ EntityCoordinates coordinates
             var spawnedEntity = Spawn(item, coordinates);
             var (bestSlot, inside) = GetSlotSpawnable((character, inventoryComp), spawnedEntity);
 
+            // ReSharper disable once ConvertIfStatementToSwitchStatement
             if (bestSlot == null
                 && TryComp<HandsComponent>(character, out var handsComponent)
                 && _handsSystem.TryGetEmptyHand((character, handsComponent), out var emptyHand))
@@ -144,24 +143,23 @@ EntityCoordinates coordinates
             }
 
             if (bestSlot == null)
-            {
-                Log.Info("4");
                 continue;
-            }
 
+            // ReSharper disable once ConvertIfStatementToSwitchStatement
             if (inside
-                && !InventorySystem.TryGetSlotEntity(character,
+                && InventorySystem.TryGetSlotEntity(character,
                     bestSlot.Name,
                     out var slotEnt,
                     inventoryComponent: inventoryComp)
                 && _storageQuery.TryComp(slotEnt, out var storageComponent)
-                && _storage.Insert(slotEnt.Value, spawnedEntity, out _, storageComp: storageComponent, playSound: false))
+                && _storage.CanInsert(slotEnt.Value, spawnedEntity, out _))
             {
+                _storage.Insert(slotEnt.Value, spawnedEntity, out _, storageComp: storageComponent, playSound: false);
                 continue;
             }
 
-            InventorySystem.TryEquip(character, spawnedEntity, bestSlot.Name, silent: true, force: true);
-            Log.Info("bitch##&^$&^#$&#");
+            if (!inside)
+                InventorySystem.TryEquip(character, spawnedEntity, bestSlot.Name, silent: true, force: true);
         }
     }
 
@@ -179,36 +177,34 @@ EntityCoordinates coordinates
         while (enumerator.MoveNext(out var slot))
         {
             if (!InventorySystem.TryGetSlot(character, slot.ID, out var slotDefinition, character.Comp))
-            {
-                Log.Info("1");
                 continue;
-            }
 
-            if ((slotDefinition.SlotFlags & slotFlags) != 0x0)
-            {
+            if ((slotDefinition.SlotFlags & slotFlags) != 0x0
+                && slot.ContainedEntity == null
+                && InventorySystem.CanEquip(character,
+                    item,
+                    slotDefinition.Name,
+                    out _))
                 return (slotDefinition, false);
-            }
 
             if (slot.ContainedEntity == null)
-            {
-                Log.Info("2");
                 continue;
-            }
 
-            if (!InventorySystem.TryGetSlotEntity(character,
-                    slotDefinition.Name,
-                    out var slotEnt,
-                    inventoryComponent: character.Comp) ||
-                !_storageQuery.TryComp(slotEnt, out var storageComponent))
-            {
-                Log.Info("3");
+            if (!InventorySystem.TryGetSlotContainer(character.Owner,
+                    slot.ID,
+                    out var containerSlot,
+                    out _,
+                    inventory: character.Comp)
+                || containerSlot.ContainedEntity is not { Valid: true } slotEnt)
                 continue;
-            }
 
-            if (_storage.HasSpace((slotEnt.Value, storageComponent)))
+            if (!TryComp<StorageComponent>(slotEnt, out var storageComponent))
+                continue;
+
+            if (_storage.CanInsert(slotEnt, item, out _, storageComponent))
                 return (slotDefinition, true);
         }
-
+;
         return (null, false);
     }
 

From 35e5f1ecdd2a3841752934e57d456e54117690a2 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sun, 5 Jul 2026 00:05:58 -0300
Subject: [PATCH 05/14] database side? hopefully? ill do ui and test it all
 then.

---
 .../Lobby/UI/HumanoidProfileEditor.xaml       |  4 +-
 Content.Server.Database/Model.cs              | 81 +++++++++++++++++
 Content.Server/Database/ServerDbBase.cs       | 58 ++++++++++++
 .../Managers/ServerPreferencesManager.cs      | 52 ++++++++++-
 .../Managers/ServerPreferencesManager.DEN.cs  | 20 +++++
 .../Preferences/HumanoidCharacterProfile.cs   |  6 +-
 Content.Shared/_DEN/Loadout/DenLoadout.cs     | 20 ++++-
 .../Preferences/HumanoidCharacterProfile.cs   | 89 ++++++++++++++++++-
 .../SharedStationSpawningSystem.DEN.cs        | 10 +--
 9 files changed, 324 insertions(+), 16 deletions(-)
 create mode 100644 Content.Server/_DEN/Preferences/Managers/ServerPreferencesManager.DEN.cs

diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml
index e4679d4c84f..36362dd5ff3 100644
--- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml
+++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml
@@ -131,8 +131,8 @@
                     <!-- Markings -->
                     <humanoid:MarkingPicker Name="Markings" HorizontalExpand="True" VerticalExpand="True" />
                 </BoxContainer>
-                <BoxContainer Name="LoadoutTab">
-                    <den:DenLoadoutTab HorizontalExpand="True" VerticalExpand="True" />
+                <BoxContainer Name="LoadoutTab" Orientation="Vertical" Margin="10">
+                    <den:DenLoadoutTab Name="DenLoadouts" HorizontalExpand="True" VerticalExpand="True" />
                 </BoxContainer>
             </TabContainer>
         </BoxContainer>
diff --git a/Content.Server.Database/Model.cs b/Content.Server.Database/Model.cs
index 7b98c0023dc..6b69dde7d82 100644
--- a/Content.Server.Database/Model.cs
+++ b/Content.Server.Database/Model.cs
@@ -87,6 +87,26 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 .HasForeignKey(e => e.ProfileLoadoutGroupId)
                 .IsRequired();
 
+            // DEN Start: Custom Loadout System
+            modelBuilder.Entity<JobLoadout>()
+                .HasOne(e => e.Profile)
+                .WithMany(e => e.JobLoadouts)
+                .HasForeignKey(e => e.ProfileId)
+                .IsRequired();
+
+            modelBuilder.Entity<LoadoutCategory>()
+                .HasOne(e => e.Profile)
+                .WithMany(e => e.LoadoutCategories)
+                .HasForeignKey(e => e.ProfileId)
+                .IsRequired();
+
+            modelBuilder.Entity<LoadoutProfile>()
+                .HasOne(e => e.Category)
+                .WithMany(e => e.Members)
+                .HasForeignKey(e => e.LoadoutCategoryId)
+                .IsRequired();
+            // DEN End
+
             modelBuilder.Entity<Job>()
                 .HasIndex(j => j.ProfileId);
 
@@ -351,6 +371,10 @@ public class Profile
         public List<Antag> Antags { get; } = new();
         public List<Trait> Traits { get; } = new();
 
+        public List<JobLoadout> JobLoadouts { get; } = new();
+
+        public List<LoadoutCategory> LoadoutCategories { get; } = new();
+
         public List<ProfileRoleLoadout> Loadouts { get; } = new();
 
         [Column("pref_unavailable")] public DbPreferenceUnavailableMode PreferenceUnavailable { get; set; }
@@ -475,6 +499,63 @@ public class ProfileLoadout
 
     #endregion
 
+    #region Den Loadouts
+
+    public class LoadoutProfile
+    {
+        public int Id { get; set; }
+
+        public int LoadoutCategoryId {  get; set; }
+
+        public LoadoutCategory Category { get; set; } = null!;
+
+        public Guid LoadoutUniqueId { get; set; }
+
+        [MaxLength(256)]
+        public string LoadoutName { get; set; } = string.Empty;
+
+        public int Priority { get; set; }
+
+        public List<string> LoadoutItems { get; set; } = new();
+    }
+
+    public class JobLoadout
+    {
+        public int Id { get; set; }
+
+        public int ProfileId { get; set; }
+
+        public Profile Profile { get; set; } = null!;
+
+        [MaxLength(256)]
+        public string JobName { get; set; } = string.Empty;
+
+        public List<Guid> LoadoutProfiles { get; set; } = new();
+    }
+
+    public class LoadoutCategory
+    {
+        public int Id { get; set; }
+
+        public int ProfileId { get; set; }
+
+        public Profile Profile { get; set; } = null!;
+
+        public Guid CategoryUniqueId { get; set; }
+
+        public int Priority { get; set; }
+
+        [MaxLength(256)]
+        public string CategoryName { get; set; } = string.Empty;
+
+        [MaxLength(10)]
+        public string CategoryColor { get; set; } = string.Empty;
+
+        public List<LoadoutProfile> Members { get; set; } = new();
+    }
+
+    #endregion
+
     public enum DbPreferenceUnavailableMode
     {
         // These enum values HAVE to match the ones in PreferenceUnavailableMode in Shared.
diff --git a/Content.Server/Database/ServerDbBase.cs b/Content.Server/Database/ServerDbBase.cs
index 2aaa7384a7d..c14be3c4b65 100644
--- a/Content.Server/Database/ServerDbBase.cs
+++ b/Content.Server/Database/ServerDbBase.cs
@@ -51,6 +51,12 @@ public ServerDbBase(ISawmill opsLog, ISerializationManager serialization)
                     .ThenInclude(h => h.Loadouts)
                     .ThenInclude(l => l.Groups)
                     .ThenInclude(group => group.Loadouts)
+                .Include(p => p.Profiles) // DEN
+                    .ThenInclude(c => c.LoadoutCategories) // DEN
+                    .ThenInclude(l => l.Members) // DEN
+                .Include(p => p.Profiles).ThenInclude(j => j.JobLoadouts) // DEN
+                .Include(p => p.Profiles)
+
                 .AsSplitQuery()
                 .SingleOrDefaultAsync(p => p.UserId == userId.UserId, cancel);
         }
@@ -108,6 +114,9 @@ public async Task SaveCharacterSlotAsync(NetUserId userId, HumanoidCharacterProf
                 .Include(p => p.Loadouts)
                     .ThenInclude(l => l.Groups)
                     .ThenInclude(group => group.Loadouts)
+                .Include(c => c.LoadoutCategories) // DEN
+                    .ThenInclude(l => l.Members) // DEN
+                .Include(j => j.JobLoadouts) // DEN
                 .AsSplitQuery()
                 .SingleOrDefault(h => h.Slot == slot);
 
@@ -265,6 +274,7 @@ private Profile ConvertProfiles(HumanoidCharacterProfile humanoid, int slot, Pro
 
             profile.Loadouts.Clear();
 
+            /* DEN
             foreach (var (role, loadouts) in humanoid.Loadouts)
             {
                 var dz = new ProfileRoleLoadout()
@@ -293,6 +303,54 @@ private Profile ConvertProfiles(HumanoidCharacterProfile humanoid, int slot, Pro
 
                 profile.Loadouts.Add(dz);
             }
+            */
+
+            foreach (var (guid, category) in humanoid.LoadoutCategories)
+            {
+                var profiles = new List<LoadoutProfile>();
+
+                foreach (var loadoutProfileId in category.Members)
+                {
+                    if (!humanoid.LoadoutProfiles.TryGetValue(loadoutProfileId, out var loadoutProfile))
+                        continue;
+
+                    var items = loadoutProfile.Loadouts
+                        .Select(i => i.Id)
+                        .ToList();
+
+                    var dbProfile = new LoadoutProfile
+                    {
+                        LoadoutUniqueId = loadoutProfileId,
+                        LoadoutItems = items,
+                        LoadoutName = loadoutProfile.Name,
+                        Priority = loadoutProfile.Priority,
+                    };
+
+                    profiles.Add(dbProfile);
+                }
+
+                var dbCategory = new LoadoutCategory
+                {
+                    CategoryUniqueId = guid,
+                    CategoryColor = category.Color,
+                    CategoryName = category.Name,
+                    Priority = category.Priority,
+                    Members = profiles
+                };
+
+                profile.LoadoutCategories.Add(dbCategory);
+            }
+
+            foreach (var (job, loadoutIds) in humanoid.JobLoadouts)
+            {
+                var jobLoadout = new JobLoadout
+                {
+                    LoadoutProfiles = loadoutIds.ToList(),
+                    JobName = job
+                };
+
+                profile.JobLoadouts.Add(jobLoadout);
+            }
 
             return profile;
         }
diff --git a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
index 8feeb6940f0..cccc09e5b36 100644
--- a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
+++ b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
@@ -4,6 +4,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Content.Server.Database;
+using Content.Shared._DEN.Loadout;
 using Content.Shared._DEN.Traits.Prototypes;
 using Content.Shared.Body;
 using Content.Shared.CCVar;
@@ -145,6 +146,7 @@ internal HumanoidCharacterProfile ConvertProfiles(Profile profile)
                 markings = _marking.ConvertMarkings(markingsList, species);
             }
 
+            /* DEN: Custom Loadout System
             var loadouts = new Dictionary<string, RoleLoadout>();
 
             foreach (var role in profile.Loadouts)
@@ -168,6 +170,52 @@ internal HumanoidCharacterProfile ConvertProfiles(Profile profile)
 
                 loadouts[role.RoleName] = loadout;
             }
+            */
+
+            var jobLoadouts = new Dictionary<ProtoId<JobPrototype>, HashSet<Guid>>();
+            var loadoutCategories = new Dictionary<Guid, DenLoadoutCategory>();
+            var loadoutProfiles = new Dictionary<Guid, DenLoadout>();
+
+            foreach (var loadoutCategory in profile.LoadoutCategories)
+            {
+                var members = loadoutCategory.Members
+                    .Select(l => l.LoadoutUniqueId)
+                    .ToHashSet();
+
+                var category = new DenLoadoutCategory
+                {
+                    Id = loadoutCategory.CategoryUniqueId,
+                    Name = loadoutCategory.CategoryName,
+                    Color = loadoutCategory.CategoryColor,
+                    Members = members,
+                    Priority = loadoutCategory.Priority
+                };
+
+                loadoutCategories[category.Id] = category;
+
+                foreach (var loadoutProfile in loadoutCategory.Members)
+                {
+                    var loadoutItems = loadoutProfile.LoadoutItems.Select(AsLoadoutPrototype).ToHashSet();
+                    var loadout = new DenLoadout
+                    {
+                        Id = loadoutProfile.LoadoutUniqueId,
+                        LoadoutCategory = category.Id,
+                        Name = loadoutProfile.LoadoutName,
+                        Priority = loadoutProfile.Priority,
+                        Loadouts = loadoutItems
+                    };
+
+                    loadoutProfiles[loadoutProfile.LoadoutUniqueId] = loadout;
+                }
+            }
+
+            foreach (var jobLoadout in profile.JobLoadouts)
+            {
+                var profiles = jobLoadout.LoadoutProfiles.ToHashSet();
+                var jobId = AsJobPrototype(jobLoadout.JobName);
+
+                jobLoadouts[jobId] = profiles;
+            }
 
             return new HumanoidCharacterProfile(
                 profile.CharacterName,
@@ -187,7 +235,9 @@ internal HumanoidCharacterProfile ConvertProfiles(Profile profile)
                 (PreferenceUnavailableMode) profile.PreferenceUnavailable,
                 antags.ToHashSet(),
                 traits.ToHashSet(),
-                loadouts
+                loadoutCategories,
+                loadoutProfiles,
+                jobLoadouts
             );
         }
 
diff --git a/Content.Server/_DEN/Preferences/Managers/ServerPreferencesManager.DEN.cs b/Content.Server/_DEN/Preferences/Managers/ServerPreferencesManager.DEN.cs
new file mode 100644
index 00000000000..f77180621b8
--- /dev/null
+++ b/Content.Server/_DEN/Preferences/Managers/ServerPreferencesManager.DEN.cs
@@ -0,0 +1,20 @@
+using System.Linq;
+using Content.Server.Database;
+using Content.Shared._DEN.Loadout;
+using Content.Shared.Roles;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Preferences.Managers;
+
+public sealed partial class ServerPreferencesManager
+{
+    private ProtoId<EntityLoadoutPrototype> AsLoadoutPrototype(string protoId)
+    {
+        return protoId;
+    }
+
+    public ProtoId<JobPrototype> AsJobPrototype(string protoId)
+    {
+        return protoId;
+    }
+}
diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
index 6017de228d3..623d1bba4e3 100644
--- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs
+++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
@@ -1,6 +1,7 @@
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
+using Content.Shared._DEN.Loadout;
 using Content.Shared.CCVar;
 using Content.Shared.GameTicking;
 using Content.Shared.Humanoid;
@@ -187,7 +188,10 @@ public HumanoidCharacterProfile(HumanoidCharacterProfile other)
                 new HashSet<ProtoId<AntagPrototype>>(other.AntagPreferences),
                 // new HashSet<ProtoId<TraitPrototype>>(other.TraitPreferences), // DEN
                 new HashSet<ProtoId<EntityTraitPrototype>>(other.EntityTraitPreferences), // DEN
-                new Dictionary<string, RoleLoadout>(other.Loadouts))
+                // new Dictionary<string, RoleLoadout>(other.Loadouts), // DEN
+                new Dictionary<Guid, DenLoadoutCategory>(other.LoadoutCategories),
+                new Dictionary<Guid, DenLoadout>(other.LoadoutProfiles), // DEN
+                new Dictionary<ProtoId<JobPrototype>, HashSet<Guid>>(other.JobLoadouts)) // DEN
         {
         }
 
diff --git a/Content.Shared/_DEN/Loadout/DenLoadout.cs b/Content.Shared/_DEN/Loadout/DenLoadout.cs
index 540a563e158..4fa5664b907 100644
--- a/Content.Shared/_DEN/Loadout/DenLoadout.cs
+++ b/Content.Shared/_DEN/Loadout/DenLoadout.cs
@@ -1,5 +1,3 @@
-using Content.Shared.Preferences.Loadouts;
-using Content.Shared.Roles;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 
@@ -10,15 +8,29 @@ public record struct DenLoadout
 {
     public Guid Id;
     public int Priority;
+    public string Name;
+    public Guid LoadoutCategory;
 
-    public Dictionary<Guid, ProtoId<LoadoutPrototype>> Loadouts;
-    public Dictionary<Guid, DenCustomLoadoutInfo> CustomLoadouts;
+    public HashSet<ProtoId<EntityLoadoutPrototype>> Loadouts;
+    //public Dictionary<Guid, HashSet<DenCustomLoadoutInfo>> CustomLoadouts;
 }
 
 [Serializable, NetSerializable]
 public record struct DenCustomLoadoutInfo
 {
+    public EntProtoId EntProtoId;
+
     public string? CustomName;
     public string? CustomDescription;
     public string? CustomColor;
 }
+
+[Serializable, NetSerializable]
+public record struct DenLoadoutCategory
+{
+    public Guid Id;
+    public int Priority;
+    public string Name;
+    public string Color;
+    public HashSet<Guid> Members;
+}
diff --git a/Content.Shared/_DEN/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/_DEN/Preferences/HumanoidCharacterProfile.cs
index 03b81f72747..b4d3e17fd13 100644
--- a/Content.Shared/_DEN/Preferences/HumanoidCharacterProfile.cs
+++ b/Content.Shared/_DEN/Preferences/HumanoidCharacterProfile.cs
@@ -1,3 +1,4 @@
+using Content.Shared._DEN.Loadout;
 using Content.Shared._DEN.Traits.Prototypes;
 using Content.Shared.Humanoid;
 using Content.Shared.Preferences.Loadouts;
@@ -20,6 +21,21 @@ public sealed partial class HumanoidCharacterProfile
     /// </summary>
     public IReadOnlySet<ProtoId<EntityTraitPrototype>> EntityTraitPreferences => _entityTraitPreferences;
 
+    [DataField("_loadoutCategories")]
+    private Dictionary<Guid, DenLoadoutCategory> _loadoutCategories = new();
+
+    public IReadOnlyDictionary<Guid, DenLoadoutCategory> LoadoutCategories => _loadoutCategories;
+
+    [DataField("_loadoutProfiles")]
+    private Dictionary<Guid, DenLoadout> _loadoutProfiles = new();
+
+    public IReadOnlyDictionary<Guid, DenLoadout> LoadoutProfiles => _loadoutProfiles;
+
+    [DataField("_jobLoadouts")]
+    private Dictionary<ProtoId<JobPrototype>, HashSet<Guid>> _jobLoadouts = new();
+
+    public IReadOnlyDictionary<ProtoId<JobPrototype>, HashSet<Guid>> JobLoadouts => _jobLoadouts;
+
     public HumanoidCharacterProfile(
         string name,
         string flavortext,
@@ -33,7 +49,10 @@ public HumanoidCharacterProfile(
         PreferenceUnavailableMode preferenceUnavailable,
         HashSet<ProtoId<AntagPrototype>> antagPreferences,
         HashSet<ProtoId<EntityTraitPrototype>> entityTraitPreferences,
-        Dictionary<string, RoleLoadout> loadouts)
+        // Dictionary<string, RoleLoadout> loadouts, - DEN
+        Dictionary<Guid, DenLoadoutCategory> loadoutCategories,
+        Dictionary<Guid, DenLoadout> loadoutProfiles,
+        Dictionary<ProtoId<JobPrototype>, HashSet<Guid>> jobLoadouts)
     {
         Name = name;
         FlavorText = flavortext;
@@ -47,7 +66,10 @@ public HumanoidCharacterProfile(
         PreferenceUnavailable = preferenceUnavailable;
         _antagPreferences = antagPreferences;
         _entityTraitPreferences = entityTraitPreferences; // DEN
-        _loadouts = loadouts;
+        // _loadouts = loadouts; - DEN
+        _loadoutCategories = loadoutCategories;
+        _loadoutProfiles = loadoutProfiles; // DEN
+        _jobLoadouts = jobLoadouts; // DEN
 
         var hasHighPrority = false;
         foreach (var (key, value) in _jobPriorities)
@@ -119,6 +141,69 @@ public HumanoidCharacterProfile WithoutEntityTraitPreference(ProtoId<EntityTrait
         };
     }
 
+    public HumanoidCharacterProfile WithLoadoutProfile(Guid loadoutId, DenLoadout loadout)
+    {
+        var profiles = new Dictionary<Guid, DenLoadout>(_loadoutProfiles);
+        profiles[loadoutId] = loadout;
+
+        return new(this)
+        {
+            _loadoutProfiles = profiles
+        };
+    }
+
+    public HumanoidCharacterProfile WithLoadoutCategory(Guid categoryId, DenLoadoutCategory category)
+    {
+        var categories = new Dictionary<Guid, DenLoadoutCategory>(_loadoutCategories);
+        categories[categoryId] = category;
+
+        return new(this)
+        {
+            _loadoutCategories = categories
+        };
+    }
+
+    public HumanoidCharacterProfile WithJobLoadout(ProtoId<JobPrototype> jobId, Guid loadoutId)
+    {
+        var jobLoadouts = new Dictionary<ProtoId<JobPrototype>, HashSet<Guid>>(_jobLoadouts);
+
+        if (!jobLoadouts.ContainsKey(jobId))
+            jobLoadouts.Add(jobId, new());
+
+        jobLoadouts[jobId].Add(loadoutId);
+
+        return new(this)
+        {
+            _jobLoadouts = jobLoadouts
+        };
+    }
+
+    public HumanoidCharacterProfile WithoutJobLoadout(ProtoId<JobPrototype> jobId, Guid loadoutId)
+    {
+        var jobLoadouts = new Dictionary<ProtoId<JobPrototype>, HashSet<Guid>>(_jobLoadouts);
+
+        if (!jobLoadouts.ContainsKey(jobId))
+            return this;
+
+        jobLoadouts[jobId].Remove(loadoutId);
+
+        return new(this)
+        {
+            _jobLoadouts = jobLoadouts
+        };
+    }
+
+    public HumanoidCharacterProfile WithJobLoadouts(ProtoId<JobPrototype> jobId, HashSet<Guid> loadoutIds)
+    {
+        var jobLoadouts = new Dictionary<ProtoId<JobPrototype>, HashSet<Guid>>(_jobLoadouts);
+        jobLoadouts[jobId] = new HashSet<Guid>(loadoutIds);
+
+        return new(this)
+        {
+            _jobLoadouts = jobLoadouts
+        };
+    }
+
     /// <summary>
     /// Takes in an IEnumerable of traits and returns a List of the valid traits.
     /// </summary>
diff --git a/Content.Shared/_DEN/Station/Systems/SharedStationSpawningSystem.DEN.cs b/Content.Shared/_DEN/Station/Systems/SharedStationSpawningSystem.DEN.cs
index 5858345fee1..61328f6dc6a 100644
--- a/Content.Shared/_DEN/Station/Systems/SharedStationSpawningSystem.DEN.cs
+++ b/Content.Shared/_DEN/Station/Systems/SharedStationSpawningSystem.DEN.cs
@@ -11,8 +11,6 @@ namespace Content.Shared.Station;
 
 public abstract partial class SharedStationSpawningSystem
 {
-    private const string DefaultItemsSlot = "back";
-
     public void SpawnCharacterLoadout(HashSet<ProtoId<EntityLoadoutPrototype>> loadouts,
         EntityUid character,
         EntityCoordinates coordinates)
@@ -60,7 +58,7 @@ EntityCoordinates coordinates
                 || string.IsNullOrEmpty(equipmentId))
                 continue;
 
-            var equipmentEntity = Spawn(equipmentId, coordinates);
+            var equipmentEntity = PredictedSpawnAtPosition(equipmentId, coordinates);
             InventorySystem.TryEquip(character, equipmentEntity, slot.Name, silent: true, force: true);
         }
     }
@@ -78,7 +76,7 @@ EntityCoordinates coordinates
         // ReSharper disable once ForeachCanBePartlyConvertedToQueryUsingAnotherGetEnumerator
         foreach (var prototype in inhand)
         {
-            var inhandEntity = Spawn(prototype, coords);
+            var inhandEntity = PredictedSpawnAtPosition(prototype, coords);
 
             if (_handsSystem.TryGetEmptyHand((character, handsComponent), out var emptyHand))
             {
@@ -113,7 +111,7 @@ EntityCoordinates coordinates
             // ReSharper disable once ForeachCanBePartlyConvertedToQueryUsingAnotherGetEnumerator
             foreach (var entProto in entProtos)
             {
-                var spawnedEntity = Spawn(entProto, coordinates);
+                var spawnedEntity = PredictedSpawnAtPosition(entProto, coordinates);
                 _storage.Insert(slotEnt.Value, spawnedEntity, out _, storageComp: storageComponent, playSound: false);
             }
         }
@@ -130,7 +128,7 @@ EntityCoordinates coordinates
         // ReSharper disable once ForeachCanBePartlyConvertedToQueryUsingAnotherGetEnumerator
         foreach (var item in items)
         {
-            var spawnedEntity = Spawn(item, coordinates);
+            var spawnedEntity = PredictedSpawnAtPosition(item, coordinates);
             var (bestSlot, inside) = GetSlotSpawnable((character, inventoryComp), spawnedEntity);
 
             // ReSharper disable once ConvertIfStatementToSwitchStatement

From fdce92101cc5c666c6312cca7be740460cb14bc2 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Mon, 6 Jul 2026 14:04:51 -0300
Subject: [PATCH 06/14] UI work...

---
 .../Lobby/UI/HumanoidProfileEditor.xaml.cs    |    7 +
 .../_DEN/Lobby/UI/CreateCategoryPopup.xaml    |   31 +
 .../_DEN/Lobby/UI/CreateCategoryPopup.xaml.cs |   35 +
 .../_DEN/Lobby/UI/CreateLoadoutPopup.xaml     |   29 +
 .../_DEN/Lobby/UI/CreateLoadoutPopup.xaml.cs  |   52 +
 .../_DEN/Lobby/UI/DenCategoryContainer.xaml   |   72 +-
 .../Lobby/UI/DenCategoryContainer.xaml.cs     |   17 +-
 .../_DEN/Lobby/UI/DenLoadoutButtons.xaml      |    9 +-
 .../_DEN/Lobby/UI/DenLoadoutTab.xaml          |   68 +-
 .../_DEN/Lobby/UI/DenLoadoutTab.xaml.cs       |  121 +
 .../UI/HumanoidProfileEditor.Loadouts.cs      |   16 +
 .../20260706120346_DenLoadouts.Designer.cs    | 2318 +++++++++++++++++
 .../Postgres/20260706120346_DenLoadouts.cs    |  112 +
 .../PostgresServerDbContextModelSnapshot.cs   |  158 ++
 .../20260706120333_DenLoadouts.Designer.cs    | 2229 ++++++++++++++++
 .../Sqlite/20260706120333_DenLoadouts.cs      |  110 +
 .../SqliteServerDbContextModelSnapshot.cs     |  152 ++
 .../Preferences/HumanoidCharacterProfile.cs   |   10 +-
 .../Preferences/HumanoidCharacterProfile.cs   |   50 +-
 19 files changed, 5555 insertions(+), 41 deletions(-)
 create mode 100644 Content.Client/_DEN/Lobby/UI/CreateCategoryPopup.xaml
 create mode 100644 Content.Client/_DEN/Lobby/UI/CreateCategoryPopup.xaml.cs
 create mode 100644 Content.Client/_DEN/Lobby/UI/CreateLoadoutPopup.xaml
 create mode 100644 Content.Client/_DEN/Lobby/UI/CreateLoadoutPopup.xaml.cs
 create mode 100644 Content.Client/_DEN/Lobby/UI/HumanoidProfileEditor.Loadouts.cs
 create mode 100644 Content.Server.Database/Migrations/Postgres/20260706120346_DenLoadouts.Designer.cs
 create mode 100644 Content.Server.Database/Migrations/Postgres/20260706120346_DenLoadouts.cs
 create mode 100644 Content.Server.Database/Migrations/Sqlite/20260706120333_DenLoadouts.Designer.cs
 create mode 100644 Content.Server.Database/Migrations/Sqlite/20260706120333_DenLoadouts.cs

diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
index 3b444bf4162..87f1fd99edf 100644
--- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
@@ -286,6 +286,13 @@ public HumanoidProfileEditor(
 
             #endregion Markings
 
+            #region Den Loadouts
+
+            TabContainer.SetTabTitle(5, "Loadouts"); // TODO: localize
+            RefreshDenLoadouts();
+
+            #endregion
+
             RefreshFlavorText();
 
             #region Dummy
diff --git a/Content.Client/_DEN/Lobby/UI/CreateCategoryPopup.xaml b/Content.Client/_DEN/Lobby/UI/CreateCategoryPopup.xaml
new file mode 100644
index 00000000000..31441ce4c4f
--- /dev/null
+++ b/Content.Client/_DEN/Lobby/UI/CreateCategoryPopup.xaml
@@ -0,0 +1,31 @@
+<controls:FancyWindow xmlns="https://spacestation14.io"
+              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+              xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+              SetSize="350 335"
+              Title="Create Category">
+    <BoxContainer HorizontalExpand="True"
+                  VerticalExpand="True"
+                  Orientation="Vertical"
+                  Margin="10 10 10 0">
+        <BoxContainer Orientation="Vertical" Margin="2">
+            <Label HorizontalExpand="True" Text="Category name:" />
+            <LineEdit Name="CategoryNameEdit"
+                      HorizontalExpand="True"
+                      PlaceHolder="My Loadout Category" />
+        </BoxContainer>
+        <BoxContainer Orientation="Vertical" Margin="0 5 0 0">
+            <Label Margin="2"
+                   HorizontalExpand="True"
+                   Text="Category color:" />
+            <ColorSelectorSliders Name="CategoryColorPicker"
+                                  Margin="2"
+                                  HorizontalExpand="True"/>
+        </BoxContainer>
+
+        <Button Name="ButtonSubmit"
+                VerticalAlignment="Center"
+                SetSize="120 35"
+                Margin="7"
+                Text="Submit"/>
+    </BoxContainer>
+</controls:FancyWindow>
diff --git a/Content.Client/_DEN/Lobby/UI/CreateCategoryPopup.xaml.cs b/Content.Client/_DEN/Lobby/UI/CreateCategoryPopup.xaml.cs
new file mode 100644
index 00000000000..c61ecd188fd
--- /dev/null
+++ b/Content.Client/_DEN/Lobby/UI/CreateCategoryPopup.xaml.cs
@@ -0,0 +1,35 @@
+using Content.Client.UserInterface.Controls;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client._DEN.Lobby.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class CreateCategoryPopup : FancyWindow
+{
+    public event Action<CategoryCreationRequest>? OnSubmit;
+
+    public CreateCategoryPopup()
+    {
+        RobustXamlLoader.Load(this);
+
+        ButtonSubmit.OnPressed += _ => OnSubmitPressed();
+    }
+
+    private void OnSubmitPressed()
+    {
+        var request = new CategoryCreationRequest
+        {
+            CategoryName = CategoryNameEdit.Text,
+            CategoryColor = CategoryColorPicker.Color
+        };
+
+        OnSubmit?.Invoke(request);
+    }
+}
+
+public record struct CategoryCreationRequest
+{
+    public string CategoryName { get; set; }
+    public Color CategoryColor { get; set; }
+}
diff --git a/Content.Client/_DEN/Lobby/UI/CreateLoadoutPopup.xaml b/Content.Client/_DEN/Lobby/UI/CreateLoadoutPopup.xaml
new file mode 100644
index 00000000000..d9b6b729c1d
--- /dev/null
+++ b/Content.Client/_DEN/Lobby/UI/CreateLoadoutPopup.xaml
@@ -0,0 +1,29 @@
+<controls:FancyWindow xmlns="https://spacestation14.io"
+              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+              xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+              SetSize="350 335"
+              Title="Create Category">
+    <BoxContainer HorizontalExpand="True"
+                  VerticalExpand="True"
+                  Orientation="Vertical"
+                  Margin="10 10 10 0">
+        <BoxContainer Orientation="Vertical" Margin="2">
+            <Label HorizontalExpand="True" Text="Category name:" />
+            <LineEdit Name="LoadoutNameEdit"
+                      HorizontalExpand="True"
+                      PlaceHolder="My Loadout" />
+        </BoxContainer>
+        <BoxContainer Orientation="Vertical" Margin="0 5 0 0">
+            <Label Margin="2"
+                   HorizontalExpand="True"
+                   Text="Category:" />
+            <OptionButton Name="OptionsCategories" />
+        </BoxContainer>
+
+        <Button Name="ButtonSubmit"
+                VerticalAlignment="Center"
+                SetSize="120 35"
+                Margin="7"
+                Text="Submit"/>
+    </BoxContainer>
+</controls:FancyWindow>
diff --git a/Content.Client/_DEN/Lobby/UI/CreateLoadoutPopup.xaml.cs b/Content.Client/_DEN/Lobby/UI/CreateLoadoutPopup.xaml.cs
new file mode 100644
index 00000000000..15434a6954b
--- /dev/null
+++ b/Content.Client/_DEN/Lobby/UI/CreateLoadoutPopup.xaml.cs
@@ -0,0 +1,52 @@
+using Content.Client.UserInterface.Controls;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client._DEN.Lobby.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class CreateLoadoutPopup : FancyWindow
+{
+    public event Action<LoadoutCreationRequest>? OnSubmit;
+
+    private List<(Guid CategoryId, string CategoryName)> _categories;
+
+    public CreateLoadoutPopup(List<(Guid CategoryId, string CategoryName)> categories)
+    {
+        RobustXamlLoader.Load(this);
+
+        _categories = categories;
+
+        var index = -1;
+
+        foreach (var category in categories)
+        {
+            OptionsCategories.AddItem(category.CategoryName, index++);
+        }
+
+        ButtonSubmit.OnPressed += _ => OnSubmitPressed();
+    }
+
+    private void OnSubmitPressed()
+    {
+        var categorySelected = OptionsCategories.SelectedId;
+
+        if (categorySelected >= _categories.Count)
+            return;
+
+        var category = _categories[categorySelected];
+        var request = new LoadoutCreationRequest
+        {
+            LoadoutName = LoadoutNameEdit.Text,
+            CategoryId = category.CategoryId
+        };
+
+        OnSubmit?.Invoke(request);
+    }
+}
+
+public record struct LoadoutCreationRequest
+{
+    public string LoadoutName { get; set; }
+    public Guid CategoryId { get; set; }
+}
diff --git a/Content.Client/_DEN/Lobby/UI/DenCategoryContainer.xaml b/Content.Client/_DEN/Lobby/UI/DenCategoryContainer.xaml
index df667dc310c..3c0c5b4ff40 100644
--- a/Content.Client/_DEN/Lobby/UI/DenCategoryContainer.xaml
+++ b/Content.Client/_DEN/Lobby/UI/DenCategoryContainer.xaml
@@ -1,13 +1,65 @@
 <ui:DenCategoryContainer xmlns="https://spacestation14.io"
                          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                         xmlns:ui="clr-namespace:Content.Client._DEN.Lobby.UI">
-    <PanelContainer StyleClasses="LoadoutBackground"
-                    HorizontalExpand="True">
-        <BoxContainer VerticalAlignment="Center"
-                      Orientation="Horizontal"
-                      SeparationOverride="4"
-                      Margin="5 5">
-
-        </BoxContainer>
-    </PanelContainer>
+                         xmlns:ui="clr-namespace:Content.Client._DEN.Lobby.UI"
+                         xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client">
+    <BoxContainer Orientation="Vertical"
+                  HorizontalExpand="True"
+                  Margin="0 0 0 8">
+        <PanelContainer Name="HeaderPanel" StyleClasses="TraitsCategoryHeader">
+            <Button Name="HeaderButton"
+                    StyleClasses="TraitsCategoryHeaderButton"
+                    HorizontalExpand="True"
+                    SetHeight="45">
+                <BoxContainer Orientation="Horizontal" Margin="8 6">
+                    <Label Name="CategoryNameLabel"
+                           Text="A Loadout"
+                           StyleClasses="TraitsCategoryNameLabel"
+                           Margin="5 0 0 0"/>
+
+                    <Control HorizontalExpand="True"/>
+
+                    <BoxContainer Name="WarningContainer"
+                                  Visible="False">
+                        <TextureButton TexturePath="/Textures/Interface/VerbIcons/examine.svg.192dpi.png"
+                                       SetSize="32 32"
+                                       Modulate="#c7c7c7" />
+
+                        <Label Name="CategoryStatsLabel"
+                               Text="1 warning"
+                               StyleClasses="TraitsCategoryStatsLabel"
+                               Margin="0 0 4 0"/>
+                    </BoxContainer>
+
+                    <Label Name="ExpandIcon"
+                           Text="▶"
+                           StyleClasses="TraitsCategoryExpandIcon"
+                           Margin="8 0 8 0"/>
+                </BoxContainer>
+            </Button>
+        </PanelContainer>
+
+        <!-- Accent Bar -->
+        <PanelContainer Name="AccentBar"
+                        StyleClasses="TraitsCategoryAccent"
+                        SetHeight="3"
+                        Margin="0 0 0 0"/>
+
+        <!-- Traits Container -->
+        <PanelContainer Name="ContentPanel"
+                        StyleClasses="TraitsCategoryContent"
+                        Visible="False"
+                        Margin="2 2">
+            <PanelContainer.PanelOverride>
+                <graphics:StyleBoxFlat BackgroundColor="#2f2f3b"/>
+            </PanelContainer.PanelOverride>
+            <BoxContainer Name="LoadoutContainer"
+                          Orientation="Vertical"
+                          HorizontalExpand="True"
+                          Margin="8 8">
+                <!-- <ui:DenLoadoutButtons /> -->
+            </BoxContainer>
+        </PanelContainer>
+    </BoxContainer>
+
+
 </ui:DenCategoryContainer>
diff --git a/Content.Client/_DEN/Lobby/UI/DenCategoryContainer.xaml.cs b/Content.Client/_DEN/Lobby/UI/DenCategoryContainer.xaml.cs
index f83b467f245..5895849ae85 100644
--- a/Content.Client/_DEN/Lobby/UI/DenCategoryContainer.xaml.cs
+++ b/Content.Client/_DEN/Lobby/UI/DenCategoryContainer.xaml.cs
@@ -5,12 +5,27 @@
 namespace Content.Client._DEN.Lobby.UI;
 
 [GenerateTypedNameReferences]
-public sealed partial class DenCategoryContainer : ContainerButton
+public sealed partial class DenCategoryContainer : PanelContainer
 {
+    private bool _isExpanded;
+
     public DenCategoryContainer()
     {
         RobustXamlLoader.Load(this);
 
+        HeaderButton.OnPressed += _ => ToggleExpanded();
+        UpdateExpandedState();
+    }
+
+    private void ToggleExpanded()
+    {
+        _isExpanded = !_isExpanded;
+        UpdateExpandedState();
+    }
 
+    private void UpdateExpandedState()
+    {
+        LoadoutContainer.Visible = _isExpanded;
+        ExpandIcon.Text = _isExpanded ? "▼" : "▶";
     }
 }
diff --git a/Content.Client/_DEN/Lobby/UI/DenLoadoutButtons.xaml b/Content.Client/_DEN/Lobby/UI/DenLoadoutButtons.xaml
index 94e01dcf85a..2ea9e161c87 100644
--- a/Content.Client/_DEN/Lobby/UI/DenLoadoutButtons.xaml
+++ b/Content.Client/_DEN/Lobby/UI/DenLoadoutButtons.xaml
@@ -1,8 +1,11 @@
 <ui:DenLoadoutButtons xmlns="https://spacestation14.io"
               xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-              xmlns:ui="clr-namespace:Content.Client._DEN.Lobby.UI">
-    <PanelContainer StyleClasses="ChatPanel"
-                    HorizontalExpand="True">
+              xmlns:ui="clr-namespace:Content.Client._DEN.Lobby.UI"
+              xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client">
+    <PanelContainer HorizontalExpand="True">
+        <PanelContainer.PanelOverride>
+            <graphics:StyleBoxFlat BackgroundColor="#2a2a35"/>
+        </PanelContainer.PanelOverride>
         <BoxContainer VerticalAlignment="Center"
                       Orientation="Horizontal"
                       Margin="5">
diff --git a/Content.Client/_DEN/Lobby/UI/DenLoadoutTab.xaml b/Content.Client/_DEN/Lobby/UI/DenLoadoutTab.xaml
index cece372781f..866cf50c72e 100644
--- a/Content.Client/_DEN/Lobby/UI/DenLoadoutTab.xaml
+++ b/Content.Client/_DEN/Lobby/UI/DenLoadoutTab.xaml
@@ -1,20 +1,60 @@
-<ContainerButton xmlns="https://spacestation14.io"
-         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-         xmlns:ui="clr-namespace:Content.Client._DEN.Lobby.UI">
+<ui:DenLoadoutTab xmlns="https://spacestation14.io"
+                  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                  xmlns:ui="clr-namespace:Content.Client._DEN.Lobby.UI"
+                  xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client">
     <BoxContainer Orientation="Vertical"
-                  HorizontalExpand="True"
-                  VerticalExpand="True">
+                  SeparationOverride="0">
+        <PanelContainer SetHeight="50"
+                        HorizontalExpand="True"
+                        StyleClasses="ChatPanel">
+            <BoxContainer Margin="5 0 5 0">
+                <Label Text="Loadouts"
+                       Margin="15 0 0 0"
+                       StyleClasses="LabelHeading" />
+                <Control HorizontalExpand="True"></Control>
+                <Button Name="ButtonCreateCategory"
+                        Text="Create New Category"
+                        SetHeight="35"
+                        StyleClasses="OpenRight" />
+                <Button Name="ButtonCreateLoadout"
+                        Text="Create New Loadout"
+                        SetHeight="35"
+                        StyleClasses="OpenLeft" />
+            </BoxContainer>
+        </PanelContainer>
+        <PanelContainer Name="WarningsContainer"
+                        SetHeight="50"
+                        HorizontalExpand="True"
+                        StyleClasses="ChatPanel"
+                        Margin="0 5 0 0"
+                        Visible="False">
+            <BoxContainer Margin="5 0 5 0">
+                <RichTextLabel Name="WarningsText" Text="You have [color=#ffa21f]2[/color] unresolved loadout issues. "  Margin="15 0 0 0" />
+                <Control HorizontalExpand="True"></Control>
+                <Button Name="ButtonViewWarnings"
+                        Text="View Warnings"
+                        SetHeight="35" />
+            </BoxContainer>
+        </PanelContainer>
+        <PanelContainer SetHeight="3" HorizontalExpand="True" Margin="0 10 0 6">
+            <PanelContainer.PanelOverride>
+                <gfx:StyleBoxFlat BackgroundColor="#393947" />
+            </PanelContainer.PanelOverride>
+        </PanelContainer>
         <BoxContainer HorizontalExpand="True"
                       VerticalExpand="True"
                       Orientation="Vertical"
-                      SeparationOverride="5"
-                      Margin="5">
-            <ui:DenLoadoutButtons HorizontalExpand="True" />
-            <ui:DenLoadoutButtons HorizontalExpand="True" />
-            <ui:DenLoadoutButtons HorizontalExpand="True" />
-            <ui:DenLoadoutButtons HorizontalExpand="True" />
-            <ui:DenLoadoutButtons HorizontalExpand="True" />
-            <ui:DenLoadoutButtons HorizontalExpand="True" />
+                      Margin="0 5 0 0">
+            <PanelContainer HorizontalExpand="True"
+                            VerticalExpand="True">
+                <PanelContainer.PanelOverride>
+                    <gfx:StyleBoxFlat BorderColor="#1F1F23" BorderThickness="1" />
+                </PanelContainer.PanelOverride>
+                <BoxContainer Name="LoadoutContainer"
+                              Orientation="Vertical">
+                    <!-- <ui:DenCategoryContainer /> -->
+                </BoxContainer>
+            </PanelContainer>
         </BoxContainer>
     </BoxContainer>
-</ContainerButton>
+</ui:DenLoadoutTab>
diff --git a/Content.Client/_DEN/Lobby/UI/DenLoadoutTab.xaml.cs b/Content.Client/_DEN/Lobby/UI/DenLoadoutTab.xaml.cs
index 28c0aec43cf..07036dda619 100644
--- a/Content.Client/_DEN/Lobby/UI/DenLoadoutTab.xaml.cs
+++ b/Content.Client/_DEN/Lobby/UI/DenLoadoutTab.xaml.cs
@@ -1,16 +1,137 @@
+using System.Linq;
+using Content.Shared._DEN.Loadout;
+using Content.Shared.Preferences;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Utility;
 
 namespace Content.Client._DEN.Lobby.UI;
 
 [GenerateTypedNameReferences]
 public sealed partial class DenLoadoutTab : ContainerButton
 {
+    public event Action<HumanoidCharacterProfile?>? OnPreferenceUpdated;
+
+    private CreateCategoryPopup? _createCategoryPopup;
+    private CreateLoadoutPopup? _createLoadoutPopup;
+    private HumanoidCharacterProfile? _profile;
+
+    private List<(Guid CategoryId, string CategoryName)> _categories;
 
     public DenLoadoutTab()
     {
         RobustXamlLoader.Load(this);
 
+        _categories = new();
+        RefreshCategories();
+
+        ButtonCreateCategory.OnPressed += _ => OnTryCreateCategory();
+        ButtonCreateLoadout.OnPressed += _ => OnTryCreateLoadout();
+    }
+
+    public void RefreshCategories()
+    {
+        _categories.Clear();
+
+        if (_profile?.LoadoutCategories == null)
+            return;
+
+        foreach (var (categoryId, category) in _profile.LoadoutCategories)
+        {
+            _categories.Add((categoryId, category.Name));
+        }
+    }
+
+    public void SetProfile(HumanoidCharacterProfile? newProfile)
+    {
+        _profile = newProfile;
+    }
+
+    private void OnTryCreateCategory()
+    {
+        if (_createCategoryPopup != null)
+            return;
+
+        _createCategoryPopup = new CreateCategoryPopup();
+        _createCategoryPopup.OnSubmit += OnSubmitNewCategory;
+        _createCategoryPopup.OnClose += OnClose;
+        _createCategoryPopup.OpenCentered();
+    }
+
+    private void OnSubmitNewCategory(CategoryCreationRequest request)
+    {
+        var guid = Guid.NewGuid();
+        var category = new DenLoadoutCategory
+        {
+            Id = guid,
+            Color = request.CategoryColor.ToHex(),
+            Name = request.CategoryName,
+            Priority = GetNextCategoryPriority()
+        };
+
+        _profile = _profile?.WithLoadoutCategory(guid, category);
+        OnPreferenceUpdated?.Invoke(_profile);
+
+        RefreshCategories();
+        OnClose();
+    }
+
+    private void OnTryCreateLoadout()
+    {
+        if (_createLoadoutPopup != null)
+            return;
+
+        _createLoadoutPopup = new CreateLoadoutPopup(_categories);
+        _createLoadoutPopup.OnSubmit += OnSubmitNewLoadout;
+        _createLoadoutPopup.OnClose += OnClose;
+        _createLoadoutPopup.OpenCentered();
+    }
+
+    private void OnSubmitNewLoadout(LoadoutCreationRequest request)
+    {
+        var guid = Guid.NewGuid();
+        var loadout = new DenLoadout
+        {
+            Id = guid,
+            Name = request.LoadoutName,
+            LoadoutCategory = request.CategoryId,
+            Priority = GetNextLoadoutPriority(request.CategoryId)
+        };
+
+        _profile = _profile?.WithNewLoadout(guid, request.CategoryId, loadout);
+        OnPreferenceUpdated?.Invoke(_profile);
+
+        RefreshCategories();
+        OnClose();
+    }
+
+    private int GetNextCategoryPriority()
+    {
+        if (_profile == null)
+            return 0;
+
+        var loadoutCategoryCount = _profile.LoadoutCategories.Count;
+        return loadoutCategoryCount + 1;
+    }
+
+    private int GetNextLoadoutPriority(Guid categoryId)
+    {
+        if (_profile == null)
+            return 0;
+
+        var category = _profile.LoadoutCategories.Values.FirstOrNull(c => c.Id == categoryId);
+
+        if (category == null)
+            return 0;
+
+        var memberCount = category.Value.Members.Count;
+        return memberCount + 1;
+    }
+
+    private void OnClose()
+    {
+        _createCategoryPopup?.Orphan();
+        _createCategoryPopup = null;
     }
 }
diff --git a/Content.Client/_DEN/Lobby/UI/HumanoidProfileEditor.Loadouts.cs b/Content.Client/_DEN/Lobby/UI/HumanoidProfileEditor.Loadouts.cs
new file mode 100644
index 00000000000..0491ae27b52
--- /dev/null
+++ b/Content.Client/_DEN/Lobby/UI/HumanoidProfileEditor.Loadouts.cs
@@ -0,0 +1,16 @@
+namespace Content.Client.Lobby.UI;
+
+public sealed partial class HumanoidProfileEditor
+{
+    private void RefreshDenLoadouts()
+    {
+        DenLoadouts.OnPreferenceUpdated += profile =>
+        {
+            Profile = profile;
+            SetDirty();
+            RefreshDenLoadouts();
+        };
+
+        DenLoadouts.SetProfile(Profile);
+    }
+}
diff --git a/Content.Server.Database/Migrations/Postgres/20260706120346_DenLoadouts.Designer.cs b/Content.Server.Database/Migrations/Postgres/20260706120346_DenLoadouts.Designer.cs
new file mode 100644
index 00000000000..ce3fcab750a
--- /dev/null
+++ b/Content.Server.Database/Migrations/Postgres/20260706120346_DenLoadouts.Designer.cs
@@ -0,0 +1,2318 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+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("20260706120346_DenLoadouts")]
+    partial class DenLoadouts
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "10.0.6")
+                .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<bool>("Deadminned")
+                        .HasColumnType("boolean")
+                        .HasColumnName("deadminned");
+
+                    b.Property<bool>("Suspended")
+                        .HasColumnType("boolean")
+                        .HasColumnName("suspended");
+
+                    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")
+                        .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")
+                        .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.Ban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    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<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("reason");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("integer")
+                        .HasColumnName("severity");
+
+                    b.Property<byte>("Type")
+                        .HasColumnType("smallint")
+                        .HasColumnName("type");
+
+                    b.HasKey("Id")
+                        .HasName("PK_ban");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.ToTable("ban", null, t =>
+                        {
+                            t.HasCheckConstraint("NoExemptOnRoleBan", "type = 0 OR exempt_flags = 0");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.BanAddress", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_address_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<NpgsqlInet>("Address")
+                        .HasColumnType("inet")
+                        .HasColumnName("address");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_ban_address");
+
+                    b.HasIndex("BanId")
+                        .HasDatabaseName("IX_ban_address_ban_id");
+
+                    b.ToTable("ban_address", null, t =>
+                        {
+                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.BanHwid", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_hwid_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_ban_hwid");
+
+                    b.HasIndex("BanId")
+                        .HasDatabaseName("IX_ban_hwid_ban_id");
+
+                    b.ToTable("ban_hwid", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.BanPlayer", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_player_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_ban_player");
+
+                    b.HasIndex("BanId")
+                        .HasDatabaseName("IX_ban_player_ban_id");
+
+                    b.HasIndex("UserId", "BanId")
+                        .IsUnique();
+
+                    b.ToTable("ban_player", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.BanRole", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_role_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("role_id");
+
+                    b.Property<string>("RoleType")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("role_type");
+
+                    b.HasKey("Id")
+                        .HasName("PK_ban_role");
+
+                    b.HasIndex("BanId")
+                        .HasDatabaseName("IX_ban_role_ban_id");
+
+                    b.HasIndex("RoleType", "RoleId", "BanId")
+                        .IsUnique();
+
+                    b.ToTable("ban_role", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.BanRound", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_round_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.Property<int>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_ban_round");
+
+                    b.HasIndex("BanId")
+                        .HasDatabaseName("IX_ban_round_ban_id");
+
+                    b.HasIndex("RoundId", "BanId")
+                        .IsUnique();
+
+                    b.ToTable("ban_round", (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.ConsentData", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("global_consent_info_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ConsentId")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("consent_id");
+
+                    b.Property<bool>("ConsentValue")
+                        .HasColumnType("boolean")
+                        .HasColumnName("consent_value");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_global_consent_info");
+
+                    b.HasIndex("Id", "UserId")
+                        .IsUnique();
+
+                    b.ToTable("global_consent_info", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.IPIntelCache", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("ipintel_cache_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<IPAddress>("Address")
+                        .IsRequired()
+                        .HasColumnType("inet")
+                        .HasColumnName("address");
+
+                    b.Property<float>("Score")
+                        .HasColumnType("real")
+                        .HasColumnName("score");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("time");
+
+                    b.HasKey("Id")
+                        .HasName("PK_ipintel_cache");
+
+                    b.ToTable("ipintel_cache", (string)null);
+                });
+
+            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.JobLoadout", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("job_loadout_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("JobName")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("job_name");
+
+                    b.PrimitiveCollection<List<Guid>>("LoadoutProfiles")
+                        .IsRequired()
+                        .HasColumnType("uuid[]")
+                        .HasColumnName("loadout_profiles");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_job_loadout");
+
+                    b.HasIndex("ProfileId");
+
+                    b.ToTable("job_loadout", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.LoadoutCategory", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("loadout_category_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("CategoryColor")
+                        .IsRequired()
+                        .HasMaxLength(10)
+                        .HasColumnType("character varying(10)")
+                        .HasColumnName("category_color");
+
+                    b.Property<string>("CategoryName")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("category_name");
+
+                    b.Property<Guid>("CategoryUniqueId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("category_unique_id");
+
+                    b.Property<int>("Priority")
+                        .HasColumnType("integer")
+                        .HasColumnName("priority");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_loadout_category");
+
+                    b.HasIndex("ProfileId");
+
+                    b.ToTable("loadout_category", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.LoadoutProfile", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("loadout_profile_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("LoadoutCategoryId")
+                        .HasColumnType("integer")
+                        .HasColumnName("loadout_category_id");
+
+                    b.PrimitiveCollection<List<string>>("LoadoutItems")
+                        .IsRequired()
+                        .HasColumnType("text[]")
+                        .HasColumnName("loadout_items");
+
+                    b.Property<string>("LoadoutName")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("loadout_name");
+
+                    b.Property<Guid>("LoadoutUniqueId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("loadout_unique_id");
+
+                    b.Property<int>("Priority")
+                        .HasColumnType("integer")
+                        .HasColumnName("priority");
+
+                    b.HasKey("Id")
+                        .HasName("PK_loadout_profile");
+
+                    b.HasIndex("LoadoutCategoryId");
+
+                    b.ToTable("loadout_profile", (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.PrimitiveCollection<List<string>>("ConstructionFavorites")
+                        .IsRequired()
+                        .HasColumnType("text[]")
+                        .HasColumnName("construction_favorites");
+
+                    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<JsonDocument>("OrganMarkings")
+                        .HasColumnType("jsonb")
+                        .HasColumnName("organ_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<string>("EntityName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("entity_name");
+
+                    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.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.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.Unban", 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_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("unban", (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.Ban", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_ban_player_last_edited_by_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("LastEditedBy");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.BanAddress", b =>
+                {
+                    b.HasOne("Content.Server.Database.Ban", "Ban")
+                        .WithMany("Addresses")
+                        .HasForeignKey("BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_ban_address_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.BanHwid", b =>
+                {
+                    b.HasOne("Content.Server.Database.Ban", "Ban")
+                        .WithMany("Hwids")
+                        .HasForeignKey("BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_ban_hwid_ban_ban_id");
+
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "HWId", b1 =>
+                        {
+                            b1.Property<int>("BanHwidId")
+                                .HasColumnType("integer")
+                                .HasColumnName("ban_hwid_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("bytea")
+                                .HasColumnName("hwid");
+
+                            b1.Property<int>("Type")
+                                .HasColumnType("integer")
+                                .HasColumnName("hwid_type");
+
+                            b1.HasKey("BanHwidId");
+
+                            b1.ToTable("ban_hwid");
+
+                            b1.WithOwner()
+                                .HasForeignKey("BanHwidId")
+                                .HasConstraintName("FK_ban_hwid_ban_hwid_ban_hwid_id");
+                        });
+
+                    b.Navigation("Ban");
+
+                    b.Navigation("HWId")
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Content.Server.Database.BanPlayer", b =>
+                {
+                    b.HasOne("Content.Server.Database.Ban", "Ban")
+                        .WithMany("Players")
+                        .HasForeignKey("BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_ban_player_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.BanRole", b =>
+                {
+                    b.HasOne("Content.Server.Database.Ban", "Ban")
+                        .WithMany("Roles")
+                        .HasForeignKey("BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_ban_role_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.BanRound", b =>
+                {
+                    b.HasOne("Content.Server.Database.Ban", "Ban")
+                        .WithMany("Rounds")
+                        .HasForeignKey("BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_ban_round_ban_ban_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_ban_round_round_round_id");
+
+                    b.Navigation("Ban");
+
+                    b.Navigation("Round");
+                });
+
+            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.JobLoadout", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("JobLoadouts")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_job_loadout_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.LoadoutCategory", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("LoadoutCategories")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_loadout_category_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.LoadoutProfile", b =>
+                {
+                    b.HasOne("Content.Server.Database.LoadoutCategory", "Category")
+                        .WithMany("Members")
+                        .HasForeignKey("LoadoutCategoryId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_loadout_profile_loadout_category_loadout_category_id");
+
+                    b.Navigation("Category");
+                });
+
+            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.ServerBanHit", b =>
+                {
+                    b.HasOne("Content.Server.Database.Ban", "Ban")
+                        .WithMany("BanHits")
+                        .HasForeignKey("BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_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.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("Content.Server.Database.Unban", b =>
+                {
+                    b.HasOne("Content.Server.Database.Ban", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.Unban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_unban_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            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.Ban", b =>
+                {
+                    b.Navigation("Addresses");
+
+                    b.Navigation("BanHits");
+
+                    b.Navigation("Hwids");
+
+                    b.Navigation("Players");
+
+                    b.Navigation("Roles");
+
+                    b.Navigation("Rounds");
+
+                    b.Navigation("Unban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Navigation("BanHits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.LoadoutCategory", b =>
+                {
+                    b.Navigation("Members");
+                });
+
+            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("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("JobLoadouts");
+
+                    b.Navigation("Jobs");
+
+                    b.Navigation("LoadoutCategories");
+
+                    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");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Postgres/20260706120346_DenLoadouts.cs b/Content.Server.Database/Migrations/Postgres/20260706120346_DenLoadouts.cs
new file mode 100644
index 00000000000..1eb70d199fe
--- /dev/null
+++ b/Content.Server.Database/Migrations/Postgres/20260706120346_DenLoadouts.cs
@@ -0,0 +1,112 @@
+using System;
+using System.Collections.Generic;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Postgres
+{
+    /// <inheritdoc />
+    public partial class DenLoadouts : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "job_loadout",
+                columns: table => new
+                {
+                    job_loadout_id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    profile_id = table.Column<int>(type: "integer", nullable: false),
+                    job_name = table.Column<string>(type: "character varying(256)", maxLength: 256, nullable: false),
+                    loadout_profiles = table.Column<List<Guid>>(type: "uuid[]", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_job_loadout", x => x.job_loadout_id);
+                    table.ForeignKey(
+                        name: "FK_job_loadout_profile_profile_id",
+                        column: x => x.profile_id,
+                        principalTable: "profile",
+                        principalColumn: "profile_id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "loadout_category",
+                columns: table => new
+                {
+                    loadout_category_id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    profile_id = table.Column<int>(type: "integer", nullable: false),
+                    category_unique_id = table.Column<Guid>(type: "uuid", nullable: false),
+                    priority = table.Column<int>(type: "integer", nullable: false),
+                    category_name = table.Column<string>(type: "character varying(256)", maxLength: 256, nullable: false),
+                    category_color = table.Column<string>(type: "character varying(10)", maxLength: 10, nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_loadout_category", x => x.loadout_category_id);
+                    table.ForeignKey(
+                        name: "FK_loadout_category_profile_profile_id",
+                        column: x => x.profile_id,
+                        principalTable: "profile",
+                        principalColumn: "profile_id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "loadout_profile",
+                columns: table => new
+                {
+                    loadout_profile_id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    loadout_category_id = table.Column<int>(type: "integer", nullable: false),
+                    loadout_unique_id = table.Column<Guid>(type: "uuid", nullable: false),
+                    loadout_name = table.Column<string>(type: "character varying(256)", maxLength: 256, nullable: false),
+                    priority = table.Column<int>(type: "integer", nullable: false),
+                    loadout_items = table.Column<List<string>>(type: "text[]", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_loadout_profile", x => x.loadout_profile_id);
+                    table.ForeignKey(
+                        name: "FK_loadout_profile_loadout_category_loadout_category_id",
+                        column: x => x.loadout_category_id,
+                        principalTable: "loadout_category",
+                        principalColumn: "loadout_category_id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_job_loadout_profile_id",
+                table: "job_loadout",
+                column: "profile_id");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_loadout_category_profile_id",
+                table: "loadout_category",
+                column: "profile_id");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_loadout_profile_loadout_category_id",
+                table: "loadout_profile",
+                column: "loadout_category_id");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "job_loadout");
+
+            migrationBuilder.DropTable(
+                name: "loadout_profile");
+
+            migrationBuilder.DropTable(
+                name: "loadout_category");
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs b/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
index 7313c20647c..f74879c5e70 100644
--- a/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
+++ b/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
@@ -945,6 +945,119 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.ToTable("job", (string)null);
                 });
 
+            modelBuilder.Entity("Content.Server.Database.JobLoadout", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("job_loadout_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("JobName")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("job_name");
+
+                    b.PrimitiveCollection<List<Guid>>("LoadoutProfiles")
+                        .IsRequired()
+                        .HasColumnType("uuid[]")
+                        .HasColumnName("loadout_profiles");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_job_loadout");
+
+                    b.HasIndex("ProfileId");
+
+                    b.ToTable("job_loadout", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.LoadoutCategory", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("loadout_category_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("CategoryColor")
+                        .IsRequired()
+                        .HasMaxLength(10)
+                        .HasColumnType("character varying(10)")
+                        .HasColumnName("category_color");
+
+                    b.Property<string>("CategoryName")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("category_name");
+
+                    b.Property<Guid>("CategoryUniqueId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("category_unique_id");
+
+                    b.Property<int>("Priority")
+                        .HasColumnType("integer")
+                        .HasColumnName("priority");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_loadout_category");
+
+                    b.HasIndex("ProfileId");
+
+                    b.ToTable("loadout_category", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.LoadoutProfile", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("loadout_profile_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("LoadoutCategoryId")
+                        .HasColumnType("integer")
+                        .HasColumnName("loadout_category_id");
+
+                    b.PrimitiveCollection<List<string>>("LoadoutItems")
+                        .IsRequired()
+                        .HasColumnType("text[]")
+                        .HasColumnName("loadout_items");
+
+                    b.Property<string>("LoadoutName")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("loadout_name");
+
+                    b.Property<Guid>("LoadoutUniqueId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("loadout_unique_id");
+
+                    b.Property<int>("Priority")
+                        .HasColumnType("integer")
+                        .HasColumnName("priority");
+
+                    b.HasKey("Id")
+                        .HasName("PK_loadout_profile");
+
+                    b.HasIndex("LoadoutCategoryId");
+
+                    b.ToTable("loadout_profile", (string)null);
+                });
+
             modelBuilder.Entity("Content.Server.Database.PlayTime", b =>
                 {
                     b.Property<int>("Id")
@@ -1874,6 +1987,42 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Navigation("Profile");
                 });
 
+            modelBuilder.Entity("Content.Server.Database.JobLoadout", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("JobLoadouts")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_job_loadout_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.LoadoutCategory", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("LoadoutCategories")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_loadout_category_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.LoadoutProfile", b =>
+                {
+                    b.HasOne("Content.Server.Database.LoadoutCategory", "Category")
+                        .WithMany("Members")
+                        .HasForeignKey("LoadoutCategoryId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_loadout_profile_loadout_category_loadout_category_id");
+
+                    b.Navigation("Category");
+                });
+
             modelBuilder.Entity("Content.Server.Database.Player", b =>
                 {
                     b.OwnsOne("Content.Server.Database.TypedHwid", "LastSeenHWId", b1 =>
@@ -2079,6 +2228,11 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Navigation("BanHits");
                 });
 
+            modelBuilder.Entity("Content.Server.Database.LoadoutCategory", b =>
+                {
+                    b.Navigation("Members");
+                });
+
             modelBuilder.Entity("Content.Server.Database.Player", b =>
                 {
                     b.Navigation("AdminLogs");
@@ -2123,8 +2277,12 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                 {
                     b.Navigation("Antags");
 
+                    b.Navigation("JobLoadouts");
+
                     b.Navigation("Jobs");
 
+                    b.Navigation("LoadoutCategories");
+
                     b.Navigation("Loadouts");
 
                     b.Navigation("Traits");
diff --git a/Content.Server.Database/Migrations/Sqlite/20260706120333_DenLoadouts.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20260706120333_DenLoadouts.Designer.cs
new file mode 100644
index 00000000000..25a32f46cfb
--- /dev/null
+++ b/Content.Server.Database/Migrations/Sqlite/20260706120333_DenLoadouts.Designer.cs
@@ -0,0 +1,2229 @@
+// <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("20260706120333_DenLoadouts")]
+    partial class DenLoadouts
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "10.0.6");
+
+            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<bool>("Deadminned")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("deadminned");
+
+                    b.Property<bool>("Suspended")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("suspended");
+
+                    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")
+                        .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")
+                        .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.Ban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    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<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("reason");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.Property<byte>("Type")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("type");
+
+                    b.HasKey("Id")
+                        .HasName("PK_ban");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.ToTable("ban", null, t =>
+                        {
+                            t.HasCheckConstraint("NoExemptOnRoleBan", "type = 0 OR exempt_flags = 0");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.BanAddress", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_address_id");
+
+                    b.Property<string>("Address")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_ban_address");
+
+                    b.HasIndex("BanId")
+                        .HasDatabaseName("IX_ban_address_ban_id");
+
+                    b.ToTable("ban_address", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.BanHwid", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_hwid_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_ban_hwid");
+
+                    b.HasIndex("BanId")
+                        .HasDatabaseName("IX_ban_hwid_ban_id");
+
+                    b.ToTable("ban_hwid", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.BanPlayer", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_player_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_ban_player");
+
+                    b.HasIndex("BanId")
+                        .HasDatabaseName("IX_ban_player_ban_id");
+
+                    b.HasIndex("UserId", "BanId")
+                        .IsUnique();
+
+                    b.ToTable("ban_player", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.BanRole", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_role_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("role_id");
+
+                    b.Property<string>("RoleType")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("role_type");
+
+                    b.HasKey("Id")
+                        .HasName("PK_ban_role");
+
+                    b.HasIndex("BanId")
+                        .HasDatabaseName("IX_ban_role_ban_id");
+
+                    b.HasIndex("RoleType", "RoleId", "BanId")
+                        .IsUnique();
+
+                    b.ToTable("ban_role", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.BanRound", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_round_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<int>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_ban_round");
+
+                    b.HasIndex("BanId")
+                        .HasDatabaseName("IX_ban_round_ban_id");
+
+                    b.HasIndex("RoundId", "BanId")
+                        .IsUnique();
+
+                    b.ToTable("ban_round", (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.ConsentData", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("global_consent_info_id");
+
+                    b.Property<string>("ConsentId")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("consent_id");
+
+                    b.Property<bool>("ConsentValue")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("consent_value");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_global_consent_info");
+
+                    b.HasIndex("Id", "UserId")
+                        .IsUnique();
+
+                    b.ToTable("global_consent_info", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.IPIntelCache", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ipintel_cache_id");
+
+                    b.Property<string>("Address")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<float>("Score")
+                        .HasColumnType("REAL")
+                        .HasColumnName("score");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("time");
+
+                    b.HasKey("Id")
+                        .HasName("PK_ipintel_cache");
+
+                    b.HasIndex("Address")
+                        .IsUnique();
+
+                    b.ToTable("ipintel_cache", (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.JobLoadout", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("job_loadout_id");
+
+                    b.Property<string>("JobName")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("job_name");
+
+                    b.PrimitiveCollection<string>("LoadoutProfiles")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("loadout_profiles");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_job_loadout");
+
+                    b.HasIndex("ProfileId");
+
+                    b.ToTable("job_loadout", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.LoadoutCategory", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("loadout_category_id");
+
+                    b.Property<string>("CategoryColor")
+                        .IsRequired()
+                        .HasMaxLength(10)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("category_color");
+
+                    b.Property<string>("CategoryName")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("category_name");
+
+                    b.Property<Guid>("CategoryUniqueId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("category_unique_id");
+
+                    b.Property<int>("Priority")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("priority");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_loadout_category");
+
+                    b.HasIndex("ProfileId");
+
+                    b.ToTable("loadout_category", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.LoadoutProfile", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("loadout_profile_id");
+
+                    b.Property<int>("LoadoutCategoryId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("loadout_category_id");
+
+                    b.PrimitiveCollection<string>("LoadoutItems")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("loadout_items");
+
+                    b.Property<string>("LoadoutName")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("loadout_name");
+
+                    b.Property<Guid>("LoadoutUniqueId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("loadout_unique_id");
+
+                    b.Property<int>("Priority")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("priority");
+
+                    b.HasKey("Id")
+                        .HasName("PK_loadout_profile");
+
+                    b.HasIndex("LoadoutCategoryId");
+
+                    b.ToTable("loadout_profile", (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.PrimitiveCollection<string>("ConstructionFavorites")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("construction_favorites");
+
+                    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<byte[]>("OrganMarkings")
+                        .HasColumnType("jsonb")
+                        .HasColumnName("organ_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<string>("EntityName")
+                        .HasMaxLength(256)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("entity_name");
+
+                    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.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.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.Unban", 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_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("unban", (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.Ban", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_ban_player_last_edited_by_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("LastEditedBy");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.BanAddress", b =>
+                {
+                    b.HasOne("Content.Server.Database.Ban", "Ban")
+                        .WithMany("Addresses")
+                        .HasForeignKey("BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_ban_address_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.BanHwid", b =>
+                {
+                    b.HasOne("Content.Server.Database.Ban", "Ban")
+                        .WithMany("Hwids")
+                        .HasForeignKey("BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_ban_hwid_ban_ban_id");
+
+                    b.OwnsOne("Content.Server.Database.TypedHwid", "HWId", b1 =>
+                        {
+                            b1.Property<int>("BanHwidId")
+                                .HasColumnType("INTEGER")
+                                .HasColumnName("ban_hwid_id");
+
+                            b1.Property<byte[]>("Hwid")
+                                .IsRequired()
+                                .HasColumnType("BLOB")
+                                .HasColumnName("hwid");
+
+                            b1.Property<int>("Type")
+                                .HasColumnType("INTEGER")
+                                .HasColumnName("hwid_type");
+
+                            b1.HasKey("BanHwidId");
+
+                            b1.ToTable("ban_hwid");
+
+                            b1.WithOwner()
+                                .HasForeignKey("BanHwidId")
+                                .HasConstraintName("FK_ban_hwid_ban_hwid_ban_hwid_id");
+                        });
+
+                    b.Navigation("Ban");
+
+                    b.Navigation("HWId")
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Content.Server.Database.BanPlayer", b =>
+                {
+                    b.HasOne("Content.Server.Database.Ban", "Ban")
+                        .WithMany("Players")
+                        .HasForeignKey("BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_ban_player_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.BanRole", b =>
+                {
+                    b.HasOne("Content.Server.Database.Ban", "Ban")
+                        .WithMany("Roles")
+                        .HasForeignKey("BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_ban_role_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.BanRound", b =>
+                {
+                    b.HasOne("Content.Server.Database.Ban", "Ban")
+                        .WithMany("Rounds")
+                        .HasForeignKey("BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_ban_round_ban_ban_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_ban_round_round_round_id");
+
+                    b.Navigation("Ban");
+
+                    b.Navigation("Round");
+                });
+
+            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.JobLoadout", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("JobLoadouts")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_job_loadout_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.LoadoutCategory", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("LoadoutCategories")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_loadout_category_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.LoadoutProfile", b =>
+                {
+                    b.HasOne("Content.Server.Database.LoadoutCategory", "Category")
+                        .WithMany("Members")
+                        .HasForeignKey("LoadoutCategoryId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_loadout_profile_loadout_category_loadout_category_id");
+
+                    b.Navigation("Category");
+                });
+
+            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.ServerBanHit", b =>
+                {
+                    b.HasOne("Content.Server.Database.Ban", "Ban")
+                        .WithMany("BanHits")
+                        .HasForeignKey("BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_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.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("Content.Server.Database.Unban", b =>
+                {
+                    b.HasOne("Content.Server.Database.Ban", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.Unban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_unban_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            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.Ban", b =>
+                {
+                    b.Navigation("Addresses");
+
+                    b.Navigation("BanHits");
+
+                    b.Navigation("Hwids");
+
+                    b.Navigation("Players");
+
+                    b.Navigation("Roles");
+
+                    b.Navigation("Rounds");
+
+                    b.Navigation("Unban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Navigation("BanHits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.LoadoutCategory", b =>
+                {
+                    b.Navigation("Members");
+                });
+
+            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("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("JobLoadouts");
+
+                    b.Navigation("Jobs");
+
+                    b.Navigation("LoadoutCategories");
+
+                    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");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Sqlite/20260706120333_DenLoadouts.cs b/Content.Server.Database/Migrations/Sqlite/20260706120333_DenLoadouts.cs
new file mode 100644
index 00000000000..c70a7d37f26
--- /dev/null
+++ b/Content.Server.Database/Migrations/Sqlite/20260706120333_DenLoadouts.cs
@@ -0,0 +1,110 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Sqlite
+{
+    /// <inheritdoc />
+    public partial class DenLoadouts : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "job_loadout",
+                columns: table => new
+                {
+                    job_loadout_id = table.Column<int>(type: "INTEGER", nullable: false)
+                        .Annotation("Sqlite:Autoincrement", true),
+                    profile_id = table.Column<int>(type: "INTEGER", nullable: false),
+                    job_name = table.Column<string>(type: "TEXT", maxLength: 256, nullable: false),
+                    loadout_profiles = table.Column<string>(type: "TEXT", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_job_loadout", x => x.job_loadout_id);
+                    table.ForeignKey(
+                        name: "FK_job_loadout_profile_profile_id",
+                        column: x => x.profile_id,
+                        principalTable: "profile",
+                        principalColumn: "profile_id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "loadout_category",
+                columns: table => new
+                {
+                    loadout_category_id = table.Column<int>(type: "INTEGER", nullable: false)
+                        .Annotation("Sqlite:Autoincrement", true),
+                    profile_id = table.Column<int>(type: "INTEGER", nullable: false),
+                    category_unique_id = table.Column<Guid>(type: "TEXT", nullable: false),
+                    priority = table.Column<int>(type: "INTEGER", nullable: false),
+                    category_name = table.Column<string>(type: "TEXT", maxLength: 256, nullable: false),
+                    category_color = table.Column<string>(type: "TEXT", maxLength: 10, nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_loadout_category", x => x.loadout_category_id);
+                    table.ForeignKey(
+                        name: "FK_loadout_category_profile_profile_id",
+                        column: x => x.profile_id,
+                        principalTable: "profile",
+                        principalColumn: "profile_id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "loadout_profile",
+                columns: table => new
+                {
+                    loadout_profile_id = table.Column<int>(type: "INTEGER", nullable: false)
+                        .Annotation("Sqlite:Autoincrement", true),
+                    loadout_category_id = table.Column<int>(type: "INTEGER", nullable: false),
+                    loadout_unique_id = table.Column<Guid>(type: "TEXT", nullable: false),
+                    loadout_name = table.Column<string>(type: "TEXT", maxLength: 256, nullable: false),
+                    priority = table.Column<int>(type: "INTEGER", nullable: false),
+                    loadout_items = table.Column<string>(type: "TEXT", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_loadout_profile", x => x.loadout_profile_id);
+                    table.ForeignKey(
+                        name: "FK_loadout_profile_loadout_category_loadout_category_id",
+                        column: x => x.loadout_category_id,
+                        principalTable: "loadout_category",
+                        principalColumn: "loadout_category_id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_job_loadout_profile_id",
+                table: "job_loadout",
+                column: "profile_id");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_loadout_category_profile_id",
+                table: "loadout_category",
+                column: "profile_id");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_loadout_profile_loadout_category_id",
+                table: "loadout_profile",
+                column: "loadout_category_id");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "job_loadout");
+
+            migrationBuilder.DropTable(
+                name: "loadout_profile");
+
+            migrationBuilder.DropTable(
+                name: "loadout_category");
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs b/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
index 9952710c7f7..b34d7fdb4ee 100644
--- a/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
+++ b/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
@@ -891,6 +891,113 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.ToTable("job", (string)null);
                 });
 
+            modelBuilder.Entity("Content.Server.Database.JobLoadout", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("job_loadout_id");
+
+                    b.Property<string>("JobName")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("job_name");
+
+                    b.PrimitiveCollection<string>("LoadoutProfiles")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("loadout_profiles");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_job_loadout");
+
+                    b.HasIndex("ProfileId");
+
+                    b.ToTable("job_loadout", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.LoadoutCategory", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("loadout_category_id");
+
+                    b.Property<string>("CategoryColor")
+                        .IsRequired()
+                        .HasMaxLength(10)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("category_color");
+
+                    b.Property<string>("CategoryName")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("category_name");
+
+                    b.Property<Guid>("CategoryUniqueId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("category_unique_id");
+
+                    b.Property<int>("Priority")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("priority");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_loadout_category");
+
+                    b.HasIndex("ProfileId");
+
+                    b.ToTable("loadout_category", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.LoadoutProfile", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("loadout_profile_id");
+
+                    b.Property<int>("LoadoutCategoryId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("loadout_category_id");
+
+                    b.PrimitiveCollection<string>("LoadoutItems")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("loadout_items");
+
+                    b.Property<string>("LoadoutName")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("loadout_name");
+
+                    b.Property<Guid>("LoadoutUniqueId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("loadout_unique_id");
+
+                    b.Property<int>("Priority")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("priority");
+
+                    b.HasKey("Id")
+                        .HasName("PK_loadout_profile");
+
+                    b.HasIndex("LoadoutCategoryId");
+
+                    b.ToTable("loadout_profile", (string)null);
+                });
+
             modelBuilder.Entity("Content.Server.Database.PlayTime", b =>
                 {
                     b.Property<int>("Id")
@@ -1791,6 +1898,42 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Navigation("Profile");
                 });
 
+            modelBuilder.Entity("Content.Server.Database.JobLoadout", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("JobLoadouts")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_job_loadout_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.LoadoutCategory", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("LoadoutCategories")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_loadout_category_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.LoadoutProfile", b =>
+                {
+                    b.HasOne("Content.Server.Database.LoadoutCategory", "Category")
+                        .WithMany("Members")
+                        .HasForeignKey("LoadoutCategoryId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_loadout_profile_loadout_category_loadout_category_id");
+
+                    b.Navigation("Category");
+                });
+
             modelBuilder.Entity("Content.Server.Database.Player", b =>
                 {
                     b.OwnsOne("Content.Server.Database.TypedHwid", "LastSeenHWId", b1 =>
@@ -1996,6 +2139,11 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Navigation("BanHits");
                 });
 
+            modelBuilder.Entity("Content.Server.Database.LoadoutCategory", b =>
+                {
+                    b.Navigation("Members");
+                });
+
             modelBuilder.Entity("Content.Server.Database.Player", b =>
                 {
                     b.Navigation("AdminLogs");
@@ -2040,8 +2188,12 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                 {
                     b.Navigation("Antags");
 
+                    b.Navigation("JobLoadouts");
+
                     b.Navigation("Jobs");
 
+                    b.Navigation("LoadoutCategories");
+
                     b.Navigation("Loadouts");
 
                     b.Navigation("Traits");
diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
index 623d1bba4e3..5917d811003 100644
--- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs
+++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
@@ -485,7 +485,10 @@ public bool MemberwiseEquals(HumanoidCharacterProfile other)
             if (!_antagPreferences.SequenceEqual(other._antagPreferences)) return false;
             // if (!_traitPreferences.SequenceEqual(other._traitPreferences)) return false; // DEN
             if (!_entityTraitPreferences.SequenceEqual(other._entityTraitPreferences)) return false; // den
-            if (!Loadouts.SequenceEqual(other.Loadouts)) return false;
+            // if (!Loadouts.SequenceEqual(other.Loadouts)) return false; // DEN
+            if (!_jobLoadouts.SequenceEqual(other._jobLoadouts)) return false; // DEN
+            if (!_loadoutProfiles.SequenceEqual(other._loadoutProfiles)) return false; // DEN
+            if (!_loadoutCategories.SequenceEqual(other._loadoutCategories)) return false; // DEN
             if (FlavorText != other.FlavorText) return false;
             return Appearance.Equals(other.Appearance);
         }
@@ -749,7 +752,10 @@ public override int GetHashCode()
             hashCode.Add(_antagPreferences);
             // hashCode.Add(_traitPreferences); // DEN
             hashCode.Add(_entityTraitPreferences); // DEN
-            hashCode.Add(_loadouts);
+            //hashCode.Add(_loadouts); // DEN
+            hashCode.Add(_jobLoadouts); // DEN
+            hashCode.Add(_loadoutProfiles); // DEN
+            hashCode.Add(_loadoutCategories); // DEN
             hashCode.Add(Name);
             hashCode.Add(FlavorText);
             hashCode.Add(Species);
diff --git a/Content.Shared/_DEN/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/_DEN/Preferences/HumanoidCharacterProfile.cs
index b4d3e17fd13..b8bed6967f8 100644
--- a/Content.Shared/_DEN/Preferences/HumanoidCharacterProfile.cs
+++ b/Content.Shared/_DEN/Preferences/HumanoidCharacterProfile.cs
@@ -143,21 +143,47 @@ public HumanoidCharacterProfile WithoutEntityTraitPreference(ProtoId<EntityTrait
 
     public HumanoidCharacterProfile WithLoadoutProfile(Guid loadoutId, DenLoadout loadout)
     {
-        var profiles = new Dictionary<Guid, DenLoadout>(_loadoutProfiles);
-        profiles[loadoutId] = loadout;
+        var profiles = new Dictionary<Guid, DenLoadout>(_loadoutProfiles)
+        {
+            [loadoutId] = loadout,
+        };
 
-        return new(this)
+        return new HumanoidCharacterProfile(this)
         {
             _loadoutProfiles = profiles
         };
     }
 
-    public HumanoidCharacterProfile WithLoadoutCategory(Guid categoryId, DenLoadoutCategory category)
+    public HumanoidCharacterProfile WithNewLoadout(Guid loadoutId, Guid categoryId, DenLoadout loadout)
     {
+        if (!_loadoutCategories.TryGetValue(categoryId, out var loadoutCategory))
+            return this;
+
+        var profiles = new Dictionary<Guid, DenLoadout>(_loadoutProfiles)
+        {
+            [loadoutId] = loadout,
+        };
+
         var categories = new Dictionary<Guid, DenLoadoutCategory>(_loadoutCategories);
-        categories[categoryId] = category;
+        loadoutCategory.Members.Add(loadoutId);
 
-        return new(this)
+        categories[categoryId] = loadoutCategory;
+
+        return new HumanoidCharacterProfile(this)
+        {
+            _loadoutProfiles = profiles,
+            _loadoutCategories = categories,
+        };
+    }
+
+    public HumanoidCharacterProfile WithLoadoutCategory(Guid categoryId, DenLoadoutCategory category)
+    {
+        var categories = new Dictionary<Guid, DenLoadoutCategory>(_loadoutCategories)
+        {
+            [categoryId] = category,
+        };
+
+        return new HumanoidCharacterProfile(this)
         {
             _loadoutCategories = categories
         };
@@ -172,7 +198,7 @@ public HumanoidCharacterProfile WithJobLoadout(ProtoId<JobPrototype> jobId, Guid
 
         jobLoadouts[jobId].Add(loadoutId);
 
-        return new(this)
+        return new HumanoidCharacterProfile(this)
         {
             _jobLoadouts = jobLoadouts
         };
@@ -187,7 +213,7 @@ public HumanoidCharacterProfile WithoutJobLoadout(ProtoId<JobPrototype> jobId, G
 
         jobLoadouts[jobId].Remove(loadoutId);
 
-        return new(this)
+        return new HumanoidCharacterProfile(this)
         {
             _jobLoadouts = jobLoadouts
         };
@@ -195,10 +221,12 @@ public HumanoidCharacterProfile WithoutJobLoadout(ProtoId<JobPrototype> jobId, G
 
     public HumanoidCharacterProfile WithJobLoadouts(ProtoId<JobPrototype> jobId, HashSet<Guid> loadoutIds)
     {
-        var jobLoadouts = new Dictionary<ProtoId<JobPrototype>, HashSet<Guid>>(_jobLoadouts);
-        jobLoadouts[jobId] = new HashSet<Guid>(loadoutIds);
+        var jobLoadouts = new Dictionary<ProtoId<JobPrototype>, HashSet<Guid>>(_jobLoadouts)
+        {
+            [jobId] = new(loadoutIds),
+        };
 
-        return new(this)
+        return new HumanoidCharacterProfile(this)
         {
             _jobLoadouts = jobLoadouts
         };

From b97e4cce78297a172933310bcc752b6b1d8fce72 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Thu, 9 Jul 2026 02:08:39 -0300
Subject: [PATCH 07/14] need an engine PR...

---
 .../Lobby/UI/HumanoidProfileEditor.xaml       |  4 +-
 .../Lobby/UI/DenCategoryContainer.xaml.cs     | 31 ----------
 .../_DEN/Lobby/UI/DenLoadoutButtons.xaml.cs   | 18 ------
 .../{ => Loadouts}/CreateCategoryPopup.xaml   |  0
 .../CreateCategoryPopup.xaml.cs               |  2 +-
 .../UI/{ => Loadouts}/CreateLoadoutPopup.xaml |  0
 .../{ => Loadouts}/CreateLoadoutPopup.xaml.cs |  2 +-
 .../{ => Loadouts}/DenCategoryContainer.xaml  | 12 ++--
 .../UI/Loadouts/DenCategoryContainer.xaml.cs  | 62 +++++++++++++++++++
 .../DenLoadoutContainer.xaml}                 |  5 +-
 .../UI/Loadouts/DenLoadoutContainer.xaml.cs   | 22 +++++++
 .../UI/{ => Loadouts}/DenLoadoutTab.xaml      |  8 +--
 .../UI/{ => Loadouts}/DenLoadoutTab.xaml.cs   | 36 ++++++++---
 13 files changed, 127 insertions(+), 75 deletions(-)
 delete mode 100644 Content.Client/_DEN/Lobby/UI/DenCategoryContainer.xaml.cs
 delete mode 100644 Content.Client/_DEN/Lobby/UI/DenLoadoutButtons.xaml.cs
 rename Content.Client/_DEN/Lobby/UI/{ => Loadouts}/CreateCategoryPopup.xaml (100%)
 rename Content.Client/_DEN/Lobby/UI/{ => Loadouts}/CreateCategoryPopup.xaml.cs (94%)
 rename Content.Client/_DEN/Lobby/UI/{ => Loadouts}/CreateLoadoutPopup.xaml (100%)
 rename Content.Client/_DEN/Lobby/UI/{ => Loadouts}/CreateLoadoutPopup.xaml.cs (96%)
 rename Content.Client/_DEN/Lobby/UI/{ => Loadouts}/DenCategoryContainer.xaml (87%)
 create mode 100644 Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryContainer.xaml.cs
 rename Content.Client/_DEN/Lobby/UI/{DenLoadoutButtons.xaml => Loadouts/DenLoadoutContainer.xaml} (89%)
 create mode 100644 Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutContainer.xaml.cs
 rename Content.Client/_DEN/Lobby/UI/{ => Loadouts}/DenLoadoutTab.xaml (93%)
 rename Content.Client/_DEN/Lobby/UI/{ => Loadouts}/DenLoadoutTab.xaml.cs (77%)

diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml
index 36362dd5ff3..2417b64779a 100644
--- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml
+++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml
@@ -4,7 +4,7 @@
          xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
          xmlns:ui="clr-namespace:Content.Client.Lobby.UI"
          xmlns:profile="clr-namespace:Content.Client.Lobby.UI.ProfileEditorControls"
-         xmlns:den="clr-namespace:Content.Client._DEN.Lobby.UI"
+         xmlns:loadouts="clr-namespace:Content.Client._DEN.Lobby.UI.Loadouts"
          HorizontalExpand="True">
         <!-- Left side -->
         <BoxContainer Orientation="Vertical" Margin="10 10 10 10" HorizontalExpand="True">
@@ -132,7 +132,7 @@
                     <humanoid:MarkingPicker Name="Markings" HorizontalExpand="True" VerticalExpand="True" />
                 </BoxContainer>
                 <BoxContainer Name="LoadoutTab" Orientation="Vertical" Margin="10">
-                    <den:DenLoadoutTab Name="DenLoadouts" HorizontalExpand="True" VerticalExpand="True" />
+                    <loadouts:DenLoadoutTab Name="DenLoadouts" HorizontalExpand="True" VerticalExpand="True" />
                 </BoxContainer>
             </TabContainer>
         </BoxContainer>
diff --git a/Content.Client/_DEN/Lobby/UI/DenCategoryContainer.xaml.cs b/Content.Client/_DEN/Lobby/UI/DenCategoryContainer.xaml.cs
deleted file mode 100644
index 5895849ae85..00000000000
--- a/Content.Client/_DEN/Lobby/UI/DenCategoryContainer.xaml.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.XAML;
-
-namespace Content.Client._DEN.Lobby.UI;
-
-[GenerateTypedNameReferences]
-public sealed partial class DenCategoryContainer : PanelContainer
-{
-    private bool _isExpanded;
-
-    public DenCategoryContainer()
-    {
-        RobustXamlLoader.Load(this);
-
-        HeaderButton.OnPressed += _ => ToggleExpanded();
-        UpdateExpandedState();
-    }
-
-    private void ToggleExpanded()
-    {
-        _isExpanded = !_isExpanded;
-        UpdateExpandedState();
-    }
-
-    private void UpdateExpandedState()
-    {
-        LoadoutContainer.Visible = _isExpanded;
-        ExpandIcon.Text = _isExpanded ? "▼" : "▶";
-    }
-}
diff --git a/Content.Client/_DEN/Lobby/UI/DenLoadoutButtons.xaml.cs b/Content.Client/_DEN/Lobby/UI/DenLoadoutButtons.xaml.cs
deleted file mode 100644
index c7e64209a8e..00000000000
--- a/Content.Client/_DEN/Lobby/UI/DenLoadoutButtons.xaml.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.XAML;
-
-namespace Content.Client._DEN.Lobby.UI;
-
-[GenerateTypedNameReferences]
-public sealed partial class DenLoadoutButtons : ContainerButton
-{
-    public string Text { get; set; } = "Loadout";
-
-    public DenLoadoutButtons()
-    {
-        RobustXamlLoader.Load(this);
-
-
-    }
-}
diff --git a/Content.Client/_DEN/Lobby/UI/CreateCategoryPopup.xaml b/Content.Client/_DEN/Lobby/UI/Loadouts/CreateCategoryPopup.xaml
similarity index 100%
rename from Content.Client/_DEN/Lobby/UI/CreateCategoryPopup.xaml
rename to Content.Client/_DEN/Lobby/UI/Loadouts/CreateCategoryPopup.xaml
diff --git a/Content.Client/_DEN/Lobby/UI/CreateCategoryPopup.xaml.cs b/Content.Client/_DEN/Lobby/UI/Loadouts/CreateCategoryPopup.xaml.cs
similarity index 94%
rename from Content.Client/_DEN/Lobby/UI/CreateCategoryPopup.xaml.cs
rename to Content.Client/_DEN/Lobby/UI/Loadouts/CreateCategoryPopup.xaml.cs
index c61ecd188fd..6cd38b285e8 100644
--- a/Content.Client/_DEN/Lobby/UI/CreateCategoryPopup.xaml.cs
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/CreateCategoryPopup.xaml.cs
@@ -2,7 +2,7 @@
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.XAML;
 
-namespace Content.Client._DEN.Lobby.UI;
+namespace Content.Client._DEN.Lobby.UI.Loadouts;
 
 [GenerateTypedNameReferences]
 public sealed partial class CreateCategoryPopup : FancyWindow
diff --git a/Content.Client/_DEN/Lobby/UI/CreateLoadoutPopup.xaml b/Content.Client/_DEN/Lobby/UI/Loadouts/CreateLoadoutPopup.xaml
similarity index 100%
rename from Content.Client/_DEN/Lobby/UI/CreateLoadoutPopup.xaml
rename to Content.Client/_DEN/Lobby/UI/Loadouts/CreateLoadoutPopup.xaml
diff --git a/Content.Client/_DEN/Lobby/UI/CreateLoadoutPopup.xaml.cs b/Content.Client/_DEN/Lobby/UI/Loadouts/CreateLoadoutPopup.xaml.cs
similarity index 96%
rename from Content.Client/_DEN/Lobby/UI/CreateLoadoutPopup.xaml.cs
rename to Content.Client/_DEN/Lobby/UI/Loadouts/CreateLoadoutPopup.xaml.cs
index 15434a6954b..8e4e0f109bd 100644
--- a/Content.Client/_DEN/Lobby/UI/CreateLoadoutPopup.xaml.cs
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/CreateLoadoutPopup.xaml.cs
@@ -2,7 +2,7 @@
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.XAML;
 
-namespace Content.Client._DEN.Lobby.UI;
+namespace Content.Client._DEN.Lobby.UI.Loadouts;
 
 [GenerateTypedNameReferences]
 public sealed partial class CreateLoadoutPopup : FancyWindow
diff --git a/Content.Client/_DEN/Lobby/UI/DenCategoryContainer.xaml b/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryContainer.xaml
similarity index 87%
rename from Content.Client/_DEN/Lobby/UI/DenCategoryContainer.xaml
rename to Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryContainer.xaml
index 3c0c5b4ff40..46b6e8e9a37 100644
--- a/Content.Client/_DEN/Lobby/UI/DenCategoryContainer.xaml
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryContainer.xaml
@@ -1,7 +1,6 @@
-<ui:DenCategoryContainer xmlns="https://spacestation14.io"
-                         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                         xmlns:ui="clr-namespace:Content.Client._DEN.Lobby.UI"
-                         xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client">
+<PanelContainer xmlns="https://spacestation14.io"
+                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client">
     <BoxContainer Orientation="Vertical"
                   HorizontalExpand="True"
                   Margin="0 0 0 8">
@@ -15,9 +14,7 @@
                            Text="A Loadout"
                            StyleClasses="TraitsCategoryNameLabel"
                            Margin="5 0 0 0"/>
-
                     <Control HorizontalExpand="True"/>
-
                     <BoxContainer Name="WarningContainer"
                                   Visible="False">
                         <TextureButton TexturePath="/Textures/Interface/VerbIcons/examine.svg.192dpi.png"
@@ -29,7 +26,6 @@
                                StyleClasses="TraitsCategoryStatsLabel"
                                Margin="0 0 4 0"/>
                     </BoxContainer>
-
                     <Label Name="ExpandIcon"
                            Text="▶"
                            StyleClasses="TraitsCategoryExpandIcon"
@@ -62,4 +58,4 @@
     </BoxContainer>
 
 
-</ui:DenCategoryContainer>
+</PanelContainer>
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryContainer.xaml.cs b/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryContainer.xaml.cs
new file mode 100644
index 00000000000..c604cb7e2cc
--- /dev/null
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryContainer.xaml.cs
@@ -0,0 +1,62 @@
+using Content.Shared._DEN.Loadout;
+using Robust.Client.AutoGenerated;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client._DEN.Lobby.UI.Loadouts;
+
+[GenerateTypedNameReferences]
+public sealed partial class DenCategoryContainer : PanelContainer
+{
+    private DenLoadoutCategory _categoryDefinition;
+    private List<DenLoadoutContainer> _loadouts = new();
+    private bool _isExpanded;
+
+    public DenCategoryContainer(DenLoadoutCategory category,
+        List<DenLoadout> loadouts)
+    {
+        RobustXamlLoader.Load(this);
+
+        _categoryDefinition = category;
+
+        RefreshCategoryColor();
+        RefreshLoadoutContainers(loadouts);
+
+        HeaderButton.OnPressed += _ => ToggleExpanded();
+        UpdateExpandedState();
+    }
+
+    private void RefreshCategoryColor()
+    {
+        var color = Color.TryFromHex(_categoryDefinition.Color);
+
+        AccentBar.PanelOverride = new StyleBoxFlat
+        {
+            BackgroundColor = color ?? Color.White
+        };
+    }
+
+    private void RefreshLoadoutContainers(List<DenLoadout> loadoutProfiles)
+    {
+        foreach (var loadoutProfile in loadoutProfiles)
+        {
+            var container = new DenLoadoutContainer(loadoutProfile);
+
+            AddChild(container);
+            _loadouts.Add(container);
+        }
+    }
+
+    private void ToggleExpanded()
+    {
+        _isExpanded = !_isExpanded;
+        UpdateExpandedState();
+    }
+
+    private void UpdateExpandedState()
+    {
+        LoadoutContainer.Visible = _isExpanded;
+        ExpandIcon.Text = _isExpanded ? "▼" : "▶";
+    }
+}
diff --git a/Content.Client/_DEN/Lobby/UI/DenLoadoutButtons.xaml b/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutContainer.xaml
similarity index 89%
rename from Content.Client/_DEN/Lobby/UI/DenLoadoutButtons.xaml
rename to Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutContainer.xaml
index 2ea9e161c87..1126a1b172b 100644
--- a/Content.Client/_DEN/Lobby/UI/DenLoadoutButtons.xaml
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutContainer.xaml
@@ -1,6 +1,5 @@
-<ui:DenLoadoutButtons xmlns="https://spacestation14.io"
+<ContainerButton xmlns="https://spacestation14.io"
               xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-              xmlns:ui="clr-namespace:Content.Client._DEN.Lobby.UI"
               xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client">
     <PanelContainer HorizontalExpand="True">
         <PanelContainer.PanelOverride>
@@ -28,4 +27,4 @@
                     StyleClasses="OpenLeft"/>
         </BoxContainer>
     </PanelContainer>
-</ui:DenLoadoutButtons>
+</ContainerButton>
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutContainer.xaml.cs b/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutContainer.xaml.cs
new file mode 100644
index 00000000000..637ea220deb
--- /dev/null
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutContainer.xaml.cs
@@ -0,0 +1,22 @@
+using Content.Shared._DEN.Loadout;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client._DEN.Lobby.UI.Loadouts;
+
+[GenerateTypedNameReferences]
+public sealed partial class DenLoadoutContainer : ContainerButton
+{
+    private DenLoadout _loadout;
+
+    public DenLoadoutContainer(DenLoadout loadoutProfile)
+    {
+        RobustXamlLoader.Load(this);
+
+        _loadout = loadoutProfile;
+
+        LoadoutNameLabel.Text = loadoutProfile.Name;
+
+    }
+}
diff --git a/Content.Client/_DEN/Lobby/UI/DenLoadoutTab.xaml b/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.xaml
similarity index 93%
rename from Content.Client/_DEN/Lobby/UI/DenLoadoutTab.xaml
rename to Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.xaml
index 866cf50c72e..160405c3395 100644
--- a/Content.Client/_DEN/Lobby/UI/DenLoadoutTab.xaml
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.xaml
@@ -1,7 +1,7 @@
-<ui:DenLoadoutTab xmlns="https://spacestation14.io"
+<loadouts:DenLoadoutTab xmlns="https://spacestation14.io"
                   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                  xmlns:ui="clr-namespace:Content.Client._DEN.Lobby.UI"
-                  xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client">
+                  xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
+                  xmlns:loadouts="clr-namespace:Content.Client._DEN.Lobby.UI.Loadouts">
     <BoxContainer Orientation="Vertical"
                   SeparationOverride="0">
         <PanelContainer SetHeight="50"
@@ -57,4 +57,4 @@
             </PanelContainer>
         </BoxContainer>
     </BoxContainer>
-</ui:DenLoadoutTab>
+</loadouts:DenLoadoutTab>
diff --git a/Content.Client/_DEN/Lobby/UI/DenLoadoutTab.xaml.cs b/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.xaml.cs
similarity index 77%
rename from Content.Client/_DEN/Lobby/UI/DenLoadoutTab.xaml.cs
rename to Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.xaml.cs
index 07036dda619..606eccacaa0 100644
--- a/Content.Client/_DEN/Lobby/UI/DenLoadoutTab.xaml.cs
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.xaml.cs
@@ -1,4 +1,3 @@
-using System.Linq;
 using Content.Shared._DEN.Loadout;
 using Content.Shared.Preferences;
 using Robust.Client.AutoGenerated;
@@ -6,7 +5,7 @@
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Utility;
 
-namespace Content.Client._DEN.Lobby.UI;
+namespace Content.Client._DEN.Lobby.UI.Loadouts;
 
 [GenerateTypedNameReferences]
 public sealed partial class DenLoadoutTab : ContainerButton
@@ -17,13 +16,14 @@ public sealed partial class DenLoadoutTab : ContainerButton
     private CreateLoadoutPopup? _createLoadoutPopup;
     private HumanoidCharacterProfile? _profile;
 
-    private List<(Guid CategoryId, string CategoryName)> _categories;
+    private readonly List<(Guid CategoryId, string CategoryName)> _popupCategories;
+    private List<DenCategoryContainer> _categories = new();
 
     public DenLoadoutTab()
     {
         RobustXamlLoader.Load(this);
 
-        _categories = new();
+        _popupCategories = new();
         RefreshCategories();
 
         ButtonCreateCategory.OnPressed += _ => OnTryCreateCategory();
@@ -32,14 +32,36 @@ public DenLoadoutTab()
 
     public void RefreshCategories()
     {
-        _categories.Clear();
+        _popupCategories.Clear();
 
         if (_profile?.LoadoutCategories == null)
             return;
 
+        foreach (var categoryContainer in _categories)
+        {
+            categoryContainer.Orphan();
+        }
+
+        _categories.Clear();
+
         foreach (var (categoryId, category) in _profile.LoadoutCategories)
         {
-            _categories.Add((categoryId, category.Name));
+            _popupCategories.Add((categoryId, category.Name));
+
+            var profiles = new List<DenLoadout>();
+
+            foreach (var loadoutId in category.Members)
+            {
+                if (!_profile.LoadoutProfiles.TryGetValue(loadoutId, out var loadout))
+                    continue;
+
+                profiles.Add(loadout);
+            }
+
+            var categoryContainer = new DenCategoryContainer(category, profiles);
+
+            _categories.Add(categoryContainer);
+            LoadoutContainer.AddChild(categoryContainer);
         }
     }
 
@@ -82,7 +104,7 @@ private void OnTryCreateLoadout()
         if (_createLoadoutPopup != null)
             return;
 
-        _createLoadoutPopup = new CreateLoadoutPopup(_categories);
+        _createLoadoutPopup = new CreateLoadoutPopup(_popupCategories);
         _createLoadoutPopup.OnSubmit += OnSubmitNewLoadout;
         _createLoadoutPopup.OnClose += OnClose;
         _createLoadoutPopup.OpenCentered();

From 4331bd3d9a0e9aa0ca920a2fcfc40df455277d74 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Thu, 9 Jul 2026 17:20:13 -0300
Subject: [PATCH 08/14] i can't feel my legs

---
 .../Lobby/UI/HumanoidProfileEditor.xaml.cs    |  3 +-
 .../UI/Loadouts/CreateCategoryPopup.xaml.cs   | 17 +++-
 .../Lobby/UI/Loadouts/CreateLoadoutPopup.xaml |  6 +-
 .../UI/Loadouts/CreateLoadoutPopup.xaml.cs    |  6 +-
 .../Lobby/UI/Loadouts/DenCategoryActions.xaml | 29 +++++++
 .../UI/Loadouts/DenCategoryActions.xaml.cs    | 21 +++++
 .../UI/Loadouts/DenCategoryContainer.xaml     | 10 ++-
 .../UI/Loadouts/DenCategoryContainer.xaml.cs  | 18 ++++-
 .../Lobby/UI/Loadouts/DenLoadoutTab.xaml.cs   | 78 ++++++++++++++-----
 Content.Server.Database/DenModel.cs           | 75 ++++++++++++++++++
 Content.Server.Database/DenuModel.cs          | 21 -----
 Content.Server.Database/Model.cs              | 73 ++---------------
 Content.Server/Database/ServerDbBase.cs       | 10 +--
 13 files changed, 241 insertions(+), 126 deletions(-)
 create mode 100644 Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryActions.xaml
 create mode 100644 Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryActions.xaml.cs
 create mode 100644 Content.Server.Database/DenModel.cs
 delete mode 100644 Content.Server.Database/DenuModel.cs

diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
index 87f1fd99edf..c9034cd00dc 100644
--- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
@@ -289,7 +289,6 @@ public HumanoidProfileEditor(
             #region Den Loadouts
 
             TabContainer.SetTabTitle(5, "Loadouts"); // TODO: localize
-            RefreshDenLoadouts();
 
             #endregion
 
@@ -386,7 +385,7 @@ public void SetProfile(HumanoidCharacterProfile? profile, int? slot)
 
             RefreshAntags();
             RefreshJobs();
-            RefreshLoadouts();
+            RefreshDenLoadouts();
             RefreshSpecies();
             RefreshTraits();
             RefreshFlavorText();
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/CreateCategoryPopup.xaml.cs b/Content.Client/_DEN/Lobby/UI/Loadouts/CreateCategoryPopup.xaml.cs
index 6cd38b285e8..b77920b95fa 100644
--- a/Content.Client/_DEN/Lobby/UI/Loadouts/CreateCategoryPopup.xaml.cs
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/CreateCategoryPopup.xaml.cs
@@ -1,4 +1,5 @@
 using Content.Client.UserInterface.Controls;
+using Content.Shared._DEN.Loadout;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.XAML;
 
@@ -9,17 +10,26 @@ public sealed partial class CreateCategoryPopup : FancyWindow
 {
     public event Action<CategoryCreationRequest>? OnSubmit;
 
-    public CreateCategoryPopup()
+    public CreateCategoryPopup(DenLoadoutCategory? maybeCategory)
     {
         RobustXamlLoader.Load(this);
 
-        ButtonSubmit.OnPressed += _ => OnSubmitPressed();
+        if (maybeCategory is { } existingCategory)
+        {
+            var color = Color.TryFromHex(existingCategory.Color) ?? Color.White;
+
+            CategoryNameEdit.Text = existingCategory.Name;
+            CategoryColorPicker.Color = color;
+        }
+
+        ButtonSubmit.OnPressed += _ => OnSubmitPressed(maybeCategory);
     }
 
-    private void OnSubmitPressed()
+    private void OnSubmitPressed(DenLoadoutCategory? existingCategory)
     {
         var request = new CategoryCreationRequest
         {
+            ExistingCategoryId = existingCategory?.Id ?? null,
             CategoryName = CategoryNameEdit.Text,
             CategoryColor = CategoryColorPicker.Color
         };
@@ -30,6 +40,7 @@ private void OnSubmitPressed()
 
 public record struct CategoryCreationRequest
 {
+    public Guid? ExistingCategoryId { get; set; }
     public string CategoryName { get; set; }
     public Color CategoryColor { get; set; }
 }
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/CreateLoadoutPopup.xaml b/Content.Client/_DEN/Lobby/UI/Loadouts/CreateLoadoutPopup.xaml
index d9b6b729c1d..28f4ffe5f1e 100644
--- a/Content.Client/_DEN/Lobby/UI/Loadouts/CreateLoadoutPopup.xaml
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/CreateLoadoutPopup.xaml
@@ -1,14 +1,14 @@
 <controls:FancyWindow xmlns="https://spacestation14.io"
               xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
               xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-              SetSize="350 335"
-              Title="Create Category">
+              SetSize="200 225"
+              Title="Create Loadout">
     <BoxContainer HorizontalExpand="True"
                   VerticalExpand="True"
                   Orientation="Vertical"
                   Margin="10 10 10 0">
         <BoxContainer Orientation="Vertical" Margin="2">
-            <Label HorizontalExpand="True" Text="Category name:" />
+            <Label HorizontalExpand="True" Text="Loadout name:" />
             <LineEdit Name="LoadoutNameEdit"
                       HorizontalExpand="True"
                       PlaceHolder="My Loadout" />
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/CreateLoadoutPopup.xaml.cs b/Content.Client/_DEN/Lobby/UI/Loadouts/CreateLoadoutPopup.xaml.cs
index 8e4e0f109bd..3987e73ec02 100644
--- a/Content.Client/_DEN/Lobby/UI/Loadouts/CreateLoadoutPopup.xaml.cs
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/CreateLoadoutPopup.xaml.cs
@@ -17,13 +17,15 @@ public CreateLoadoutPopup(List<(Guid CategoryId, string CategoryName)> categorie
 
         _categories = categories;
 
-        var index = -1;
+        var index = 0;
 
         foreach (var category in categories)
         {
-            OptionsCategories.AddItem(category.CategoryName, index++);
+            OptionsCategories.AddItem(category.CategoryName, index);
+            index += 1;
         }
 
+        OptionsCategories.OnItemSelected += args => OptionsCategories.SelectId(args.Id);
         ButtonSubmit.OnPressed += _ => OnSubmitPressed();
     }
 
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryActions.xaml b/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryActions.xaml
new file mode 100644
index 00000000000..d6747b3ce99
--- /dev/null
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryActions.xaml
@@ -0,0 +1,29 @@
+<ContainerButton xmlns="https://spacestation14.io"
+              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+              xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
+              xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls">
+    <PanelContainer HorizontalExpand="True">
+        <PanelContainer.PanelOverride>
+            <graphics:StyleBoxFlat BackgroundColor="#2a2a35"/>
+        </PanelContainer.PanelOverride>
+        <BoxContainer VerticalAlignment="Center"
+                      Orientation="Horizontal"
+                      Margin="5">
+            <Label Name="LoadoutNameLabel"
+                   StyleClasses="TraitsEntryNameLabel"
+                   Text="Category actions"
+                   Margin="5 0 0 0"/>
+            <Control HorizontalExpand="True" />
+            <Button Name="ButtonEdit"
+                    Text="Edit Category"
+                    Margin="0 2 0 0"
+                    StyleClasses="OpenBoth"
+                    Access="Public"/>
+            <controls:ConfirmButton Name="ButtonDelete"
+                                    Text="Delete Category"
+                                    Margin="0 2 0 0"
+                                    StyleClasses="OpenLeft"
+                                    Access="Public"/>
+        </BoxContainer>
+    </PanelContainer>
+</ContainerButton>
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryActions.xaml.cs b/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryActions.xaml.cs
new file mode 100644
index 00000000000..50660151df3
--- /dev/null
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryActions.xaml.cs
@@ -0,0 +1,21 @@
+using Content.Shared._DEN.Loadout;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client._DEN.Lobby.UI.Loadouts;
+
+[GenerateTypedNameReferences]
+public sealed partial class DenCategoryActions : ContainerButton
+{
+    public event Action? OnTryProfileEdit;
+    public event Action? OnTryProfileDelete;
+
+    public DenCategoryActions()
+    {
+        RobustXamlLoader.Load(this);
+
+        ButtonEdit.OnPressed += _ => OnTryProfileEdit?.Invoke();
+        ButtonDelete.OnPressed += _ => OnTryProfileDelete?.Invoke();
+    }
+}
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryContainer.xaml b/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryContainer.xaml
index 46b6e8e9a37..5e97c75e1ee 100644
--- a/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryContainer.xaml
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryContainer.xaml
@@ -1,6 +1,7 @@
 <PanelContainer xmlns="https://spacestation14.io"
                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client">
+                xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
+                xmlns:loadouts="clr-namespace:Content.Client._DEN.Lobby.UI.Loadouts">
     <BoxContainer Orientation="Vertical"
                   HorizontalExpand="True"
                   Margin="0 0 0 8">
@@ -21,11 +22,14 @@
                                        SetSize="32 32"
                                        Modulate="#c7c7c7" />
 
-                        <Label Name="CategoryStatsLabel"
+                        <Label Name="CategoryWarningCount"
                                Text="1 warning"
                                StyleClasses="TraitsCategoryStatsLabel"
                                Margin="0 0 4 0"/>
                     </BoxContainer>
+                    <Label Name="CategoryLoadoutCount"
+                           StyleClasses="TraitsCategoryStatsLabel"
+                           Margin="0 0 4 0"/>
                     <Label Name="ExpandIcon"
                            Text="▶"
                            StyleClasses="TraitsCategoryExpandIcon"
@@ -52,7 +56,7 @@
                           Orientation="Vertical"
                           HorizontalExpand="True"
                           Margin="8 8">
-                <!-- <ui:DenLoadoutButtons /> -->
+                <loadouts:DenCategoryActions Name="CategoryActions" Access="Public" />
             </BoxContainer>
         </PanelContainer>
     </BoxContainer>
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryContainer.xaml.cs b/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryContainer.xaml.cs
index c604cb7e2cc..4a4cb5180c1 100644
--- a/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryContainer.xaml.cs
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryContainer.xaml.cs
@@ -20,6 +20,7 @@ public DenCategoryContainer(DenLoadoutCategory category,
 
         _categoryDefinition = category;
 
+        RefreshCategoryName();
         RefreshCategoryColor();
         RefreshLoadoutContainers(loadouts);
 
@@ -27,6 +28,11 @@ public DenCategoryContainer(DenLoadoutCategory category,
         UpdateExpandedState();
     }
 
+    private void RefreshCategoryName()
+    {
+        CategoryNameLabel.Text = _categoryDefinition.Name;
+    }
+
     private void RefreshCategoryColor()
     {
         var color = Color.TryFromHex(_categoryDefinition.Color);
@@ -42,10 +48,18 @@ private void RefreshLoadoutContainers(List<DenLoadout> loadoutProfiles)
         foreach (var loadoutProfile in loadoutProfiles)
         {
             var container = new DenLoadoutContainer(loadoutProfile);
+            container.Visible = true;
 
-            AddChild(container);
+            LoadoutContainer.AddChild(container);
             _loadouts.Add(container);
         }
+
+        var countText = $"{_loadouts.Count} loadout";
+
+        if (_loadouts.Count != 1)
+            countText += "s";
+
+        CategoryLoadoutCount.Text = countText;
     }
 
     private void ToggleExpanded()
@@ -56,7 +70,7 @@ private void ToggleExpanded()
 
     private void UpdateExpandedState()
     {
-        LoadoutContainer.Visible = _isExpanded;
+        ContentPanel.Visible = _isExpanded;
         ExpandIcon.Text = _isExpanded ? "▼" : "▶";
     }
 }
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.xaml.cs b/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.xaml.cs
index 606eccacaa0..73933fe491f 100644
--- a/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.xaml.cs
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.xaml.cs
@@ -3,6 +3,7 @@
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
 namespace Content.Client._DEN.Lobby.UI.Loadouts;
@@ -17,15 +18,13 @@ public sealed partial class DenLoadoutTab : ContainerButton
     private HumanoidCharacterProfile? _profile;
 
     private readonly List<(Guid CategoryId, string CategoryName)> _popupCategories;
-    private List<DenCategoryContainer> _categories = new();
+    private readonly List<DenCategoryContainer> _categories = [];
 
     public DenLoadoutTab()
     {
         RobustXamlLoader.Load(this);
 
-        _popupCategories = new();
-        RefreshCategories();
-
+        _popupCategories = new List<(Guid CategoryId, string CategoryName)>();
         ButtonCreateCategory.OnPressed += _ => OnTryCreateCategory();
         ButtonCreateLoadout.OnPressed += _ => OnTryCreateLoadout();
     }
@@ -37,6 +36,11 @@ public void RefreshCategories()
         if (_profile?.LoadoutCategories == null)
             return;
 
+        var canCreateLoadout = _profile.LoadoutCategories.Count == 0;
+        ButtonCreateLoadout.Disabled = canCreateLoadout;
+        ButtonCreateLoadout.ToolTip = !canCreateLoadout ? "You need at least one category." : null;
+        ButtonCreateLoadout.TooltipDelay = 0.5f;
+
         foreach (var categoryContainer in _categories)
         {
             categoryContainer.Orphan();
@@ -59,44 +63,70 @@ public void RefreshCategories()
             }
 
             var categoryContainer = new DenCategoryContainer(category, profiles);
+            categoryContainer.CategoryActions.OnTryProfileEdit += () => TryProfileEdit(category);
+            categoryContainer.CategoryActions.OnTryProfileDelete += () => TryProfileDelete(category);
 
             _categories.Add(categoryContainer);
             LoadoutContainer.AddChild(categoryContainer);
         }
     }
 
+    private void TryProfileEdit(DenLoadoutCategory category)
+    {
+        OnTryCreateCategory(category);
+    }
+
+    private void TryProfileDelete(DenLoadoutCategory category)
+    {
+        throw new NotImplementedException();
+    }
+
     public void SetProfile(HumanoidCharacterProfile? newProfile)
     {
         _profile = newProfile;
+        RefreshCategories();
     }
 
-    private void OnTryCreateCategory()
+    private void OnTryCreateCategory(DenLoadoutCategory? existingCategory = null)
     {
         if (_createCategoryPopup != null)
             return;
 
-        _createCategoryPopup = new CreateCategoryPopup();
+        _createCategoryPopup = new CreateCategoryPopup(existingCategory);
         _createCategoryPopup.OnSubmit += OnSubmitNewCategory;
-        _createCategoryPopup.OnClose += OnClose;
+        _createCategoryPopup.OnClose += OnCloseCategoryPopup;
         _createCategoryPopup.OpenCentered();
     }
 
     private void OnSubmitNewCategory(CategoryCreationRequest request)
     {
-        var guid = Guid.NewGuid();
+        if (string.IsNullOrEmpty(request.CategoryName))
+            return;
+
+        var guid = request.ExistingCategoryId ?? Guid.NewGuid();
+        var priority = GetNextCategoryPriority();
+        var members = new HashSet<Guid>();
+
+        if (_profile?.LoadoutCategories.TryGetValue(guid, out var loadout) == true)
+        {
+            priority = loadout.Priority;
+            members.UnionWith(loadout.Members);
+        }
+
         var category = new DenLoadoutCategory
         {
             Id = guid,
             Color = request.CategoryColor.ToHex(),
             Name = request.CategoryName,
-            Priority = GetNextCategoryPriority()
+            Priority = priority,
+            Members = members
         };
 
         _profile = _profile?.WithLoadoutCategory(guid, category);
         OnPreferenceUpdated?.Invoke(_profile);
 
         RefreshCategories();
-        OnClose();
+        OnCloseCategoryPopup();
     }
 
     private void OnTryCreateLoadout()
@@ -106,26 +136,30 @@ private void OnTryCreateLoadout()
 
         _createLoadoutPopup = new CreateLoadoutPopup(_popupCategories);
         _createLoadoutPopup.OnSubmit += OnSubmitNewLoadout;
-        _createLoadoutPopup.OnClose += OnClose;
+        _createLoadoutPopup.OnClose += OnCloseLoadoutPopup;
         _createLoadoutPopup.OpenCentered();
     }
 
     private void OnSubmitNewLoadout(LoadoutCreationRequest request)
     {
+        if (string.IsNullOrEmpty(request.LoadoutName))
+            return;
+
         var guid = Guid.NewGuid();
         var loadout = new DenLoadout
         {
             Id = guid,
             Name = request.LoadoutName,
             LoadoutCategory = request.CategoryId,
-            Priority = GetNextLoadoutPriority(request.CategoryId)
+            Priority = GetNextLoadoutPriority(request.CategoryId),
+            Loadouts = new HashSet<ProtoId<EntityLoadoutPrototype>>()
         };
 
         _profile = _profile?.WithNewLoadout(guid, request.CategoryId, loadout);
         OnPreferenceUpdated?.Invoke(_profile);
 
         RefreshCategories();
-        OnClose();
+        OnCloseLoadoutPopup();
     }
 
     private int GetNextCategoryPriority()
@@ -139,21 +173,25 @@ private int GetNextCategoryPriority()
 
     private int GetNextLoadoutPriority(Guid categoryId)
     {
-        if (_profile == null)
-            return 0;
-
-        var category = _profile.LoadoutCategories.Values.FirstOrNull(c => c.Id == categoryId);
+        var maybeCategory = _profile?.LoadoutCategories.Values
+            .FirstOrNull(c => c.Id == categoryId);
 
-        if (category == null)
+        if (maybeCategory is not { } category)
             return 0;
 
-        var memberCount = category.Value.Members.Count;
+        var memberCount = category.Members.Count;
         return memberCount + 1;
     }
 
-    private void OnClose()
+    private void OnCloseCategoryPopup()
     {
         _createCategoryPopup?.Orphan();
         _createCategoryPopup = null;
     }
+
+    private void OnCloseLoadoutPopup()
+    {
+        _createLoadoutPopup?.Orphan();
+        _createLoadoutPopup = null;
+    }
 }
diff --git a/Content.Server.Database/DenModel.cs b/Content.Server.Database/DenModel.cs
new file mode 100644
index 00000000000..25a86bf9d18
--- /dev/null
+++ b/Content.Server.Database/DenModel.cs
@@ -0,0 +1,75 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Content.Server.Database;
+
+public static class DenModel
+{
+    [Table("denu_settings")]
+    public sealed class DenuSettings
+    {
+        [Key]
+        [Column("player_user_id")]
+        public Guid PlayerUserId { get; set; }
+
+        [Column("settings", TypeName = "jsonb")]
+        public string SettingsJson { get; set; } = "{}";
+
+        public Player Player { get; set; } = null!;
+    }
+
+    public class LoadoutProfile
+    {
+        public int Id { get; set; }
+
+        public int LoadoutCategoryId {  get; set; }
+
+        public LoadoutCategory Category { get; set; } = null!;
+
+        public Guid LoadoutUniqueId { get; set; }
+
+        [MaxLength(256)]
+        public string LoadoutName { get; set; } = string.Empty;
+
+        public int Priority { get; set; }
+
+        public List<string> LoadoutItems { get; set; } = new();
+    }
+
+    public class JobLoadout
+    {
+        public int Id { get; set; }
+
+        public int ProfileId { get; set; }
+
+        public Profile Profile { get; set; } = null!;
+
+        [MaxLength(256)]
+        public string JobName { get; set; } = string.Empty;
+
+        public List<Guid> LoadoutProfiles { get; set; } = new();
+    }
+
+    public class LoadoutCategory
+    {
+        public int Id { get; set; }
+
+        public int ProfileId { get; set; }
+
+        public Profile Profile { get; set; } = null!;
+
+        public Guid CategoryUniqueId { get; set; }
+
+        public int Priority { get; set; }
+
+        [MaxLength(256)]
+        public string CategoryName { get; set; } = string.Empty;
+
+        [MaxLength(10)]
+        public string CategoryColor { get; set; } = string.Empty;
+
+        public List<LoadoutProfile> Members { get; set; } = new();
+    }
+}
diff --git a/Content.Server.Database/DenuModel.cs b/Content.Server.Database/DenuModel.cs
deleted file mode 100644
index 903f3222cef..00000000000
--- a/Content.Server.Database/DenuModel.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace Content.Server.Database;
-
-public static class DenuModel
-{
-    [Table("denu_settings")]
-    public sealed class DenuSettings
-    {
-        [Key]
-        [Column("player_user_id")]
-        public Guid PlayerUserId { get; set; }
-
-        [Column("settings", TypeName = "jsonb")]
-        public string SettingsJson { get; set; } = "{}";
-
-        public Player Player { get; set; } = null!;
-    }
-}
diff --git a/Content.Server.Database/Model.cs b/Content.Server.Database/Model.cs
index c5865c41845..0eac27189b7 100644
--- a/Content.Server.Database/Model.cs
+++ b/Content.Server.Database/Model.cs
@@ -49,7 +49,7 @@ protected ServerDbContext(DbContextOptions options) : base(options)
         public DbSet<AdminMessage> AdminMessages { get; set; } = null!;
         public DbSet<RoleWhitelist> RoleWhitelists { get; set; } = null!;
         public DbSet<BanTemplate> BanTemplate { get; set; } = null!;
-        public DbSet<DenuModel.DenuSettings> DenuSettings { get; set; } = null!;
+        public DbSet<DenModel.DenuSettings> DenuSettings { get; set; } = null!;
         public DbSet<IPIntelCache> IPIntelCache { get; set; } = null!;
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)
@@ -62,10 +62,10 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 .HasIndex(p => new {p.Slot, PrefsId = p.PreferenceId})
                 .IsUnique();
 
-            modelBuilder.Entity<DenuModel.DenuSettings>()
+            modelBuilder.Entity<DenModel.DenuSettings>()
                 .HasOne(d => d.Player)
                 .WithOne()
-                .HasForeignKey<DenuModel.DenuSettings>(d => d.PlayerUserId)
+                .HasForeignKey<DenModel.DenuSettings>(d => d.PlayerUserId)
                 .HasPrincipalKey<Player>(p => p.UserId)
                 .OnDelete(DeleteBehavior.Cascade);
 
@@ -96,19 +96,19 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 .IsRequired();
 
             // DEN Start: Custom Loadout System
-            modelBuilder.Entity<JobLoadout>()
+            modelBuilder.Entity<DenModel.JobLoadout>()
                 .HasOne(e => e.Profile)
                 .WithMany(e => e.JobLoadouts)
                 .HasForeignKey(e => e.ProfileId)
                 .IsRequired();
 
-            modelBuilder.Entity<LoadoutCategory>()
+            modelBuilder.Entity<DenModel.LoadoutCategory>()
                 .HasOne(e => e.Profile)
                 .WithMany(e => e.LoadoutCategories)
                 .HasForeignKey(e => e.ProfileId)
                 .IsRequired();
 
-            modelBuilder.Entity<LoadoutProfile>()
+            modelBuilder.Entity<DenModel.LoadoutProfile>()
                 .HasOne(e => e.Category)
                 .WithMany(e => e.Members)
                 .HasForeignKey(e => e.LoadoutCategoryId)
@@ -379,9 +379,9 @@ public class Profile
         public List<Antag> Antags { get; } = new();
         public List<Trait> Traits { get; } = new();
 
-        public List<JobLoadout> JobLoadouts { get; } = new();
+        public List<DenModel.JobLoadout> JobLoadouts { get; } = new();
 
-        public List<LoadoutCategory> LoadoutCategories { get; } = new();
+        public List<DenModel.LoadoutCategory> LoadoutCategories { get; } = new();
 
         public List<ProfileRoleLoadout> Loadouts { get; } = new();
 
@@ -507,63 +507,6 @@ public class ProfileLoadout
 
     #endregion
 
-    #region Den Loadouts
-
-    public class LoadoutProfile
-    {
-        public int Id { get; set; }
-
-        public int LoadoutCategoryId {  get; set; }
-
-        public LoadoutCategory Category { get; set; } = null!;
-
-        public Guid LoadoutUniqueId { get; set; }
-
-        [MaxLength(256)]
-        public string LoadoutName { get; set; } = string.Empty;
-
-        public int Priority { get; set; }
-
-        public List<string> LoadoutItems { get; set; } = new();
-    }
-
-    public class JobLoadout
-    {
-        public int Id { get; set; }
-
-        public int ProfileId { get; set; }
-
-        public Profile Profile { get; set; } = null!;
-
-        [MaxLength(256)]
-        public string JobName { get; set; } = string.Empty;
-
-        public List<Guid> LoadoutProfiles { get; set; } = new();
-    }
-
-    public class LoadoutCategory
-    {
-        public int Id { get; set; }
-
-        public int ProfileId { get; set; }
-
-        public Profile Profile { get; set; } = null!;
-
-        public Guid CategoryUniqueId { get; set; }
-
-        public int Priority { get; set; }
-
-        [MaxLength(256)]
-        public string CategoryName { get; set; } = string.Empty;
-
-        [MaxLength(10)]
-        public string CategoryColor { get; set; } = string.Empty;
-
-        public List<LoadoutProfile> Members { get; set; } = new();
-    }
-
-    #endregion
-
     public enum DbPreferenceUnavailableMode
     {
         // These enum values HAVE to match the ones in PreferenceUnavailableMode in Shared.
diff --git a/Content.Server/Database/ServerDbBase.cs b/Content.Server/Database/ServerDbBase.cs
index 73c2dd2ef7c..42e59e98dbc 100644
--- a/Content.Server/Database/ServerDbBase.cs
+++ b/Content.Server/Database/ServerDbBase.cs
@@ -307,7 +307,7 @@ private Profile ConvertProfiles(HumanoidCharacterProfile humanoid, int slot, Pro
 
             foreach (var (guid, category) in humanoid.LoadoutCategories)
             {
-                var profiles = new List<LoadoutProfile>();
+                var profiles = new List<DenModel.LoadoutProfile>();
 
                 foreach (var loadoutProfileId in category.Members)
                 {
@@ -318,7 +318,7 @@ private Profile ConvertProfiles(HumanoidCharacterProfile humanoid, int slot, Pro
                         .Select(i => i.Id)
                         .ToList();
 
-                    var dbProfile = new LoadoutProfile
+                    var dbProfile = new DenModel.LoadoutProfile
                     {
                         LoadoutUniqueId = loadoutProfileId,
                         LoadoutItems = items,
@@ -329,7 +329,7 @@ private Profile ConvertProfiles(HumanoidCharacterProfile humanoid, int slot, Pro
                     profiles.Add(dbProfile);
                 }
 
-                var dbCategory = new LoadoutCategory
+                var dbCategory = new DenModel.LoadoutCategory
                 {
                     CategoryUniqueId = guid,
                     CategoryColor = category.Color,
@@ -343,7 +343,7 @@ private Profile ConvertProfiles(HumanoidCharacterProfile humanoid, int slot, Pro
 
             foreach (var (job, loadoutIds) in humanoid.JobLoadouts)
             {
-                var jobLoadout = new JobLoadout
+                var jobLoadout = new DenModel.JobLoadout
                 {
                     LoadoutProfiles = loadoutIds.ToList(),
                     JobName = job
@@ -1613,7 +1613,7 @@ public async Task SaveDenuSettingsJsonAsync(Guid userId, string settingsJson)
 
             if (record == null)
             {
-                record = new DenuModel.DenuSettings
+                record = new DenModel.DenuSettings
                 {
                     PlayerUserId = userId,
                     SettingsJson = settingsJson

From 6abb8a8e8f0c33558ff402aeffef44e931fca9bc Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Fri, 10 Jul 2026 09:10:31 -0300
Subject: [PATCH 09/14] tomorrow is fix delete day

---
 .../UI/HumanoidProfileEditor.Loadouts.cs      |   2 +-
 .../UI/Loadouts/CreateLoadoutPopup.xaml.cs    |  45 +++--
 .../Lobby/UI/Loadouts/DenCategoryActions.xaml |   2 +-
 .../UI/Loadouts/DenCategoryActions.xaml.cs    |   8 +-
 .../UI/Loadouts/DenCategoryContainer.xaml     |   3 +-
 .../UI/Loadouts/DenCategoryContainer.xaml.cs  |  66 ++++--
 .../UI/Loadouts/DenLoadoutContainer.xaml      |  19 +-
 .../UI/Loadouts/DenLoadoutContainer.xaml.cs   |  29 +++
 .../UI/Loadouts/DenLoadoutTab.JobLoadouts.cs  |  11 +
 .../Loadouts/DenLoadoutTab.LoadoutProfile.cs  |  17 ++
 .../UI/Loadouts/DenLoadoutTab.Loadouts.cs     |  11 +
 .../Lobby/UI/Loadouts/DenLoadoutTab.Popups.cs | 105 ++++++++++
 .../Lobby/UI/Loadouts/DenLoadoutTab.xaml.cs   | 189 +++++++-----------
 .../Preferences/HumanoidCharacterProfile.cs   |  46 ++++-
 14 files changed, 386 insertions(+), 167 deletions(-)
 create mode 100644 Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.JobLoadouts.cs
 create mode 100644 Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.LoadoutProfile.cs
 create mode 100644 Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.Loadouts.cs
 create mode 100644 Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.Popups.cs

diff --git a/Content.Client/_DEN/Lobby/UI/HumanoidProfileEditor.Loadouts.cs b/Content.Client/_DEN/Lobby/UI/HumanoidProfileEditor.Loadouts.cs
index 0491ae27b52..9dcdaa7f043 100644
--- a/Content.Client/_DEN/Lobby/UI/HumanoidProfileEditor.Loadouts.cs
+++ b/Content.Client/_DEN/Lobby/UI/HumanoidProfileEditor.Loadouts.cs
@@ -8,9 +8,9 @@ private void RefreshDenLoadouts()
         {
             Profile = profile;
             SetDirty();
-            RefreshDenLoadouts();
         };
 
         DenLoadouts.SetProfile(Profile);
+        DenLoadouts.RefreshCategories();
     }
 }
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/CreateLoadoutPopup.xaml.cs b/Content.Client/_DEN/Lobby/UI/Loadouts/CreateLoadoutPopup.xaml.cs
index 3987e73ec02..9d4615b5589 100644
--- a/Content.Client/_DEN/Lobby/UI/Loadouts/CreateLoadoutPopup.xaml.cs
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/CreateLoadoutPopup.xaml.cs
@@ -1,6 +1,9 @@
+using System.Linq;
 using Content.Client.UserInterface.Controls;
+using Content.Shared._DEN.Loadout;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Utility;
 
 namespace Content.Client._DEN.Lobby.UI.Loadouts;
 
@@ -9,38 +12,53 @@ public sealed partial class CreateLoadoutPopup : FancyWindow
 {
     public event Action<LoadoutCreationRequest>? OnSubmit;
 
-    private List<(Guid CategoryId, string CategoryName)> _categories;
-
-    public CreateLoadoutPopup(List<(Guid CategoryId, string CategoryName)> categories)
+    public CreateLoadoutPopup(Dictionary<Guid, DenLoadoutCategory> categories, DenLoadout? maybeLoadout = null)
     {
         RobustXamlLoader.Load(this);
 
-        _categories = categories;
-
         var index = 0;
 
-        foreach (var category in categories)
+        if (maybeLoadout is { } existingLoadout)
+        {
+            var categoryId = existingLoadout.LoadoutCategory;
+            var category = categories[categoryId];
+
+            LoadoutNameEdit.Text = existingLoadout.Name;
+            OptionsCategories.AddItem(category.Name, index);
+            OptionsCategories.SetItemMetadata(index, categoryId);
+
+            index += 1;
+        }
+
+        foreach (var (categoryId, category) in categories)
         {
-            OptionsCategories.AddItem(category.CategoryName, index);
+            if (maybeLoadout is { } loadoutProfile
+                && categoryId == loadoutProfile.LoadoutCategory)
+                continue;
+
+            OptionsCategories.AddItem(category.Name);
+            OptionsCategories.SetItemMetadata(index, categoryId);
+
             index += 1;
         }
 
         OptionsCategories.OnItemSelected += args => OptionsCategories.SelectId(args.Id);
-        ButtonSubmit.OnPressed += _ => OnSubmitPressed();
+        ButtonSubmit.OnPressed += _ => OnSubmitPressed(maybeLoadout);
     }
 
-    private void OnSubmitPressed()
+    private void OnSubmitPressed(DenLoadout? maybeLoadout = null)
     {
-        var categorySelected = OptionsCategories.SelectedId;
+        var categorySelectedIndex = OptionsCategories.SelectedId;
+        var categorySelectedId = (Guid) (OptionsCategories.GetItemMetadata(categorySelectedIndex) ?? Guid.Empty);
 
-        if (categorySelected >= _categories.Count)
+        if (categorySelectedId == Guid.Empty)
             return;
 
-        var category = _categories[categorySelected];
         var request = new LoadoutCreationRequest
         {
+            ExistingLoadoutId = maybeLoadout?.Id ?? null,
             LoadoutName = LoadoutNameEdit.Text,
-            CategoryId = category.CategoryId
+            CategoryId = categorySelectedId,
         };
 
         OnSubmit?.Invoke(request);
@@ -49,6 +67,7 @@ private void OnSubmitPressed()
 
 public record struct LoadoutCreationRequest
 {
+    public Guid? ExistingLoadoutId { get; set; }
     public string LoadoutName { get; set; }
     public Guid CategoryId { get; set; }
 }
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryActions.xaml b/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryActions.xaml
index d6747b3ce99..7a58c64a306 100644
--- a/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryActions.xaml
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryActions.xaml
@@ -17,7 +17,7 @@
             <Button Name="ButtonEdit"
                     Text="Edit Category"
                     Margin="0 2 0 0"
-                    StyleClasses="OpenBoth"
+                    StyleClasses="OpenRight"
                     Access="Public"/>
             <controls:ConfirmButton Name="ButtonDelete"
                                     Text="Delete Category"
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryActions.xaml.cs b/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryActions.xaml.cs
index 50660151df3..400ae09971e 100644
--- a/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryActions.xaml.cs
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryActions.xaml.cs
@@ -8,14 +8,14 @@ namespace Content.Client._DEN.Lobby.UI.Loadouts;
 [GenerateTypedNameReferences]
 public sealed partial class DenCategoryActions : ContainerButton
 {
-    public event Action? OnTryProfileEdit;
-    public event Action? OnTryProfileDelete;
+    public event Action? OnTryCategoryEdit;
+    public event Action? OnTryCategoryDelete;
 
     public DenCategoryActions()
     {
         RobustXamlLoader.Load(this);
 
-        ButtonEdit.OnPressed += _ => OnTryProfileEdit?.Invoke();
-        ButtonDelete.OnPressed += _ => OnTryProfileDelete?.Invoke();
+        ButtonEdit.OnPressed += _ => OnTryCategoryEdit?.Invoke();
+        ButtonDelete.OnPressed += _ => OnTryCategoryDelete?.Invoke();
     }
 }
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryContainer.xaml b/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryContainer.xaml
index 5e97c75e1ee..c601d879cbe 100644
--- a/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryContainer.xaml
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryContainer.xaml
@@ -55,7 +55,8 @@
             <BoxContainer Name="LoadoutContainer"
                           Orientation="Vertical"
                           HorizontalExpand="True"
-                          Margin="8 8">
+                          Margin="8 8"
+                          SeparationOverride="6">
                 <loadouts:DenCategoryActions Name="CategoryActions" Access="Public" />
             </BoxContainer>
         </PanelContainer>
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryContainer.xaml.cs b/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryContainer.xaml.cs
index 4a4cb5180c1..ffa6b493e51 100644
--- a/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryContainer.xaml.cs
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryContainer.xaml.cs
@@ -9,16 +9,21 @@ namespace Content.Client._DEN.Lobby.UI.Loadouts;
 [GenerateTypedNameReferences]
 public sealed partial class DenCategoryContainer : PanelContainer
 {
-    private DenLoadoutCategory _categoryDefinition;
-    private List<DenLoadoutContainer> _loadouts = new();
-    private bool _isExpanded;
+    public event Action<DenLoadout, DenLoadoutAction>? OnClickLoadoutAction;
+    public Dictionary<Guid, DenLoadoutContainer> LoadoutContainers = new();
+    public List<DenLoadout> Loadouts = new();
+    public bool IsExpanded;
+
+    private DenLoadoutCategory _category;
 
     public DenCategoryContainer(DenLoadoutCategory category,
         List<DenLoadout> loadouts)
     {
         RobustXamlLoader.Load(this);
 
-        _categoryDefinition = category;
+        Loadouts = loadouts;
+        _category = category;
+
 
         RefreshCategoryName();
         RefreshCategoryColor();
@@ -28,14 +33,24 @@ public DenCategoryContainer(DenLoadoutCategory category,
         UpdateExpandedState();
     }
 
+    public void UpdateCategory(DenLoadoutCategory category, List<DenLoadout> loadouts)
+    {
+        RefreshCategoryName();
+        RefreshCategoryColor();
+        RefreshLoadoutContainers(loadouts);
+
+        Loadouts = loadouts;
+        _category = category;
+    }
+
     private void RefreshCategoryName()
     {
-        CategoryNameLabel.Text = _categoryDefinition.Name;
+        CategoryNameLabel.Text = _category.Name;
     }
 
     private void RefreshCategoryColor()
     {
-        var color = Color.TryFromHex(_categoryDefinition.Color);
+        var color = Color.TryFromHex(_category.Color);
 
         AccentBar.PanelOverride = new StyleBoxFlat
         {
@@ -47,30 +62,47 @@ private void RefreshLoadoutContainers(List<DenLoadout> loadoutProfiles)
     {
         foreach (var loadoutProfile in loadoutProfiles)
         {
-            var container = new DenLoadoutContainer(loadoutProfile);
-            container.Visible = true;
-
-            LoadoutContainer.AddChild(container);
-            _loadouts.Add(container);
+            DenLoadoutContainer container;
+
+            if (LoadoutContainers.TryGetValue(loadoutProfile.Id, out var cachedContainer))
+            {
+                container = cachedContainer;
+            }
+            else
+            {
+                container = new DenLoadoutContainer(loadoutProfile);
+                container.Visible = true;
+                container.OnClickLoadoutAction += DoLoadoutAction;
+
+                LoadoutContainers.Add(loadoutProfile.Id, container);
+                LoadoutContainer.AddChild(container);
+            }
+
+            container.UpdateLoadout(loadoutProfile);
         }
 
-        var countText = $"{_loadouts.Count} loadout";
+        var countText = $"{LoadoutContainers.Count} loadout";
 
-        if (_loadouts.Count != 1)
+        if (LoadoutContainers.Count != 1)
             countText += "s";
 
         CategoryLoadoutCount.Text = countText;
     }
 
-    private void ToggleExpanded()
+    private void DoLoadoutAction(DenLoadout profile, DenLoadoutAction action)
+    {
+        OnClickLoadoutAction?.Invoke(profile, action);
+    }
+
+    public void ToggleExpanded()
     {
-        _isExpanded = !_isExpanded;
+        IsExpanded = !IsExpanded;
         UpdateExpandedState();
     }
 
     private void UpdateExpandedState()
     {
-        ContentPanel.Visible = _isExpanded;
-        ExpandIcon.Text = _isExpanded ? "▼" : "▶";
+        ContentPanel.Visible = IsExpanded;
+        ExpandIcon.Text = IsExpanded ? "▼" : "▶";
     }
 }
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutContainer.xaml b/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutContainer.xaml
index 1126a1b172b..da08bc6d911 100644
--- a/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutContainer.xaml
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutContainer.xaml
@@ -1,6 +1,7 @@
 <ContainerButton xmlns="https://spacestation14.io"
               xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-              xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client">
+              xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
+              xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls">
     <PanelContainer HorizontalExpand="True">
         <PanelContainer.PanelOverride>
             <graphics:StyleBoxFlat BackgroundColor="#2a2a35"/>
@@ -13,18 +14,22 @@
                    Text="My Loadout"
                    Margin="5 0 0 0"/>
             <Control HorizontalExpand="True" />
-            <Button Text="Edit Jobs"
+            <Button Name="ButtonEditJobs"
+                    Text="Edit Jobs"
                     Margin="0 2 0 0"
                     StyleClasses="OpenRight"/>
-            <Button Text="Edit Loadout"
+            <Button Name="ButtonEditLoadouts"
+                    Text="Edit Loadouts"
                     Margin="0 2 0 0"
                     StyleClasses="OpenBoth"/>
-            <Button Text="Rename"
+            <Button Name="ButtonEditLoadoutProfile"
+                    Text="Edit Loadout Profile"
                     Margin="0 2 0 0"
                     StyleClasses="OpenBoth"/>
-            <Button Text="Delete"
-                    Margin="0 2 0 0"
-                    StyleClasses="OpenLeft"/>
+            <controls:ConfirmButton Name="ButtonDeleteProfile"
+                                    Text="Delete Loadout Profile"
+                                    Margin="0 2 0 0"
+                                    StyleClasses="OpenLeft"/>
         </BoxContainer>
     </PanelContainer>
 </ContainerButton>
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutContainer.xaml.cs b/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutContainer.xaml.cs
index 637ea220deb..6d7cdcf1cfa 100644
--- a/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutContainer.xaml.cs
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutContainer.xaml.cs
@@ -8,6 +8,8 @@ namespace Content.Client._DEN.Lobby.UI.Loadouts;
 [GenerateTypedNameReferences]
 public sealed partial class DenLoadoutContainer : ContainerButton
 {
+    public event Action<DenLoadout, DenLoadoutAction>? OnClickLoadoutAction;
+
     private DenLoadout _loadout;
 
     public DenLoadoutContainer(DenLoadout loadoutProfile)
@@ -18,5 +20,32 @@ public DenLoadoutContainer(DenLoadout loadoutProfile)
 
         LoadoutNameLabel.Text = loadoutProfile.Name;
 
+        ButtonEditJobs.OnPressed += _ =>
+            OnClickLoadoutAction?.Invoke(_loadout, DenLoadoutAction.EditJobs);
+        ButtonEditLoadouts.OnPressed += _ =>
+            OnClickLoadoutAction?.Invoke(_loadout, DenLoadoutAction.EditLoadouts);
+        ButtonEditLoadoutProfile.OnPressed += _ =>
+            OnClickLoadoutAction?.Invoke(_loadout, DenLoadoutAction.EditLoadoutProfile);
+        ButtonDeleteProfile.OnPressed += _ =>
+            OnClickLoadoutAction?.Invoke(_loadout, DenLoadoutAction.DeleteLoadoutProfile);
     }
+
+    public void UpdateLoadout(DenLoadout loadout)
+    {
+        if (_loadout == loadout)
+            return;
+
+        if (loadout.Name != _loadout.Name)
+            LoadoutNameLabel.Text = loadout.Name;
+
+        _loadout = loadout;
+    }
+}
+
+public enum DenLoadoutAction
+{
+    EditJobs,
+    EditLoadouts,
+    EditLoadoutProfile,
+    DeleteLoadoutProfile
 }
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.JobLoadouts.cs b/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.JobLoadouts.cs
new file mode 100644
index 00000000000..142cba912e1
--- /dev/null
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.JobLoadouts.cs
@@ -0,0 +1,11 @@
+using Content.Shared._DEN.Loadout;
+
+namespace Content.Client._DEN.Lobby.UI.Loadouts;
+
+public sealed partial class DenLoadoutTab
+{
+    public void OnClickEditJobLoadouts(DenLoadout loadout)
+    {
+
+    }
+}
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.LoadoutProfile.cs b/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.LoadoutProfile.cs
new file mode 100644
index 00000000000..df1ea5a03e6
--- /dev/null
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.LoadoutProfile.cs
@@ -0,0 +1,17 @@
+using Content.Shared._DEN.Loadout;
+
+namespace Content.Client._DEN.Lobby.UI.Loadouts;
+
+public sealed partial class DenLoadoutTab
+{
+    public void OnClickEditLoadoutProfile(DenLoadout loadout)
+    {
+        OnTryCreateLoadout(loadout);
+    }
+
+    public void OnClickDeleteLoadoutProfile(DenLoadout loadout)
+    {
+        var profile = _profile?.WithoutLoadoutProfile(loadout);
+        SetDirty(profile);
+    }
+}
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.Loadouts.cs b/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.Loadouts.cs
new file mode 100644
index 00000000000..396fcfebef6
--- /dev/null
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.Loadouts.cs
@@ -0,0 +1,11 @@
+using Content.Shared._DEN.Loadout;
+
+namespace Content.Client._DEN.Lobby.UI.Loadouts;
+
+public sealed partial class DenLoadoutTab
+{
+    public void OnClickEditLoadouts(DenLoadout loadout)
+    {
+
+    }
+}
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.Popups.cs b/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.Popups.cs
new file mode 100644
index 00000000000..40d36ec3504
--- /dev/null
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.Popups.cs
@@ -0,0 +1,105 @@
+using Content.Shared._DEN.Loadout;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client._DEN.Lobby.UI.Loadouts;
+
+public sealed partial class DenLoadoutTab
+{
+    private void OnTryCreateCategory(DenLoadoutCategory? existingCategory = null)
+    {
+        if (_createCategoryPopup != null)
+            return;
+
+        _createCategoryPopup = new CreateCategoryPopup(existingCategory);
+        _createCategoryPopup.OnSubmit += OnSubmitNewCategory;
+        _createCategoryPopup.OnClose += OnCloseCategoryPopup;
+        _createCategoryPopup.OpenCentered();
+    }
+
+    private void OnSubmitNewCategory(CategoryCreationRequest request)
+    {
+        if (string.IsNullOrEmpty(request.CategoryName))
+            return;
+
+        var guid = request.ExistingCategoryId ?? Guid.NewGuid();
+        var priority = 100;
+        var members = new HashSet<Guid>();
+
+        if (_profile?.LoadoutCategories.TryGetValue(guid, out var loadout) == true)
+        {
+            priority = loadout.Priority;
+            members.UnionWith(loadout.Members);
+        }
+
+        var category = new DenLoadoutCategory
+        {
+            Id = guid,
+            Color = request.CategoryColor.ToHex(),
+            Name = request.CategoryName,
+            Priority = priority,
+            Members = members
+        };
+
+        _profile = _profile?.WithLoadoutCategory(guid, category);
+        OnPreferenceUpdated?.Invoke(_profile);
+
+        RefreshCategories();
+        OnCloseCategoryPopup();
+    }
+
+    private void OnTryCreateLoadout(DenLoadout? loadout = null)
+    {
+        if (_createLoadoutPopup != null)
+            return;
+
+        _createLoadoutPopup = new CreateLoadoutPopup(_popupCategories, loadout);
+        _createLoadoutPopup.OnSubmit += OnSubmitNewLoadout;
+        _createLoadoutPopup.OnClose += OnCloseLoadoutPopup;
+        _createLoadoutPopup.OpenCentered();
+    }
+
+    private void OnSubmitNewLoadout(LoadoutCreationRequest request)
+    {
+        if (string.IsNullOrEmpty(request.LoadoutName))
+            return;
+
+        var guid = Guid.NewGuid();
+        var priority = 100;
+        var loadouts = new HashSet<ProtoId<EntityLoadoutPrototype>>();
+
+        if (request.ExistingLoadoutId is { } loadoutProfileId
+            && _profile?.LoadoutProfiles.TryGetValue(loadoutProfileId, out var loadoutProfile) == true)
+        {
+            guid = loadoutProfile.Id;
+            priority = loadoutProfile.Priority;
+            loadouts.UnionWith(loadoutProfile.Loadouts);
+        }
+
+        var loadout = new DenLoadout
+        {
+            Id = guid,
+            Name = request.LoadoutName,
+            LoadoutCategory = request.CategoryId,
+            Priority = priority,
+            Loadouts = loadouts,
+        };
+
+        _profile = _profile?.WithLoadoutProfile(guid, request.CategoryId, loadout);
+        SetDirty(_profile);
+
+        RefreshCategories();
+        OnCloseLoadoutPopup();
+    }
+
+    private void OnCloseCategoryPopup()
+    {
+        _createCategoryPopup?.Orphan();
+        _createCategoryPopup = null;
+    }
+
+    private void OnCloseLoadoutPopup()
+    {
+        _createLoadoutPopup?.Orphan();
+        _createLoadoutPopup = null;
+    }
+}
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.xaml.cs b/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.xaml.cs
index 73933fe491f..4bc5a4549cf 100644
--- a/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.xaml.cs
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.xaml.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using Content.Shared._DEN.Loadout;
 using Content.Shared.Preferences;
 using Robust.Client.AutoGenerated;
@@ -17,14 +18,14 @@ public sealed partial class DenLoadoutTab : ContainerButton
     private CreateLoadoutPopup? _createLoadoutPopup;
     private HumanoidCharacterProfile? _profile;
 
-    private readonly List<(Guid CategoryId, string CategoryName)> _popupCategories;
-    private readonly List<DenCategoryContainer> _categories = [];
+    private Dictionary<Guid, DenLoadoutCategory> _popupCategories;
+    private Dictionary<Guid, DenCategoryContainer> _categories = [];
 
     public DenLoadoutTab()
     {
         RobustXamlLoader.Load(this);
 
-        _popupCategories = new List<(Guid CategoryId, string CategoryName)>();
+        _popupCategories = new Dictionary<Guid, DenLoadoutCategory>();
         ButtonCreateCategory.OnPressed += _ => OnTryCreateCategory();
         ButtonCreateLoadout.OnPressed += _ => OnTryCreateLoadout();
     }
@@ -38,160 +39,122 @@ public void RefreshCategories()
 
         var canCreateLoadout = _profile.LoadoutCategories.Count == 0;
         ButtonCreateLoadout.Disabled = canCreateLoadout;
-        ButtonCreateLoadout.ToolTip = !canCreateLoadout ? "You need at least one category." : null;
-        ButtonCreateLoadout.TooltipDelay = 0.5f;
-
-        foreach (var categoryContainer in _categories)
+        foreach (var (categoryId, categoryContainer) in _categories)
         {
-            categoryContainer.Orphan();
+            if (!_profile.LoadoutCategories.ContainsKey(categoryId))
+                categoryContainer.Orphan();
         }
 
-        _categories.Clear();
+        var newCategories = new Dictionary<Guid, DenCategoryContainer>();
 
         foreach (var (categoryId, category) in _profile.LoadoutCategories)
         {
-            _popupCategories.Add((categoryId, category.Name));
+            var categoryContainer = CreateCategory(categoryId);
 
-            var profiles = new List<DenLoadout>();
+            if (categoryContainer == null)
+                continue;
 
-            foreach (var loadoutId in category.Members)
-            {
-                if (!_profile.LoadoutProfiles.TryGetValue(loadoutId, out var loadout))
-                    continue;
+            var orphanList = categoryContainer.LoadoutContainers
+                .Where(c => !category.Members.Contains(c.Key))
+                .ToList();
 
-                profiles.Add(loadout);
+            foreach (var orphan in orphanList)
+            {
+                categoryContainer.LoadoutContainers.Remove(orphan.Key);
+                orphan.Value.Orphan();
             }
 
-            var categoryContainer = new DenCategoryContainer(category, profiles);
-            categoryContainer.CategoryActions.OnTryProfileEdit += () => TryProfileEdit(category);
-            categoryContainer.CategoryActions.OnTryProfileDelete += () => TryProfileDelete(category);
+            if (orphanList.Count > 0)
+                categoryContainer.UpdateCategory(category, categoryContainer.Loadouts);
 
-            _categories.Add(categoryContainer);
-            LoadoutContainer.AddChild(categoryContainer);
+            newCategories.Add(categoryId, categoryContainer);
         }
-    }
 
-    private void TryProfileEdit(DenLoadoutCategory category)
-    {
-        OnTryCreateCategory(category);
+        _categories = newCategories;
     }
 
-    private void TryProfileDelete(DenLoadoutCategory category)
+    private DenCategoryContainer? CreateCategory(Guid categoryId)
     {
-        throw new NotImplementedException();
-    }
+        if (_profile == null
+            || !_profile.LoadoutCategories.TryGetValue(categoryId, out var category))
+            return null;
 
-    public void SetProfile(HumanoidCharacterProfile? newProfile)
-    {
-        _profile = newProfile;
-        RefreshCategories();
-    }
+        _popupCategories = new Dictionary<Guid, DenLoadoutCategory>(_profile.LoadoutCategories);
 
-    private void OnTryCreateCategory(DenLoadoutCategory? existingCategory = null)
-    {
-        if (_createCategoryPopup != null)
-            return;
+        var profiles = new List<DenLoadout>();
 
-        _createCategoryPopup = new CreateCategoryPopup(existingCategory);
-        _createCategoryPopup.OnSubmit += OnSubmitNewCategory;
-        _createCategoryPopup.OnClose += OnCloseCategoryPopup;
-        _createCategoryPopup.OpenCentered();
-    }
+        foreach (var loadoutId in category.Members)
+        {
+            if (!_profile.LoadoutProfiles.TryGetValue(loadoutId, out var loadout))
+                continue;
 
-    private void OnSubmitNewCategory(CategoryCreationRequest request)
-    {
-        if (string.IsNullOrEmpty(request.CategoryName))
-            return;
+            profiles.Add(loadout);
+        }
 
-        var guid = request.ExistingCategoryId ?? Guid.NewGuid();
-        var priority = GetNextCategoryPriority();
-        var members = new HashSet<Guid>();
+        DenCategoryContainer categoryContainer;
 
-        if (_profile?.LoadoutCategories.TryGetValue(guid, out var loadout) == true)
+        if (_categories.TryGetValue(category.Id, out var cachedContainer))
         {
-            priority = loadout.Priority;
-            members.UnionWith(loadout.Members);
+            categoryContainer = cachedContainer;
+            categoryContainer.UpdateCategory(category, profiles);
         }
-
-        var category = new DenLoadoutCategory
+        else
         {
-            Id = guid,
-            Color = request.CategoryColor.ToHex(),
-            Name = request.CategoryName,
-            Priority = priority,
-            Members = members
-        };
-
-        _profile = _profile?.WithLoadoutCategory(guid, category);
-        OnPreferenceUpdated?.Invoke(_profile);
-
-        RefreshCategories();
-        OnCloseCategoryPopup();
-    }
+            categoryContainer = new DenCategoryContainer(category, profiles);
+            categoryContainer.CategoryActions.OnTryCategoryEdit += () => TryCategoryEdit(category);
+            categoryContainer.CategoryActions.OnTryCategoryDelete += () => TryCategoryDelete(category);
+            categoryContainer.OnClickLoadoutAction += OnClickLoadoutAction;
 
-    private void OnTryCreateLoadout()
-    {
-        if (_createLoadoutPopup != null)
-            return;
+            LoadoutContainer.AddChild(categoryContainer);
+            _categories.Add(category.Id, categoryContainer);
+        }
 
-        _createLoadoutPopup = new CreateLoadoutPopup(_popupCategories);
-        _createLoadoutPopup.OnSubmit += OnSubmitNewLoadout;
-        _createLoadoutPopup.OnClose += OnCloseLoadoutPopup;
-        _createLoadoutPopup.OpenCentered();
+        return categoryContainer;
     }
 
-    private void OnSubmitNewLoadout(LoadoutCreationRequest request)
+    private void OnClickLoadoutAction(DenLoadout loadout, DenLoadoutAction loadoutAction)
     {
-        if (string.IsNullOrEmpty(request.LoadoutName))
-            return;
-
-        var guid = Guid.NewGuid();
-        var loadout = new DenLoadout
+        switch (loadoutAction)
         {
-            Id = guid,
-            Name = request.LoadoutName,
-            LoadoutCategory = request.CategoryId,
-            Priority = GetNextLoadoutPriority(request.CategoryId),
-            Loadouts = new HashSet<ProtoId<EntityLoadoutPrototype>>()
-        };
-
-        _profile = _profile?.WithNewLoadout(guid, request.CategoryId, loadout);
-        OnPreferenceUpdated?.Invoke(_profile);
-
-        RefreshCategories();
-        OnCloseLoadoutPopup();
+            case DenLoadoutAction.EditJobs:
+                OnClickEditJobLoadouts(loadout);
+                break;
+            case DenLoadoutAction.EditLoadouts:
+                OnClickEditLoadouts(loadout);
+                break;
+            case DenLoadoutAction.EditLoadoutProfile:
+                OnClickEditLoadoutProfile(loadout);
+                break;
+            case DenLoadoutAction.DeleteLoadoutProfile:
+                OnClickDeleteLoadoutProfile(loadout);
+                break;
+            default:
+                throw new ArgumentOutOfRangeException(nameof(loadoutAction), loadoutAction, null);
+        }
     }
 
-    private int GetNextCategoryPriority()
+    private void TryCategoryEdit(DenLoadoutCategory category)
     {
-        if (_profile == null)
-            return 0;
-
-        var loadoutCategoryCount = _profile.LoadoutCategories.Count;
-        return loadoutCategoryCount + 1;
+        OnTryCreateCategory(category);
     }
 
-    private int GetNextLoadoutPriority(Guid categoryId)
+    private void TryCategoryDelete(DenLoadoutCategory category)
     {
-        var maybeCategory = _profile?.LoadoutCategories.Values
-            .FirstOrNull(c => c.Id == categoryId);
-
-        if (maybeCategory is not { } category)
-            return 0;
+        if (_profile == null
+            || !_profile.LoadoutCategories.ContainsKey(category.Id))
+            return;
 
-        var memberCount = category.Members.Count;
-        return memberCount + 1;
+        _profile = _profile.WithoutLoadoutCategory(category);
+        SetDirty(_profile);
     }
 
-    private void OnCloseCategoryPopup()
+    private void SetDirty(HumanoidCharacterProfile? profile)
     {
-        _createCategoryPopup?.Orphan();
-        _createCategoryPopup = null;
+        OnPreferenceUpdated?.Invoke(profile);
     }
 
-    private void OnCloseLoadoutPopup()
+    public void SetProfile(HumanoidCharacterProfile? newProfile)
     {
-        _createLoadoutPopup?.Orphan();
-        _createLoadoutPopup = null;
+        _profile = newProfile;
     }
 }
diff --git a/Content.Shared/_DEN/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/_DEN/Preferences/HumanoidCharacterProfile.cs
index b8bed6967f8..0174adb2eee 100644
--- a/Content.Shared/_DEN/Preferences/HumanoidCharacterProfile.cs
+++ b/Content.Shared/_DEN/Preferences/HumanoidCharacterProfile.cs
@@ -141,33 +141,48 @@ public HumanoidCharacterProfile WithoutEntityTraitPreference(ProtoId<EntityTrait
         };
     }
 
-    public HumanoidCharacterProfile WithLoadoutProfile(Guid loadoutId, DenLoadout loadout)
+    public HumanoidCharacterProfile WithLoadoutProfile(Guid loadoutId, Guid categoryId, DenLoadout loadout)
     {
+        if (!_loadoutCategories.TryGetValue(categoryId, out var loadoutCategory))
+            return this;
+
+        var categories = new Dictionary<Guid, DenLoadoutCategory>(_loadoutCategories);
+
+        if (_loadoutProfiles.TryGetValue(loadoutId, out var profile)
+            && profile.LoadoutCategory != categoryId)
+        {
+            var category = categories[profile.LoadoutCategory];
+            category.Members.Remove(loadoutId);
+            categories[profile.LoadoutCategory] = category;
+        }
+
         var profiles = new Dictionary<Guid, DenLoadout>(_loadoutProfiles)
         {
             [loadoutId] = loadout,
         };
 
+        loadoutCategory.Members.Add(loadoutId);
+        categories[categoryId] = loadoutCategory;
+
         return new HumanoidCharacterProfile(this)
         {
-            _loadoutProfiles = profiles
+            _loadoutProfiles = profiles,
+            _loadoutCategories = categories,
         };
     }
 
-    public HumanoidCharacterProfile WithNewLoadout(Guid loadoutId, Guid categoryId, DenLoadout loadout)
+    public HumanoidCharacterProfile WithoutLoadoutProfile(DenLoadout loadout)
     {
-        if (!_loadoutCategories.TryGetValue(categoryId, out var loadoutCategory))
+        if (!_loadoutCategories.TryGetValue(loadout.LoadoutCategory, out var loadoutCategory))
             return this;
 
-        var profiles = new Dictionary<Guid, DenLoadout>(_loadoutProfiles)
-        {
-            [loadoutId] = loadout,
-        };
+        var profiles = new Dictionary<Guid, DenLoadout>(_loadoutProfiles);
+        profiles.Remove(loadout.Id);
 
         var categories = new Dictionary<Guid, DenLoadoutCategory>(_loadoutCategories);
-        loadoutCategory.Members.Add(loadoutId);
+        loadoutCategory.Members.Remove(loadout.Id);
 
-        categories[categoryId] = loadoutCategory;
+        categories[loadout.LoadoutCategory] = loadoutCategory;
 
         return new HumanoidCharacterProfile(this)
         {
@@ -189,6 +204,17 @@ public HumanoidCharacterProfile WithLoadoutCategory(Guid categoryId, DenLoadoutC
         };
     }
 
+    public HumanoidCharacterProfile WithoutLoadoutCategory(DenLoadoutCategory category)
+    {
+        var categories = new Dictionary<Guid, DenLoadoutCategory>(_loadoutCategories);
+        categories.Remove(category.Id);
+
+        return new HumanoidCharacterProfile(this)
+        {
+            _loadoutCategories = categories,
+        };
+    }
+
     public HumanoidCharacterProfile WithJobLoadout(ProtoId<JobPrototype> jobId, Guid loadoutId)
     {
         var jobLoadouts = new Dictionary<ProtoId<JobPrototype>, HashSet<Guid>>(_jobLoadouts);

From cbc56988131fe667ce9b236fef44c107d5129cc9 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Fri, 10 Jul 2026 09:42:28 -0300
Subject: [PATCH 10/14] fix things not saving correctly, categories not being
 updated, and prevent deleting a category while there's loadouts in it

---
 .../Lobby/UI/Loadouts/DenCategoryActions.xaml   |  1 +
 .../UI/Loadouts/DenCategoryActions.xaml.cs      |  6 +++++-
 .../UI/Loadouts/DenCategoryContainer.xaml.cs    | 17 ++++++++---------
 .../UI/Loadouts/DenLoadoutTab.LoadoutProfile.cs |  6 ++++--
 .../Lobby/UI/Loadouts/DenLoadoutTab.xaml.cs     |  4 +++-
 5 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryActions.xaml b/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryActions.xaml
index 7a58c64a306..861a40722e1 100644
--- a/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryActions.xaml
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryActions.xaml
@@ -23,6 +23,7 @@
                                     Text="Delete Category"
                                     Margin="0 2 0 0"
                                     StyleClasses="OpenLeft"
+                                    Disabled="True"
                                     Access="Public"/>
         </BoxContainer>
     </PanelContainer>
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryActions.xaml.cs b/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryActions.xaml.cs
index 400ae09971e..06f09df8c7a 100644
--- a/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryActions.xaml.cs
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryActions.xaml.cs
@@ -1,4 +1,3 @@
-using Content.Shared._DEN.Loadout;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
@@ -18,4 +17,9 @@ public DenCategoryActions()
         ButtonEdit.OnPressed += _ => OnTryCategoryEdit?.Invoke();
         ButtonDelete.OnPressed += _ => OnTryCategoryDelete?.Invoke();
     }
+
+    public void SetDeleteDisabled(bool deleteDisabled)
+    {
+        ButtonDelete.Disabled = deleteDisabled;
+    }
 }
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryContainer.xaml.cs b/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryContainer.xaml.cs
index ffa6b493e51..d6245868390 100644
--- a/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryContainer.xaml.cs
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryContainer.xaml.cs
@@ -24,9 +24,8 @@ public DenCategoryContainer(DenLoadoutCategory category,
         Loadouts = loadouts;
         _category = category;
 
-
-        RefreshCategoryName();
-        RefreshCategoryColor();
+        RefreshCategoryName(category);
+        RefreshCategoryColor(category);
         RefreshLoadoutContainers(loadouts);
 
         HeaderButton.OnPressed += _ => ToggleExpanded();
@@ -35,22 +34,22 @@ public DenCategoryContainer(DenLoadoutCategory category,
 
     public void UpdateCategory(DenLoadoutCategory category, List<DenLoadout> loadouts)
     {
-        RefreshCategoryName();
-        RefreshCategoryColor();
+        RefreshCategoryName(category);
+        RefreshCategoryColor(category);
         RefreshLoadoutContainers(loadouts);
 
         Loadouts = loadouts;
         _category = category;
     }
 
-    private void RefreshCategoryName()
+    private void RefreshCategoryName(DenLoadoutCategory category)
     {
-        CategoryNameLabel.Text = _category.Name;
+        CategoryNameLabel.Text = category.Name;
     }
 
-    private void RefreshCategoryColor()
+    private void RefreshCategoryColor(DenLoadoutCategory category)
     {
-        var color = Color.TryFromHex(_category.Color);
+        var color = Color.TryFromHex(category.Color);
 
         AccentBar.PanelOverride = new StyleBoxFlat
         {
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.LoadoutProfile.cs b/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.LoadoutProfile.cs
index df1ea5a03e6..d0a3ce2fc8b 100644
--- a/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.LoadoutProfile.cs
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.LoadoutProfile.cs
@@ -11,7 +11,9 @@ public void OnClickEditLoadoutProfile(DenLoadout loadout)
 
     public void OnClickDeleteLoadoutProfile(DenLoadout loadout)
     {
-        var profile = _profile?.WithoutLoadoutProfile(loadout);
-        SetDirty(profile);
+        _profile = _profile?.WithoutLoadoutProfile(loadout);
+        SetDirty(_profile);
+
+        RefreshCategories();
     }
 }
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.xaml.cs b/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.xaml.cs
index 4bc5a4549cf..b2426fadea2 100644
--- a/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.xaml.cs
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.xaml.cs
@@ -108,7 +108,8 @@ public void RefreshCategories()
             LoadoutContainer.AddChild(categoryContainer);
             _categories.Add(category.Id, categoryContainer);
         }
-
+        
+        categoryContainer.CategoryActions.SetDeleteDisabled(profiles.Count > 0);
         return categoryContainer;
     }
 
@@ -146,6 +147,7 @@ private void TryCategoryDelete(DenLoadoutCategory category)
 
         _profile = _profile.WithoutLoadoutCategory(category);
         SetDirty(_profile);
+        RefreshCategories();
     }
 
     private void SetDirty(HumanoidCharacterProfile? profile)

From c54aa0ea54da9aadf9038b5d122b199ade086957 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sat, 11 Jul 2026 18:42:52 -0300
Subject: [PATCH 11/14] scary

---
 .../Lobby/UI/HumanoidProfileEditor.xaml       |  2 +-
 .../UI/Loadouts/DenLoadoutTab.Loadouts.cs     | 11 ---
 .../_DEN/Lobby/UI/Loadouts/DenLoadoutTab.xaml | 60 ----------------
 ...> LoadoutProfilesContainer.JobLoadouts.cs} |  2 +-
 ...oadoutProfilesContainer.LoadoutProfile.cs} |  6 +-
 .../LoadoutProfilesContainer.Loadouts.cs      | 12 ++++
 ....cs => LoadoutProfilesContainer.Popups.cs} |  7 +-
 .../UI/Loadouts/LoadoutProfilesContainer.xaml | 71 +++++++++++++++++++
 ...ml.cs => LoadoutProfilesContainer.xaml.cs} | 14 ++--
 .../{ => Popups}/CreateCategoryPopup.xaml     |  0
 .../{ => Popups}/CreateCategoryPopup.xaml.cs  |  2 +-
 .../{ => Popups}/CreateLoadoutPopup.xaml      |  0
 .../{ => Popups}/CreateLoadoutPopup.xaml.cs   |  4 +-
 .../DenCategoryActions.xaml                   |  0
 .../DenCategoryActions.xaml.cs                |  2 +-
 .../DenCategoryContainer.xaml                 |  2 +-
 .../DenCategoryContainer.xaml.cs              | 14 ++--
 .../DenLoadoutContainer.xaml                  |  0
 .../DenLoadoutContainer.xaml.cs               |  2 +-
 .../Subcontainers/LoadoutItemSelection.xaml   | 20 ++++++
 .../LoadoutItemSelection.xaml.cs              | 15 ++++
 21 files changed, 146 insertions(+), 100 deletions(-)
 delete mode 100644 Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.Loadouts.cs
 delete mode 100644 Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.xaml
 rename Content.Client/_DEN/Lobby/UI/Loadouts/{DenLoadoutTab.JobLoadouts.cs => LoadoutProfilesContainer.JobLoadouts.cs} (75%)
 rename Content.Client/_DEN/Lobby/UI/Loadouts/{DenLoadoutTab.LoadoutProfile.cs => LoadoutProfilesContainer.LoadoutProfile.cs} (59%)
 create mode 100644 Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.Loadouts.cs
 rename Content.Client/_DEN/Lobby/UI/Loadouts/{DenLoadoutTab.Popups.cs => LoadoutProfilesContainer.Popups.cs} (91%)
 create mode 100644 Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.xaml
 rename Content.Client/_DEN/Lobby/UI/Loadouts/{DenLoadoutTab.xaml.cs => LoadoutProfilesContainer.xaml.cs} (94%)
 rename Content.Client/_DEN/Lobby/UI/Loadouts/{ => Popups}/CreateCategoryPopup.xaml (100%)
 rename Content.Client/_DEN/Lobby/UI/Loadouts/{ => Popups}/CreateCategoryPopup.xaml.cs (95%)
 rename Content.Client/_DEN/Lobby/UI/Loadouts/{ => Popups}/CreateLoadoutPopup.xaml (100%)
 rename Content.Client/_DEN/Lobby/UI/Loadouts/{ => Popups}/CreateLoadoutPopup.xaml.cs (95%)
 rename Content.Client/_DEN/Lobby/UI/Loadouts/{ => Subcontainers}/DenCategoryActions.xaml (100%)
 rename Content.Client/_DEN/Lobby/UI/Loadouts/{ => Subcontainers}/DenCategoryActions.xaml.cs (91%)
 rename Content.Client/_DEN/Lobby/UI/Loadouts/{ => Subcontainers}/DenCategoryContainer.xaml (98%)
 rename Content.Client/_DEN/Lobby/UI/Loadouts/{ => Subcontainers}/DenCategoryContainer.xaml.cs (88%)
 rename Content.Client/_DEN/Lobby/UI/Loadouts/{ => Subcontainers}/DenLoadoutContainer.xaml (100%)
 rename Content.Client/_DEN/Lobby/UI/Loadouts/{ => Subcontainers}/DenLoadoutContainer.xaml.cs (95%)
 create mode 100644 Content.Client/_DEN/Lobby/UI/Loadouts/Subcontainers/LoadoutItemSelection.xaml
 create mode 100644 Content.Client/_DEN/Lobby/UI/Loadouts/Subcontainers/LoadoutItemSelection.xaml.cs

diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml
index 2417b64779a..81334cc762d 100644
--- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml
+++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml
@@ -132,7 +132,7 @@
                     <humanoid:MarkingPicker Name="Markings" HorizontalExpand="True" VerticalExpand="True" />
                 </BoxContainer>
                 <BoxContainer Name="LoadoutTab" Orientation="Vertical" Margin="10">
-                    <loadouts:DenLoadoutTab Name="DenLoadouts" HorizontalExpand="True" VerticalExpand="True" />
+                    <loadouts:LoadoutProfilesContainer Name="DenLoadouts" HorizontalExpand="True" VerticalExpand="True" />
                 </BoxContainer>
             </TabContainer>
         </BoxContainer>
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.Loadouts.cs b/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.Loadouts.cs
deleted file mode 100644
index 396fcfebef6..00000000000
--- a/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.Loadouts.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Content.Shared._DEN.Loadout;
-
-namespace Content.Client._DEN.Lobby.UI.Loadouts;
-
-public sealed partial class DenLoadoutTab
-{
-    public void OnClickEditLoadouts(DenLoadout loadout)
-    {
-
-    }
-}
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.xaml b/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.xaml
deleted file mode 100644
index 160405c3395..00000000000
--- a/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.xaml
+++ /dev/null
@@ -1,60 +0,0 @@
-<loadouts:DenLoadoutTab xmlns="https://spacestation14.io"
-                  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                  xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
-                  xmlns:loadouts="clr-namespace:Content.Client._DEN.Lobby.UI.Loadouts">
-    <BoxContainer Orientation="Vertical"
-                  SeparationOverride="0">
-        <PanelContainer SetHeight="50"
-                        HorizontalExpand="True"
-                        StyleClasses="ChatPanel">
-            <BoxContainer Margin="5 0 5 0">
-                <Label Text="Loadouts"
-                       Margin="15 0 0 0"
-                       StyleClasses="LabelHeading" />
-                <Control HorizontalExpand="True"></Control>
-                <Button Name="ButtonCreateCategory"
-                        Text="Create New Category"
-                        SetHeight="35"
-                        StyleClasses="OpenRight" />
-                <Button Name="ButtonCreateLoadout"
-                        Text="Create New Loadout"
-                        SetHeight="35"
-                        StyleClasses="OpenLeft" />
-            </BoxContainer>
-        </PanelContainer>
-        <PanelContainer Name="WarningsContainer"
-                        SetHeight="50"
-                        HorizontalExpand="True"
-                        StyleClasses="ChatPanel"
-                        Margin="0 5 0 0"
-                        Visible="False">
-            <BoxContainer Margin="5 0 5 0">
-                <RichTextLabel Name="WarningsText" Text="You have [color=#ffa21f]2[/color] unresolved loadout issues. "  Margin="15 0 0 0" />
-                <Control HorizontalExpand="True"></Control>
-                <Button Name="ButtonViewWarnings"
-                        Text="View Warnings"
-                        SetHeight="35" />
-            </BoxContainer>
-        </PanelContainer>
-        <PanelContainer SetHeight="3" HorizontalExpand="True" Margin="0 10 0 6">
-            <PanelContainer.PanelOverride>
-                <gfx:StyleBoxFlat BackgroundColor="#393947" />
-            </PanelContainer.PanelOverride>
-        </PanelContainer>
-        <BoxContainer HorizontalExpand="True"
-                      VerticalExpand="True"
-                      Orientation="Vertical"
-                      Margin="0 5 0 0">
-            <PanelContainer HorizontalExpand="True"
-                            VerticalExpand="True">
-                <PanelContainer.PanelOverride>
-                    <gfx:StyleBoxFlat BorderColor="#1F1F23" BorderThickness="1" />
-                </PanelContainer.PanelOverride>
-                <BoxContainer Name="LoadoutContainer"
-                              Orientation="Vertical">
-                    <!-- <ui:DenCategoryContainer /> -->
-                </BoxContainer>
-            </PanelContainer>
-        </BoxContainer>
-    </BoxContainer>
-</loadouts:DenLoadoutTab>
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.JobLoadouts.cs b/Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.JobLoadouts.cs
similarity index 75%
rename from Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.JobLoadouts.cs
rename to Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.JobLoadouts.cs
index 142cba912e1..43f71e6a9c6 100644
--- a/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.JobLoadouts.cs
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.JobLoadouts.cs
@@ -2,7 +2,7 @@
 
 namespace Content.Client._DEN.Lobby.UI.Loadouts;
 
-public sealed partial class DenLoadoutTab
+public sealed partial class LoadoutProfilesContainer
 {
     public void OnClickEditJobLoadouts(DenLoadout loadout)
     {
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.LoadoutProfile.cs b/Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.LoadoutProfile.cs
similarity index 59%
rename from Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.LoadoutProfile.cs
rename to Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.LoadoutProfile.cs
index d0a3ce2fc8b..776ed7af475 100644
--- a/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.LoadoutProfile.cs
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.LoadoutProfile.cs
@@ -2,14 +2,14 @@
 
 namespace Content.Client._DEN.Lobby.UI.Loadouts;
 
-public sealed partial class DenLoadoutTab
+public sealed partial class LoadoutProfilesContainer
 {
-    public void OnClickEditLoadoutProfile(DenLoadout loadout)
+    private void OnClickEditLoadoutProfile(DenLoadout loadout)
     {
         OnTryCreateLoadout(loadout);
     }
 
-    public void OnClickDeleteLoadoutProfile(DenLoadout loadout)
+    private void OnClickDeleteLoadoutProfile(DenLoadout loadout)
     {
         _profile = _profile?.WithoutLoadoutProfile(loadout);
         SetDirty(_profile);
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.Loadouts.cs b/Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.Loadouts.cs
new file mode 100644
index 00000000000..00993db58a3
--- /dev/null
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.Loadouts.cs
@@ -0,0 +1,12 @@
+using Content.Shared._DEN.Loadout;
+
+namespace Content.Client._DEN.Lobby.UI.Loadouts;
+
+public sealed partial class LoadoutProfilesContainer
+{
+    private void OnClickEditLoadouts(DenLoadout loadout)
+    {
+        LoadoutItemSelection.Visible = !LoadoutContainer.Visible;
+        LoadoutProfileSelection.Visible = !LoadoutContainer.Visible;
+    }
+}
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.Popups.cs b/Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.Popups.cs
similarity index 91%
rename from Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.Popups.cs
rename to Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.Popups.cs
index 40d36ec3504..d6777058071 100644
--- a/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.Popups.cs
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.Popups.cs
@@ -1,16 +1,17 @@
+using Content.Client._DEN.Lobby.UI.Loadouts.Popups;
 using Content.Shared._DEN.Loadout;
 using Robust.Shared.Prototypes;
 
 namespace Content.Client._DEN.Lobby.UI.Loadouts;
 
-public sealed partial class DenLoadoutTab
+public sealed partial class LoadoutProfilesContainer
 {
     private void OnTryCreateCategory(DenLoadoutCategory? existingCategory = null)
     {
         if (_createCategoryPopup != null)
             return;
 
-        _createCategoryPopup = new CreateCategoryPopup(existingCategory);
+        _createCategoryPopup = new Popups.CreateCategoryPopup(existingCategory);
         _createCategoryPopup.OnSubmit += OnSubmitNewCategory;
         _createCategoryPopup.OnClose += OnCloseCategoryPopup;
         _createCategoryPopup.OpenCentered();
@@ -52,7 +53,7 @@ private void OnTryCreateLoadout(DenLoadout? loadout = null)
         if (_createLoadoutPopup != null)
             return;
 
-        _createLoadoutPopup = new CreateLoadoutPopup(_popupCategories, loadout);
+        _createLoadoutPopup = new Popups.CreateLoadoutPopup(_popupCategories, loadout);
         _createLoadoutPopup.OnSubmit += OnSubmitNewLoadout;
         _createLoadoutPopup.OnClose += OnCloseLoadoutPopup;
         _createLoadoutPopup.OpenCentered();
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.xaml b/Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.xaml
new file mode 100644
index 00000000000..728e2de9b6d
--- /dev/null
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.xaml
@@ -0,0 +1,71 @@
+<loadouts:LoadoutProfilesContainer xmlns="https://spacestation14.io"
+                                   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                                   xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
+                                   xmlns:loadouts="clr-namespace:Content.Client._DEN.Lobby.UI.Loadouts"
+                                   xmlns:subcontainers="clr-namespace:Content.Client._DEN.Lobby.UI.Loadouts.Subcontainers">
+    <BoxContainer HorizontalExpand="True"
+                  VerticalExpand="True">
+        <subcontainers:LoadoutItemSelection Name="LoadoutItemSelection"
+                                       HorizontalExpand="True"
+                                       VerticalExpand="True"
+                                       Visible="True"/>
+        <BoxContainer Name="LoadoutProfileSelection"
+                      Orientation="Vertical"
+                      HorizontalExpand="True"
+                      SeparationOverride="0"
+                      Visible="False">
+            <PanelContainer SetHeight="50"
+                            HorizontalExpand="True"
+                            StyleClasses="ChatPanel">
+                <BoxContainer Margin="5 0 5 0">
+                    <Label Text="Loadouts"
+                           Margin="15 0 0 0"
+                           StyleClasses="LabelHeading" />
+                    <Control HorizontalExpand="True"></Control>
+                    <Button Name="ButtonCreateCategory"
+                            Text="Create New Category"
+                            SetHeight="35"
+                            StyleClasses="OpenRight" />
+                    <Button Name="ButtonCreateLoadout"
+                            Text="Create New Loadout"
+                            SetHeight="35"
+                            StyleClasses="OpenLeft" />
+                </BoxContainer>
+            </PanelContainer>
+            <PanelContainer Name="WarningsContainer"
+                            SetHeight="50"
+                            HorizontalExpand="True"
+                            StyleClasses="ChatPanel"
+                            Margin="0 5 0 0"
+                            Visible="False">
+                <BoxContainer Margin="5 0 5 0">
+                    <RichTextLabel Name="WarningsText" Text="You have [color=#ffa21f]2[/color] unresolved loadout issues. "  Margin="15 0 0 0" />
+                    <Control HorizontalExpand="True"></Control>
+                    <Button Name="ButtonViewWarnings"
+                            Text="View Warnings"
+                            SetHeight="35" />
+                </BoxContainer>
+            </PanelContainer>
+            <PanelContainer SetHeight="3" HorizontalExpand="True" Margin="0 10 0 6">
+                <PanelContainer.PanelOverride>
+                    <gfx:StyleBoxFlat BackgroundColor="#393947" />
+                </PanelContainer.PanelOverride>
+            </PanelContainer>
+            <BoxContainer HorizontalExpand="True"
+                          VerticalExpand="True"
+                          Orientation="Vertical"
+                          Margin="0 5 0 0">
+                <PanelContainer HorizontalExpand="True"
+                                VerticalExpand="True">
+                    <PanelContainer.PanelOverride>
+                        <gfx:StyleBoxFlat BorderColor="#1F1F23" BorderThickness="1" />
+                    </PanelContainer.PanelOverride>
+                    <BoxContainer Name="LoadoutContainer"
+                                  Orientation="Vertical">
+                        <!-- <ui:DenCategoryContainer /> -->
+                    </BoxContainer>
+                </PanelContainer>
+            </BoxContainer>
+        </BoxContainer>
+    </BoxContainer>
+</loadouts:LoadoutProfilesContainer>
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.xaml.cs b/Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.xaml.cs
similarity index 94%
rename from Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.xaml.cs
rename to Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.xaml.cs
index b2426fadea2..c052db07b62 100644
--- a/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutTab.xaml.cs
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.xaml.cs
@@ -1,27 +1,26 @@
 using System.Linq;
+using Content.Client._DEN.Lobby.UI.Loadouts.Subcontainers;
 using Content.Shared._DEN.Loadout;
 using Content.Shared.Preferences;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Utility;
 
 namespace Content.Client._DEN.Lobby.UI.Loadouts;
 
 [GenerateTypedNameReferences]
-public sealed partial class DenLoadoutTab : ContainerButton
+public sealed partial class LoadoutProfilesContainer : BoxContainer
 {
     public event Action<HumanoidCharacterProfile?>? OnPreferenceUpdated;
 
-    private CreateCategoryPopup? _createCategoryPopup;
-    private CreateLoadoutPopup? _createLoadoutPopup;
+    private Popups.CreateCategoryPopup? _createCategoryPopup;
+    private Popups.CreateLoadoutPopup? _createLoadoutPopup;
     private HumanoidCharacterProfile? _profile;
 
     private Dictionary<Guid, DenLoadoutCategory> _popupCategories;
     private Dictionary<Guid, DenCategoryContainer> _categories = [];
 
-    public DenLoadoutTab()
+    public LoadoutProfilesContainer()
     {
         RobustXamlLoader.Load(this);
 
@@ -39,6 +38,7 @@ public void RefreshCategories()
 
         var canCreateLoadout = _profile.LoadoutCategories.Count == 0;
         ButtonCreateLoadout.Disabled = canCreateLoadout;
+
         foreach (var (categoryId, categoryContainer) in _categories)
         {
             if (!_profile.LoadoutCategories.ContainsKey(categoryId))
@@ -108,7 +108,7 @@ public void RefreshCategories()
             LoadoutContainer.AddChild(categoryContainer);
             _categories.Add(category.Id, categoryContainer);
         }
-        
+
         categoryContainer.CategoryActions.SetDeleteDisabled(profiles.Count > 0);
         return categoryContainer;
     }
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/CreateCategoryPopup.xaml b/Content.Client/_DEN/Lobby/UI/Loadouts/Popups/CreateCategoryPopup.xaml
similarity index 100%
rename from Content.Client/_DEN/Lobby/UI/Loadouts/CreateCategoryPopup.xaml
rename to Content.Client/_DEN/Lobby/UI/Loadouts/Popups/CreateCategoryPopup.xaml
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/CreateCategoryPopup.xaml.cs b/Content.Client/_DEN/Lobby/UI/Loadouts/Popups/CreateCategoryPopup.xaml.cs
similarity index 95%
rename from Content.Client/_DEN/Lobby/UI/Loadouts/CreateCategoryPopup.xaml.cs
rename to Content.Client/_DEN/Lobby/UI/Loadouts/Popups/CreateCategoryPopup.xaml.cs
index b77920b95fa..e39a19bd78b 100644
--- a/Content.Client/_DEN/Lobby/UI/Loadouts/CreateCategoryPopup.xaml.cs
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/Popups/CreateCategoryPopup.xaml.cs
@@ -3,7 +3,7 @@
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.XAML;
 
-namespace Content.Client._DEN.Lobby.UI.Loadouts;
+namespace Content.Client._DEN.Lobby.UI.Loadouts.Popups;
 
 [GenerateTypedNameReferences]
 public sealed partial class CreateCategoryPopup : FancyWindow
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/CreateLoadoutPopup.xaml b/Content.Client/_DEN/Lobby/UI/Loadouts/Popups/CreateLoadoutPopup.xaml
similarity index 100%
rename from Content.Client/_DEN/Lobby/UI/Loadouts/CreateLoadoutPopup.xaml
rename to Content.Client/_DEN/Lobby/UI/Loadouts/Popups/CreateLoadoutPopup.xaml
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/CreateLoadoutPopup.xaml.cs b/Content.Client/_DEN/Lobby/UI/Loadouts/Popups/CreateLoadoutPopup.xaml.cs
similarity index 95%
rename from Content.Client/_DEN/Lobby/UI/Loadouts/CreateLoadoutPopup.xaml.cs
rename to Content.Client/_DEN/Lobby/UI/Loadouts/Popups/CreateLoadoutPopup.xaml.cs
index 9d4615b5589..949ed23a135 100644
--- a/Content.Client/_DEN/Lobby/UI/Loadouts/CreateLoadoutPopup.xaml.cs
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/Popups/CreateLoadoutPopup.xaml.cs
@@ -1,11 +1,9 @@
-using System.Linq;
 using Content.Client.UserInterface.Controls;
 using Content.Shared._DEN.Loadout;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Utility;
 
-namespace Content.Client._DEN.Lobby.UI.Loadouts;
+namespace Content.Client._DEN.Lobby.UI.Loadouts.Popups;
 
 [GenerateTypedNameReferences]
 public sealed partial class CreateLoadoutPopup : FancyWindow
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryActions.xaml b/Content.Client/_DEN/Lobby/UI/Loadouts/Subcontainers/DenCategoryActions.xaml
similarity index 100%
rename from Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryActions.xaml
rename to Content.Client/_DEN/Lobby/UI/Loadouts/Subcontainers/DenCategoryActions.xaml
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryActions.xaml.cs b/Content.Client/_DEN/Lobby/UI/Loadouts/Subcontainers/DenCategoryActions.xaml.cs
similarity index 91%
rename from Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryActions.xaml.cs
rename to Content.Client/_DEN/Lobby/UI/Loadouts/Subcontainers/DenCategoryActions.xaml.cs
index 06f09df8c7a..7747346f44c 100644
--- a/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryActions.xaml.cs
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/Subcontainers/DenCategoryActions.xaml.cs
@@ -2,7 +2,7 @@
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 
-namespace Content.Client._DEN.Lobby.UI.Loadouts;
+namespace Content.Client._DEN.Lobby.UI.Loadouts.Subcontainers;
 
 [GenerateTypedNameReferences]
 public sealed partial class DenCategoryActions : ContainerButton
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryContainer.xaml b/Content.Client/_DEN/Lobby/UI/Loadouts/Subcontainers/DenCategoryContainer.xaml
similarity index 98%
rename from Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryContainer.xaml
rename to Content.Client/_DEN/Lobby/UI/Loadouts/Subcontainers/DenCategoryContainer.xaml
index c601d879cbe..25ed262a7e1 100644
--- a/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryContainer.xaml
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/Subcontainers/DenCategoryContainer.xaml
@@ -1,7 +1,7 @@
 <PanelContainer xmlns="https://spacestation14.io"
                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                 xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
-                xmlns:loadouts="clr-namespace:Content.Client._DEN.Lobby.UI.Loadouts">
+                xmlns:loadouts="clr-namespace:Content.Client._DEN.Lobby.UI.Loadouts.Subcontainers">
     <BoxContainer Orientation="Vertical"
                   HorizontalExpand="True"
                   Margin="0 0 0 8">
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryContainer.xaml.cs b/Content.Client/_DEN/Lobby/UI/Loadouts/Subcontainers/DenCategoryContainer.xaml.cs
similarity index 88%
rename from Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryContainer.xaml.cs
rename to Content.Client/_DEN/Lobby/UI/Loadouts/Subcontainers/DenCategoryContainer.xaml.cs
index d6245868390..e3655ea6781 100644
--- a/Content.Client/_DEN/Lobby/UI/Loadouts/DenCategoryContainer.xaml.cs
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/Subcontainers/DenCategoryContainer.xaml.cs
@@ -4,15 +4,15 @@
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 
-namespace Content.Client._DEN.Lobby.UI.Loadouts;
+namespace Content.Client._DEN.Lobby.UI.Loadouts.Subcontainers;
 
 [GenerateTypedNameReferences]
 public sealed partial class DenCategoryContainer : PanelContainer
 {
     public event Action<DenLoadout, DenLoadoutAction>? OnClickLoadoutAction;
-    public Dictionary<Guid, DenLoadoutContainer> LoadoutContainers = new();
-    public List<DenLoadout> Loadouts = new();
-    public bool IsExpanded;
+    public readonly Dictionary<Guid, DenLoadoutContainer> LoadoutContainers = new();
+    public List<DenLoadout> Loadouts;
+    private bool _isExpanded;
 
     private DenLoadoutCategory _category;
 
@@ -95,13 +95,13 @@ private void DoLoadoutAction(DenLoadout profile, DenLoadoutAction action)
 
     public void ToggleExpanded()
     {
-        IsExpanded = !IsExpanded;
+        _isExpanded = !_isExpanded;
         UpdateExpandedState();
     }
 
     private void UpdateExpandedState()
     {
-        ContentPanel.Visible = IsExpanded;
-        ExpandIcon.Text = IsExpanded ? "▼" : "▶";
+        ContentPanel.Visible = _isExpanded;
+        ExpandIcon.Text = _isExpanded ? "▼" : "▶";
     }
 }
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutContainer.xaml b/Content.Client/_DEN/Lobby/UI/Loadouts/Subcontainers/DenLoadoutContainer.xaml
similarity index 100%
rename from Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutContainer.xaml
rename to Content.Client/_DEN/Lobby/UI/Loadouts/Subcontainers/DenLoadoutContainer.xaml
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutContainer.xaml.cs b/Content.Client/_DEN/Lobby/UI/Loadouts/Subcontainers/DenLoadoutContainer.xaml.cs
similarity index 95%
rename from Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutContainer.xaml.cs
rename to Content.Client/_DEN/Lobby/UI/Loadouts/Subcontainers/DenLoadoutContainer.xaml.cs
index 6d7cdcf1cfa..3d1b7b0cae2 100644
--- a/Content.Client/_DEN/Lobby/UI/Loadouts/DenLoadoutContainer.xaml.cs
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/Subcontainers/DenLoadoutContainer.xaml.cs
@@ -3,7 +3,7 @@
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 
-namespace Content.Client._DEN.Lobby.UI.Loadouts;
+namespace Content.Client._DEN.Lobby.UI.Loadouts.Subcontainers;
 
 [GenerateTypedNameReferences]
 public sealed partial class DenLoadoutContainer : ContainerButton
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/Subcontainers/LoadoutItemSelection.xaml b/Content.Client/_DEN/Lobby/UI/Loadouts/Subcontainers/LoadoutItemSelection.xaml
new file mode 100644
index 00000000000..f6d4efb7f3c
--- /dev/null
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/Subcontainers/LoadoutItemSelection.xaml
@@ -0,0 +1,20 @@
+<controls:LoadoutItemSelection
+    xmlns="https://spacestation14.io"
+    xmlns:controls="clr-namespace:Content.Client._DEN.Lobby.UI.Loadouts.Subcontainers">
+    <BoxContainer>
+        <PanelContainer StyleClasses="BackgroundPanel"
+                        SetWidth="200"
+                        VerticalExpand="True"
+                        Margin="0 5">
+            <BoxContainer Name="LoadoutItemCategoryContainer"
+                          SeparationOverride="1"
+                          Orientation="Vertical">
+
+            </BoxContainer>
+        </PanelContainer>
+        <BoxContainer Name="ContentContainer">
+
+        </BoxContainer>
+    </BoxContainer>
+
+</controls:LoadoutItemSelection>
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/Subcontainers/LoadoutItemSelection.xaml.cs b/Content.Client/_DEN/Lobby/UI/Loadouts/Subcontainers/LoadoutItemSelection.xaml.cs
new file mode 100644
index 00000000000..e7c65046155
--- /dev/null
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/Subcontainers/LoadoutItemSelection.xaml.cs
@@ -0,0 +1,15 @@
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client._DEN.Lobby.UI.Loadouts.Subcontainers;
+
+[GenerateTypedNameReferences]
+public sealed partial class LoadoutItemSelection : PanelContainer
+{
+    public LoadoutItemSelection()
+    {
+        RobustXamlLoader.Load(this);
+    }
+}
+

From e91c041b43c5cef4760d52b4695dff05575e8ce9 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sat, 11 Jul 2026 18:49:38 -0300
Subject: [PATCH 12/14] they are profiles

---
 .../LoadoutProfilesContainer.JobLoadouts.cs   |  2 +-
 ...LoadoutProfilesContainer.LoadoutProfile.cs |  8 ++--
 .../LoadoutProfilesContainer.Loadouts.cs      |  7 ++-
 .../LoadoutProfilesContainer.Popups.cs        |  8 ++--
 .../Loadouts/LoadoutProfilesContainer.xaml.cs | 28 +++++------
 .../Popups/CreateCategoryPopup.xaml.cs        |  4 +-
 .../Popups/CreateLoadoutPopup.xaml.cs         |  4 +-
 .../DenCategoryContainer.xaml.cs              | 36 +++++++--------
 .../Subcontainers/DenLoadoutContainer.xaml.cs | 28 +++++------
 .../Managers/ServerPreferencesManager.cs      |  8 ++--
 .../Preferences/HumanoidCharacterProfile.cs   |  4 +-
 .../{DenLoadout.cs => DenLoadoutProfile.cs}   |  4 +-
 .../_DEN/Loadout/EntityLoadoutPrototype.cs    |  2 +-
 .../Preferences/HumanoidCharacterProfile.cs   | 46 +++++++++----------
 14 files changed, 97 insertions(+), 92 deletions(-)
 rename Content.Shared/_DEN/Loadout/{DenLoadout.cs => DenLoadoutProfile.cs} (90%)

diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.JobLoadouts.cs b/Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.JobLoadouts.cs
index 43f71e6a9c6..4f2d8a086ed 100644
--- a/Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.JobLoadouts.cs
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.JobLoadouts.cs
@@ -4,7 +4,7 @@ namespace Content.Client._DEN.Lobby.UI.Loadouts;
 
 public sealed partial class LoadoutProfilesContainer
 {
-    public void OnClickEditJobLoadouts(DenLoadout loadout)
+    public void OnClickEditJobLoadouts(DenLoadoutProfile loadoutProfile)
     {
 
     }
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.LoadoutProfile.cs b/Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.LoadoutProfile.cs
index 776ed7af475..2735cbbff06 100644
--- a/Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.LoadoutProfile.cs
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.LoadoutProfile.cs
@@ -4,14 +4,14 @@ namespace Content.Client._DEN.Lobby.UI.Loadouts;
 
 public sealed partial class LoadoutProfilesContainer
 {
-    private void OnClickEditLoadoutProfile(DenLoadout loadout)
+    private void OnClickEditLoadoutProfile(DenLoadoutProfile loadoutProfile)
     {
-        OnTryCreateLoadout(loadout);
+        OnTryCreateLoadout(loadoutProfile);
     }
 
-    private void OnClickDeleteLoadoutProfile(DenLoadout loadout)
+    private void OnClickDeleteLoadoutProfile(DenLoadoutProfile loadoutProfile)
     {
-        _profile = _profile?.WithoutLoadoutProfile(loadout);
+        _profile = _profile?.WithoutLoadoutProfile(loadoutProfile);
         SetDirty(_profile);
 
         RefreshCategories();
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.Loadouts.cs b/Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.Loadouts.cs
index 00993db58a3..2c95a226c8b 100644
--- a/Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.Loadouts.cs
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.Loadouts.cs
@@ -4,9 +4,14 @@ namespace Content.Client._DEN.Lobby.UI.Loadouts;
 
 public sealed partial class LoadoutProfilesContainer
 {
-    private void OnClickEditLoadouts(DenLoadout loadout)
+    private void OnClickEditLoadouts(DenLoadoutProfile loadoutProfile)
     {
         LoadoutItemSelection.Visible = !LoadoutContainer.Visible;
         LoadoutProfileSelection.Visible = !LoadoutContainer.Visible;
     }
+
+    public void RefreshLoadoutItemCategories()
+    {
+
+    }
 }
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.Popups.cs b/Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.Popups.cs
index d6777058071..0e063df638f 100644
--- a/Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.Popups.cs
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.Popups.cs
@@ -6,7 +6,7 @@ namespace Content.Client._DEN.Lobby.UI.Loadouts;
 
 public sealed partial class LoadoutProfilesContainer
 {
-    private void OnTryCreateCategory(DenLoadoutCategory? existingCategory = null)
+    private void OnTryCreateCategory(LoadoutProfileCategory? existingCategory = null)
     {
         if (_createCategoryPopup != null)
             return;
@@ -32,7 +32,7 @@ private void OnSubmitNewCategory(CategoryCreationRequest request)
             members.UnionWith(loadout.Members);
         }
 
-        var category = new DenLoadoutCategory
+        var category = new LoadoutProfileCategory
         {
             Id = guid,
             Color = request.CategoryColor.ToHex(),
@@ -48,7 +48,7 @@ private void OnSubmitNewCategory(CategoryCreationRequest request)
         OnCloseCategoryPopup();
     }
 
-    private void OnTryCreateLoadout(DenLoadout? loadout = null)
+    private void OnTryCreateLoadout(DenLoadoutProfile? loadout = null)
     {
         if (_createLoadoutPopup != null)
             return;
@@ -76,7 +76,7 @@ private void OnSubmitNewLoadout(LoadoutCreationRequest request)
             loadouts.UnionWith(loadoutProfile.Loadouts);
         }
 
-        var loadout = new DenLoadout
+        var loadout = new DenLoadoutProfile
         {
             Id = guid,
             Name = request.LoadoutName,
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.xaml.cs b/Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.xaml.cs
index c052db07b62..002908a04dd 100644
--- a/Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.xaml.cs
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.xaml.cs
@@ -17,14 +17,14 @@ public sealed partial class LoadoutProfilesContainer : BoxContainer
     private Popups.CreateLoadoutPopup? _createLoadoutPopup;
     private HumanoidCharacterProfile? _profile;
 
-    private Dictionary<Guid, DenLoadoutCategory> _popupCategories;
+    private Dictionary<Guid, LoadoutProfileCategory> _popupCategories;
     private Dictionary<Guid, DenCategoryContainer> _categories = [];
 
     public LoadoutProfilesContainer()
     {
         RobustXamlLoader.Load(this);
 
-        _popupCategories = new Dictionary<Guid, DenLoadoutCategory>();
+        _popupCategories = new Dictionary<Guid, LoadoutProfileCategory>();
         ButtonCreateCategory.OnPressed += _ => OnTryCreateCategory();
         ButtonCreateLoadout.OnPressed += _ => OnTryCreateLoadout();
     }
@@ -79,9 +79,9 @@ public void RefreshCategories()
             || !_profile.LoadoutCategories.TryGetValue(categoryId, out var category))
             return null;
 
-        _popupCategories = new Dictionary<Guid, DenLoadoutCategory>(_profile.LoadoutCategories);
+        _popupCategories = new Dictionary<Guid, LoadoutProfileCategory>(_profile.LoadoutCategories);
 
-        var profiles = new List<DenLoadout>();
+        var profiles = new List<DenLoadoutProfile>();
 
         foreach (var loadoutId in category.Members)
         {
@@ -113,39 +113,39 @@ public void RefreshCategories()
         return categoryContainer;
     }
 
-    private void OnClickLoadoutAction(DenLoadout loadout, DenLoadoutAction loadoutAction)
+    private void OnClickLoadoutAction(DenLoadoutProfile loadoutProfile, DenLoadoutAction loadoutAction)
     {
         switch (loadoutAction)
         {
             case DenLoadoutAction.EditJobs:
-                OnClickEditJobLoadouts(loadout);
+                OnClickEditJobLoadouts(loadoutProfile);
                 break;
             case DenLoadoutAction.EditLoadouts:
-                OnClickEditLoadouts(loadout);
+                OnClickEditLoadouts(loadoutProfile);
                 break;
             case DenLoadoutAction.EditLoadoutProfile:
-                OnClickEditLoadoutProfile(loadout);
+                OnClickEditLoadoutProfile(loadoutProfile);
                 break;
             case DenLoadoutAction.DeleteLoadoutProfile:
-                OnClickDeleteLoadoutProfile(loadout);
+                OnClickDeleteLoadoutProfile(loadoutProfile);
                 break;
             default:
                 throw new ArgumentOutOfRangeException(nameof(loadoutAction), loadoutAction, null);
         }
     }
 
-    private void TryCategoryEdit(DenLoadoutCategory category)
+    private void TryCategoryEdit(LoadoutProfileCategory profileCategory)
     {
-        OnTryCreateCategory(category);
+        OnTryCreateCategory(profileCategory);
     }
 
-    private void TryCategoryDelete(DenLoadoutCategory category)
+    private void TryCategoryDelete(LoadoutProfileCategory profileCategory)
     {
         if (_profile == null
-            || !_profile.LoadoutCategories.ContainsKey(category.Id))
+            || !_profile.LoadoutCategories.ContainsKey(profileCategory.Id))
             return;
 
-        _profile = _profile.WithoutLoadoutCategory(category);
+        _profile = _profile.WithoutLoadoutCategory(profileCategory);
         SetDirty(_profile);
         RefreshCategories();
     }
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/Popups/CreateCategoryPopup.xaml.cs b/Content.Client/_DEN/Lobby/UI/Loadouts/Popups/CreateCategoryPopup.xaml.cs
index e39a19bd78b..5941a712802 100644
--- a/Content.Client/_DEN/Lobby/UI/Loadouts/Popups/CreateCategoryPopup.xaml.cs
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/Popups/CreateCategoryPopup.xaml.cs
@@ -10,7 +10,7 @@ public sealed partial class CreateCategoryPopup : FancyWindow
 {
     public event Action<CategoryCreationRequest>? OnSubmit;
 
-    public CreateCategoryPopup(DenLoadoutCategory? maybeCategory)
+    public CreateCategoryPopup(LoadoutProfileCategory? maybeCategory)
     {
         RobustXamlLoader.Load(this);
 
@@ -25,7 +25,7 @@ public CreateCategoryPopup(DenLoadoutCategory? maybeCategory)
         ButtonSubmit.OnPressed += _ => OnSubmitPressed(maybeCategory);
     }
 
-    private void OnSubmitPressed(DenLoadoutCategory? existingCategory)
+    private void OnSubmitPressed(LoadoutProfileCategory? existingCategory)
     {
         var request = new CategoryCreationRequest
         {
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/Popups/CreateLoadoutPopup.xaml.cs b/Content.Client/_DEN/Lobby/UI/Loadouts/Popups/CreateLoadoutPopup.xaml.cs
index 949ed23a135..e7b74388265 100644
--- a/Content.Client/_DEN/Lobby/UI/Loadouts/Popups/CreateLoadoutPopup.xaml.cs
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/Popups/CreateLoadoutPopup.xaml.cs
@@ -10,7 +10,7 @@ public sealed partial class CreateLoadoutPopup : FancyWindow
 {
     public event Action<LoadoutCreationRequest>? OnSubmit;
 
-    public CreateLoadoutPopup(Dictionary<Guid, DenLoadoutCategory> categories, DenLoadout? maybeLoadout = null)
+    public CreateLoadoutPopup(Dictionary<Guid, LoadoutProfileCategory> categories, DenLoadoutProfile? maybeLoadout = null)
     {
         RobustXamlLoader.Load(this);
 
@@ -44,7 +44,7 @@ public CreateLoadoutPopup(Dictionary<Guid, DenLoadoutCategory> categories, DenLo
         ButtonSubmit.OnPressed += _ => OnSubmitPressed(maybeLoadout);
     }
 
-    private void OnSubmitPressed(DenLoadout? maybeLoadout = null)
+    private void OnSubmitPressed(DenLoadoutProfile? maybeLoadout = null)
     {
         var categorySelectedIndex = OptionsCategories.SelectedId;
         var categorySelectedId = (Guid) (OptionsCategories.GetItemMetadata(categorySelectedIndex) ?? Guid.Empty);
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/Subcontainers/DenCategoryContainer.xaml.cs b/Content.Client/_DEN/Lobby/UI/Loadouts/Subcontainers/DenCategoryContainer.xaml.cs
index e3655ea6781..10b3a8dff2f 100644
--- a/Content.Client/_DEN/Lobby/UI/Loadouts/Subcontainers/DenCategoryContainer.xaml.cs
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/Subcontainers/DenCategoryContainer.xaml.cs
@@ -9,47 +9,47 @@ namespace Content.Client._DEN.Lobby.UI.Loadouts.Subcontainers;
 [GenerateTypedNameReferences]
 public sealed partial class DenCategoryContainer : PanelContainer
 {
-    public event Action<DenLoadout, DenLoadoutAction>? OnClickLoadoutAction;
+    public event Action<DenLoadoutProfile, DenLoadoutAction>? OnClickLoadoutAction;
     public readonly Dictionary<Guid, DenLoadoutContainer> LoadoutContainers = new();
-    public List<DenLoadout> Loadouts;
+    public List<DenLoadoutProfile> Loadouts;
     private bool _isExpanded;
 
-    private DenLoadoutCategory _category;
+    private LoadoutProfileCategory _profileCategory;
 
-    public DenCategoryContainer(DenLoadoutCategory category,
-        List<DenLoadout> loadouts)
+    public DenCategoryContainer(LoadoutProfileCategory profileCategory,
+        List<DenLoadoutProfile> loadouts)
     {
         RobustXamlLoader.Load(this);
 
         Loadouts = loadouts;
-        _category = category;
+        _profileCategory = profileCategory;
 
-        RefreshCategoryName(category);
-        RefreshCategoryColor(category);
+        RefreshCategoryName(profileCategory);
+        RefreshCategoryColor(profileCategory);
         RefreshLoadoutContainers(loadouts);
 
         HeaderButton.OnPressed += _ => ToggleExpanded();
         UpdateExpandedState();
     }
 
-    public void UpdateCategory(DenLoadoutCategory category, List<DenLoadout> loadouts)
+    public void UpdateCategory(LoadoutProfileCategory profileCategory, List<DenLoadoutProfile> loadouts)
     {
-        RefreshCategoryName(category);
-        RefreshCategoryColor(category);
+        RefreshCategoryName(profileCategory);
+        RefreshCategoryColor(profileCategory);
         RefreshLoadoutContainers(loadouts);
 
         Loadouts = loadouts;
-        _category = category;
+        _profileCategory = profileCategory;
     }
 
-    private void RefreshCategoryName(DenLoadoutCategory category)
+    private void RefreshCategoryName(LoadoutProfileCategory profileCategory)
     {
-        CategoryNameLabel.Text = category.Name;
+        CategoryNameLabel.Text = profileCategory.Name;
     }
 
-    private void RefreshCategoryColor(DenLoadoutCategory category)
+    private void RefreshCategoryColor(LoadoutProfileCategory profileCategory)
     {
-        var color = Color.TryFromHex(category.Color);
+        var color = Color.TryFromHex(profileCategory.Color);
 
         AccentBar.PanelOverride = new StyleBoxFlat
         {
@@ -57,7 +57,7 @@ private void RefreshCategoryColor(DenLoadoutCategory category)
         };
     }
 
-    private void RefreshLoadoutContainers(List<DenLoadout> loadoutProfiles)
+    private void RefreshLoadoutContainers(List<DenLoadoutProfile> loadoutProfiles)
     {
         foreach (var loadoutProfile in loadoutProfiles)
         {
@@ -88,7 +88,7 @@ private void RefreshLoadoutContainers(List<DenLoadout> loadoutProfiles)
         CategoryLoadoutCount.Text = countText;
     }
 
-    private void DoLoadoutAction(DenLoadout profile, DenLoadoutAction action)
+    private void DoLoadoutAction(DenLoadoutProfile profile, DenLoadoutAction action)
     {
         OnClickLoadoutAction?.Invoke(profile, action);
     }
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/Subcontainers/DenLoadoutContainer.xaml.cs b/Content.Client/_DEN/Lobby/UI/Loadouts/Subcontainers/DenLoadoutContainer.xaml.cs
index 3d1b7b0cae2..7229270e3f8 100644
--- a/Content.Client/_DEN/Lobby/UI/Loadouts/Subcontainers/DenLoadoutContainer.xaml.cs
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/Subcontainers/DenLoadoutContainer.xaml.cs
@@ -8,37 +8,37 @@ namespace Content.Client._DEN.Lobby.UI.Loadouts.Subcontainers;
 [GenerateTypedNameReferences]
 public sealed partial class DenLoadoutContainer : ContainerButton
 {
-    public event Action<DenLoadout, DenLoadoutAction>? OnClickLoadoutAction;
+    public event Action<DenLoadoutProfile, DenLoadoutAction>? OnClickLoadoutAction;
 
-    private DenLoadout _loadout;
+    private DenLoadoutProfile _loadoutProfile;
 
-    public DenLoadoutContainer(DenLoadout loadoutProfile)
+    public DenLoadoutContainer(DenLoadoutProfile loadoutProfileProfile)
     {
         RobustXamlLoader.Load(this);
 
-        _loadout = loadoutProfile;
+        _loadoutProfile = loadoutProfileProfile;
 
-        LoadoutNameLabel.Text = loadoutProfile.Name;
+        LoadoutNameLabel.Text = loadoutProfileProfile.Name;
 
         ButtonEditJobs.OnPressed += _ =>
-            OnClickLoadoutAction?.Invoke(_loadout, DenLoadoutAction.EditJobs);
+            OnClickLoadoutAction?.Invoke(_loadoutProfile, DenLoadoutAction.EditJobs);
         ButtonEditLoadouts.OnPressed += _ =>
-            OnClickLoadoutAction?.Invoke(_loadout, DenLoadoutAction.EditLoadouts);
+            OnClickLoadoutAction?.Invoke(_loadoutProfile, DenLoadoutAction.EditLoadouts);
         ButtonEditLoadoutProfile.OnPressed += _ =>
-            OnClickLoadoutAction?.Invoke(_loadout, DenLoadoutAction.EditLoadoutProfile);
+            OnClickLoadoutAction?.Invoke(_loadoutProfile, DenLoadoutAction.EditLoadoutProfile);
         ButtonDeleteProfile.OnPressed += _ =>
-            OnClickLoadoutAction?.Invoke(_loadout, DenLoadoutAction.DeleteLoadoutProfile);
+            OnClickLoadoutAction?.Invoke(_loadoutProfile, DenLoadoutAction.DeleteLoadoutProfile);
     }
 
-    public void UpdateLoadout(DenLoadout loadout)
+    public void UpdateLoadout(DenLoadoutProfile loadoutProfile)
     {
-        if (_loadout == loadout)
+        if (_loadoutProfile == loadoutProfile)
             return;
 
-        if (loadout.Name != _loadout.Name)
-            LoadoutNameLabel.Text = loadout.Name;
+        if (loadoutProfile.Name != _loadoutProfile.Name)
+            LoadoutNameLabel.Text = loadoutProfile.Name;
 
-        _loadout = loadout;
+        _loadoutProfile = loadoutProfile;
     }
 }
 
diff --git a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
index cccc09e5b36..8bde4208cc8 100644
--- a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
+++ b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
@@ -173,8 +173,8 @@ internal HumanoidCharacterProfile ConvertProfiles(Profile profile)
             */
 
             var jobLoadouts = new Dictionary<ProtoId<JobPrototype>, HashSet<Guid>>();
-            var loadoutCategories = new Dictionary<Guid, DenLoadoutCategory>();
-            var loadoutProfiles = new Dictionary<Guid, DenLoadout>();
+            var loadoutCategories = new Dictionary<Guid, LoadoutProfileCategory>();
+            var loadoutProfiles = new Dictionary<Guid, DenLoadoutProfile>();
 
             foreach (var loadoutCategory in profile.LoadoutCategories)
             {
@@ -182,7 +182,7 @@ internal HumanoidCharacterProfile ConvertProfiles(Profile profile)
                     .Select(l => l.LoadoutUniqueId)
                     .ToHashSet();
 
-                var category = new DenLoadoutCategory
+                var category = new LoadoutProfileCategory
                 {
                     Id = loadoutCategory.CategoryUniqueId,
                     Name = loadoutCategory.CategoryName,
@@ -196,7 +196,7 @@ internal HumanoidCharacterProfile ConvertProfiles(Profile profile)
                 foreach (var loadoutProfile in loadoutCategory.Members)
                 {
                     var loadoutItems = loadoutProfile.LoadoutItems.Select(AsLoadoutPrototype).ToHashSet();
-                    var loadout = new DenLoadout
+                    var loadout = new DenLoadoutProfile
                     {
                         Id = loadoutProfile.LoadoutUniqueId,
                         LoadoutCategory = category.Id,
diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
index 5917d811003..4d10a715d03 100644
--- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs
+++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
@@ -189,8 +189,8 @@ public HumanoidCharacterProfile(HumanoidCharacterProfile other)
                 // new HashSet<ProtoId<TraitPrototype>>(other.TraitPreferences), // DEN
                 new HashSet<ProtoId<EntityTraitPrototype>>(other.EntityTraitPreferences), // DEN
                 // new Dictionary<string, RoleLoadout>(other.Loadouts), // DEN
-                new Dictionary<Guid, DenLoadoutCategory>(other.LoadoutCategories),
-                new Dictionary<Guid, DenLoadout>(other.LoadoutProfiles), // DEN
+                new Dictionary<Guid, LoadoutProfileCategory>(other.LoadoutCategories),
+                new Dictionary<Guid, DenLoadoutProfile>(other.LoadoutProfiles), // DEN
                 new Dictionary<ProtoId<JobPrototype>, HashSet<Guid>>(other.JobLoadouts)) // DEN
         {
         }
diff --git a/Content.Shared/_DEN/Loadout/DenLoadout.cs b/Content.Shared/_DEN/Loadout/DenLoadoutProfile.cs
similarity index 90%
rename from Content.Shared/_DEN/Loadout/DenLoadout.cs
rename to Content.Shared/_DEN/Loadout/DenLoadoutProfile.cs
index 4fa5664b907..a1ceae8a7b9 100644
--- a/Content.Shared/_DEN/Loadout/DenLoadout.cs
+++ b/Content.Shared/_DEN/Loadout/DenLoadoutProfile.cs
@@ -4,7 +4,7 @@
 namespace Content.Shared._DEN.Loadout;
 
 [Serializable, NetSerializable]
-public record struct DenLoadout
+public record struct DenLoadoutProfile
 {
     public Guid Id;
     public int Priority;
@@ -26,7 +26,7 @@ public record struct DenCustomLoadoutInfo
 }
 
 [Serializable, NetSerializable]
-public record struct DenLoadoutCategory
+public record struct LoadoutProfileCategory
 {
     public Guid Id;
     public int Priority;
diff --git a/Content.Shared/_DEN/Loadout/EntityLoadoutPrototype.cs b/Content.Shared/_DEN/Loadout/EntityLoadoutPrototype.cs
index 0609e7a67bd..e178d8c8534 100644
--- a/Content.Shared/_DEN/Loadout/EntityLoadoutPrototype.cs
+++ b/Content.Shared/_DEN/Loadout/EntityLoadoutPrototype.cs
@@ -11,7 +11,7 @@ public sealed partial class EntityLoadoutPrototype : IInheritingPrototype, IProt
 {
     [ViewVariables]
     [IdDataField]
-    public string ID { get; private set; } = default!;
+    public string ID { get; private set; } = null!;
 
     /// <inheritdoc/>
     [ParentDataField(typeof(AbstractPrototypeIdArraySerializer<EntityLoadoutPrototype>))]
diff --git a/Content.Shared/_DEN/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/_DEN/Preferences/HumanoidCharacterProfile.cs
index 0174adb2eee..a42d8da2f6f 100644
--- a/Content.Shared/_DEN/Preferences/HumanoidCharacterProfile.cs
+++ b/Content.Shared/_DEN/Preferences/HumanoidCharacterProfile.cs
@@ -22,14 +22,14 @@ public sealed partial class HumanoidCharacterProfile
     public IReadOnlySet<ProtoId<EntityTraitPrototype>> EntityTraitPreferences => _entityTraitPreferences;
 
     [DataField("_loadoutCategories")]
-    private Dictionary<Guid, DenLoadoutCategory> _loadoutCategories = new();
+    private Dictionary<Guid, LoadoutProfileCategory> _loadoutCategories = new();
 
-    public IReadOnlyDictionary<Guid, DenLoadoutCategory> LoadoutCategories => _loadoutCategories;
+    public IReadOnlyDictionary<Guid, LoadoutProfileCategory> LoadoutCategories => _loadoutCategories;
 
     [DataField("_loadoutProfiles")]
-    private Dictionary<Guid, DenLoadout> _loadoutProfiles = new();
+    private Dictionary<Guid, DenLoadoutProfile> _loadoutProfiles = new();
 
-    public IReadOnlyDictionary<Guid, DenLoadout> LoadoutProfiles => _loadoutProfiles;
+    public IReadOnlyDictionary<Guid, DenLoadoutProfile> LoadoutProfiles => _loadoutProfiles;
 
     [DataField("_jobLoadouts")]
     private Dictionary<ProtoId<JobPrototype>, HashSet<Guid>> _jobLoadouts = new();
@@ -50,8 +50,8 @@ public HumanoidCharacterProfile(
         HashSet<ProtoId<AntagPrototype>> antagPreferences,
         HashSet<ProtoId<EntityTraitPrototype>> entityTraitPreferences,
         // Dictionary<string, RoleLoadout> loadouts, - DEN
-        Dictionary<Guid, DenLoadoutCategory> loadoutCategories,
-        Dictionary<Guid, DenLoadout> loadoutProfiles,
+        Dictionary<Guid, LoadoutProfileCategory> loadoutCategories,
+        Dictionary<Guid, DenLoadoutProfile> loadoutProfiles,
         Dictionary<ProtoId<JobPrototype>, HashSet<Guid>> jobLoadouts)
     {
         Name = name;
@@ -141,12 +141,12 @@ public HumanoidCharacterProfile WithoutEntityTraitPreference(ProtoId<EntityTrait
         };
     }
 
-    public HumanoidCharacterProfile WithLoadoutProfile(Guid loadoutId, Guid categoryId, DenLoadout loadout)
+    public HumanoidCharacterProfile WithLoadoutProfile(Guid loadoutId, Guid categoryId, DenLoadoutProfile loadoutProfile)
     {
         if (!_loadoutCategories.TryGetValue(categoryId, out var loadoutCategory))
             return this;
 
-        var categories = new Dictionary<Guid, DenLoadoutCategory>(_loadoutCategories);
+        var categories = new Dictionary<Guid, LoadoutProfileCategory>(_loadoutCategories);
 
         if (_loadoutProfiles.TryGetValue(loadoutId, out var profile)
             && profile.LoadoutCategory != categoryId)
@@ -156,9 +156,9 @@ public HumanoidCharacterProfile WithLoadoutProfile(Guid loadoutId, Guid category
             categories[profile.LoadoutCategory] = category;
         }
 
-        var profiles = new Dictionary<Guid, DenLoadout>(_loadoutProfiles)
+        var profiles = new Dictionary<Guid, DenLoadoutProfile>(_loadoutProfiles)
         {
-            [loadoutId] = loadout,
+            [loadoutId] = loadoutProfile,
         };
 
         loadoutCategory.Members.Add(loadoutId);
@@ -171,18 +171,18 @@ public HumanoidCharacterProfile WithLoadoutProfile(Guid loadoutId, Guid category
         };
     }
 
-    public HumanoidCharacterProfile WithoutLoadoutProfile(DenLoadout loadout)
+    public HumanoidCharacterProfile WithoutLoadoutProfile(DenLoadoutProfile loadoutProfile)
     {
-        if (!_loadoutCategories.TryGetValue(loadout.LoadoutCategory, out var loadoutCategory))
+        if (!_loadoutCategories.TryGetValue(loadoutProfile.LoadoutCategory, out var loadoutCategory))
             return this;
 
-        var profiles = new Dictionary<Guid, DenLoadout>(_loadoutProfiles);
-        profiles.Remove(loadout.Id);
+        var profiles = new Dictionary<Guid, DenLoadoutProfile>(_loadoutProfiles);
+        profiles.Remove(loadoutProfile.Id);
 
-        var categories = new Dictionary<Guid, DenLoadoutCategory>(_loadoutCategories);
-        loadoutCategory.Members.Remove(loadout.Id);
+        var categories = new Dictionary<Guid, LoadoutProfileCategory>(_loadoutCategories);
+        loadoutCategory.Members.Remove(loadoutProfile.Id);
 
-        categories[loadout.LoadoutCategory] = loadoutCategory;
+        categories[loadoutProfile.LoadoutCategory] = loadoutCategory;
 
         return new HumanoidCharacterProfile(this)
         {
@@ -191,11 +191,11 @@ public HumanoidCharacterProfile WithoutLoadoutProfile(DenLoadout loadout)
         };
     }
 
-    public HumanoidCharacterProfile WithLoadoutCategory(Guid categoryId, DenLoadoutCategory category)
+    public HumanoidCharacterProfile WithLoadoutCategory(Guid categoryId, LoadoutProfileCategory profileCategory)
     {
-        var categories = new Dictionary<Guid, DenLoadoutCategory>(_loadoutCategories)
+        var categories = new Dictionary<Guid, LoadoutProfileCategory>(_loadoutCategories)
         {
-            [categoryId] = category,
+            [categoryId] = profileCategory,
         };
 
         return new HumanoidCharacterProfile(this)
@@ -204,10 +204,10 @@ public HumanoidCharacterProfile WithLoadoutCategory(Guid categoryId, DenLoadoutC
         };
     }
 
-    public HumanoidCharacterProfile WithoutLoadoutCategory(DenLoadoutCategory category)
+    public HumanoidCharacterProfile WithoutLoadoutCategory(LoadoutProfileCategory profileCategory)
     {
-        var categories = new Dictionary<Guid, DenLoadoutCategory>(_loadoutCategories);
-        categories.Remove(category.Id);
+        var categories = new Dictionary<Guid, LoadoutProfileCategory>(_loadoutCategories);
+        categories.Remove(profileCategory.Id);
 
         return new HumanoidCharacterProfile(this)
         {

From 09214971624f537a6e61caca9a3396f9264be739 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sat, 11 Jul 2026 19:58:43 -0300
Subject: [PATCH 13/14] aaaaaaaaaaa

---
 .../UI/HumanoidProfileEditor.Loadouts.cs      |  1 +
 .../LoadoutProfilesContainer.Loadouts.cs      | 99 +++++++++++++++++++
 .../Loadouts/LoadoutProfilesContainer.xaml.cs | 15 +++
 .../Subcontainers/LoadoutItemSelection.xaml   |  1 +
 .../_DEN/Loadout/LoadoutCategoryPrototype.cs  |  7 +-
 .../Loadouts/Test/loadout_category_test.yml   | 48 +++++++++
 .../_DEN/Loadouts/Test/loadout_test.yml       | 42 ++++++++
 7 files changed, 211 insertions(+), 2 deletions(-)
 create mode 100644 Resources/Prototypes/_DEN/Loadouts/Test/loadout_category_test.yml

diff --git a/Content.Client/_DEN/Lobby/UI/HumanoidProfileEditor.Loadouts.cs b/Content.Client/_DEN/Lobby/UI/HumanoidProfileEditor.Loadouts.cs
index 9dcdaa7f043..a0fe5ba76a0 100644
--- a/Content.Client/_DEN/Lobby/UI/HumanoidProfileEditor.Loadouts.cs
+++ b/Content.Client/_DEN/Lobby/UI/HumanoidProfileEditor.Loadouts.cs
@@ -12,5 +12,6 @@ private void RefreshDenLoadouts()
 
         DenLoadouts.SetProfile(Profile);
         DenLoadouts.RefreshCategories();
+        DenLoadouts.RefreshLoadoutItemCategories();
     }
 }
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.Loadouts.cs b/Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.Loadouts.cs
index 2c95a226c8b..d211289b0a3 100644
--- a/Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.Loadouts.cs
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.Loadouts.cs
@@ -1,17 +1,116 @@
+using System.Linq;
+using Content.Client.Stylesheets;
 using Content.Shared._DEN.Loadout;
+using Robust.Client.UserInterface.Controls;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client._DEN.Lobby.UI.Loadouts;
 
 public sealed partial class LoadoutProfilesContainer
 {
+    private readonly Dictionary<ProtoId<LoadoutCategoryPrototype>, LoadoutCategoryPrototype> _loadoutCategories = new();
+
+    private readonly Dictionary<ProtoId<LoadoutCategoryPrototype>, ProtoId<LoadoutCategoryPrototype>>
+        _parents = new();
+    private readonly Dictionary<ProtoId<EntityLoadoutPrototype>, EntityLoadoutPrototype> _loadoutEntities = new();
+    private readonly HashSet<ProtoId<LoadoutCategoryPrototype>> _root = new();
+
+    public ProtoId<LoadoutCategoryPrototype>? CurrentCategory = null;
+
     private void OnClickEditLoadouts(DenLoadoutProfile loadoutProfile)
     {
         LoadoutItemSelection.Visible = !LoadoutContainer.Visible;
         LoadoutProfileSelection.Visible = !LoadoutContainer.Visible;
     }
 
+    private void CacheLoadouts()
+    {
+        _loadoutCategories.Clear();
+        _parents.Clear();
+        _loadoutEntities.Clear();
+
+        foreach (var category in _protoMan.EnumeratePrototypes<LoadoutCategoryPrototype>())
+        {
+            foreach (var child in category.SubCategories)
+            {
+                _parents[child] = category;
+            }
+
+            if (category.Root && !_parents.ContainsKey(category))
+                _root.Add(category);
+
+            _loadoutCategories.Add(category, category);
+        }
+
+        foreach (var loadoutItem in _protoMan.EnumeratePrototypes<EntityLoadoutPrototype>())
+        {
+            _loadoutEntities.Add(loadoutItem, loadoutItem);
+        }
+    }
+
     public void RefreshLoadoutItemCategories()
     {
+        HashSet<LoadoutCategoryPrototype> allCategories;
+
+        if (CurrentCategory != null)
+        {
+            allCategories = _loadoutCategories[CurrentCategory.Value]
+                .SubCategories
+                .Select(c => _loadoutCategories[c])
+                .ToHashSet();
+        }
+        else
+        {
+            allCategories = _root
+                .Select(c => _loadoutCategories[c])
+                .ToHashSet();
+        }
+
+        var (itemCategories, subCategories) = GetCategoryTypes(allCategories);
+
+        foreach (var itemCategory in itemCategories)
+        {
+            var button = new Button
+            {
+                Margin = new Thickness(5, 2),
+                HorizontalExpand = true,
+                SetHeight = 35
+            };
+
+            LoadoutItemSelection.LoadoutItemCategoryContainer.AddChild(button);
+        }
+
+        foreach (var itemCategory in subCategories)
+        {
+            var button = new Button
+            {
+                Margin = new Thickness(5, 2),
+                HorizontalExpand = true,
+                SetHeight = 35,
+                StyleClasses = { "ButtonColorGreen" }
+            };
+
+            LoadoutItemSelection.LoadoutItemCategoryContainer.AddChild(button);
+        }
+    }
+
+    private (HashSet<LoadoutCategoryPrototype> ItemCategories,
+        HashSet<LoadoutCategoryPrototype> SubCategories) GetCategoryTypes(HashSet<LoadoutCategoryPrototype> allCategories)
+    {
+        var itemCategories = new HashSet<LoadoutCategoryPrototype>();
+        var subCategories = new HashSet<LoadoutCategoryPrototype>();
+
+        foreach (var category in allCategories)
+        {
+            if (category.SubCategories.Count > 0)
+            {
+                subCategories.Add(category);
+                continue;
+            }
+
+            itemCategories.Add(category);
+        }
 
+        return (itemCategories, subCategories);
     }
 }
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.xaml.cs b/Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.xaml.cs
index 002908a04dd..9d8e725e73e 100644
--- a/Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.xaml.cs
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.xaml.cs
@@ -5,12 +5,15 @@
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client._DEN.Lobby.UI.Loadouts;
 
 [GenerateTypedNameReferences]
 public sealed partial class LoadoutProfilesContainer : BoxContainer
 {
+    [Dependency] private IPrototypeManager _protoMan = null!;
+
     public event Action<HumanoidCharacterProfile?>? OnPreferenceUpdated;
 
     private Popups.CreateCategoryPopup? _createCategoryPopup;
@@ -25,8 +28,20 @@ public LoadoutProfilesContainer()
         RobustXamlLoader.Load(this);
 
         _popupCategories = new Dictionary<Guid, LoadoutProfileCategory>();
+
+        CacheLoadouts();
+
         ButtonCreateCategory.OnPressed += _ => OnTryCreateCategory();
         ButtonCreateLoadout.OnPressed += _ => OnTryCreateLoadout();
+
+        _protoMan.PrototypesReloaded += args =>
+        {
+            if (!args.WasModified<LoadoutCategoryPrototype>()
+                || !args.WasModified<EntityLoadoutPrototype>())
+                return;
+
+            CacheLoadouts();
+        };
     }
 
     public void RefreshCategories()
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/Subcontainers/LoadoutItemSelection.xaml b/Content.Client/_DEN/Lobby/UI/Loadouts/Subcontainers/LoadoutItemSelection.xaml
index f6d4efb7f3c..a11dd4c263f 100644
--- a/Content.Client/_DEN/Lobby/UI/Loadouts/Subcontainers/LoadoutItemSelection.xaml
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/Subcontainers/LoadoutItemSelection.xaml
@@ -7,6 +7,7 @@
                         VerticalExpand="True"
                         Margin="0 5">
             <BoxContainer Name="LoadoutItemCategoryContainer"
+                          Access="Public"
                           SeparationOverride="1"
                           Orientation="Vertical">
 
diff --git a/Content.Shared/_DEN/Loadout/LoadoutCategoryPrototype.cs b/Content.Shared/_DEN/Loadout/LoadoutCategoryPrototype.cs
index 791e413765d..f98a94c1bb7 100644
--- a/Content.Shared/_DEN/Loadout/LoadoutCategoryPrototype.cs
+++ b/Content.Shared/_DEN/Loadout/LoadoutCategoryPrototype.cs
@@ -10,7 +10,7 @@ public sealed partial class LoadoutCategoryPrototype : IPrototype
 {
     /// <inheritdoc/>
     [IdDataField, ViewVariables]
-    public string ID { get; private set;  } = default!;
+    public string ID { get; private set;  } = null!;
 
     [DataField]
     public LocId Name = string.Empty;
@@ -19,7 +19,10 @@ public sealed partial class LoadoutCategoryPrototype : IPrototype
     public bool Root;
 
     [DataField]
-    public HashSet<ProtoId<LoadoutCategoryPrototype>> SubCategories = new();
+    public HashSet<ProtoId<LoadoutCategoryPrototype>> SubCategories = [];
+
+    [DataField]
+    public HashSet<ProtoId<EntityLoadoutPrototype>> Items = [];
 
     [DataField]
     public int Priority;
diff --git a/Resources/Prototypes/_DEN/Loadouts/Test/loadout_category_test.yml b/Resources/Prototypes/_DEN/Loadouts/Test/loadout_category_test.yml
new file mode 100644
index 00000000000..17a6c04de9c
--- /dev/null
+++ b/Resources/Prototypes/_DEN/Loadouts/Test/loadout_category_test.yml
@@ -0,0 +1,48 @@
+- type: loadoutCategory
+  id: test-one
+  root: true
+  items:
+  - test1
+  - test2
+  - test3
+  maxItems: 1
+
+- type: loadoutCategory
+  id: test-two
+  root: true
+  subCategories:
+  - test-three
+  maxItems: 1
+
+- type: loadoutCategory
+  id: test-three
+  subCategories:
+  - test-four
+  - test-five
+  - test-six
+  maxItems: 1
+
+- type: loadoutCategory
+  id: test-four
+  items:
+  - test4
+  maxItems: 1
+
+- type: loadoutCategory
+  id: test-five
+  items:
+  - test5
+  maxItems: 1
+
+- type: loadoutCategory
+  id: test-six
+  subCategories:
+  - test-six-seven
+  maxItems: 1
+
+- type: loadoutCategory
+  id: test-six-seven
+  items:
+  - test6
+  - test67
+  maxItems: 1
\ No newline at end of file
diff --git a/Resources/Prototypes/_DEN/Loadouts/Test/loadout_test.yml b/Resources/Prototypes/_DEN/Loadouts/Test/loadout_test.yml
index 70af43763ac..e1c9cc2d3f5 100644
--- a/Resources/Prototypes/_DEN/Loadouts/Test/loadout_test.yml
+++ b/Resources/Prototypes/_DEN/Loadouts/Test/loadout_test.yml
@@ -2,6 +2,7 @@
   id: test1
   name: loadout-name-test1
   description: loadout-desc-test
+  category: test-one
   items:
   - WeaponSubMachineGunDrozd
 
@@ -9,5 +10,46 @@
   id: test2
   name: loadout-name-test2
   description: loadout-desc-test
+  category: test-one
+  equipment:
+    back: ClothingBackpackHolding
+
+- type: entityLoadout
+  id: test3
+  name: loadout-name-test1
+  description: loadout-desc-test
+  category: test-one
+  items:
+  - WeaponSubMachineGunDrozd
+
+- type: entityLoadout
+  id: test4
+  name: loadout-name-test2
+  description: loadout-desc-test
+  category: test-four
+  equipment:
+    back: ClothingBackpackHolding
+
+- type: entityLoadout
+  id: test5
+  name: loadout-name-test2
+  description: loadout-desc-test
+  category: test-five
+  equipment:
+    back: ClothingBackpackHolding
+
+- type: entityLoadout
+  id: test6
+  name: loadout-name-test2
+  description: loadout-desc-test
+  category: test-six-seven
+  equipment:
+    back: ClothingBackpackHolding
+
+- type: entityLoadout
+  id: test67
+  name: loadout-name-test2
+  description: loadout-desc-test
+  category: test-six-seven
   equipment:
     back: ClothingBackpackHolding

From 766c1179ffa8d1672ff0611c9046c86eb773be78 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Sat, 11 Jul 2026 20:16:11 -0300
Subject: [PATCH 14/14] todo: move LoadoutItemSelection out of
 LoadoutProfilesContainer

---
 .../LoadoutProfilesContainer.Loadouts.cs      | 24 ++++++++++++++-----
 .../Loadouts/LoadoutProfilesContainer.xaml.cs |  1 +
 .../Subcontainers/LoadoutItemSelection.xaml   |  4 ++--
 .../Loadouts/Test/loadout_category_test.yml   |  7 ++++++
 4 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.Loadouts.cs b/Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.Loadouts.cs
index d211289b0a3..ab521057cfa 100644
--- a/Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.Loadouts.cs
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.Loadouts.cs
@@ -14,6 +14,7 @@ private readonly Dictionary<ProtoId<LoadoutCategoryPrototype>, ProtoId<LoadoutCa
         _parents = new();
     private readonly Dictionary<ProtoId<EntityLoadoutPrototype>, EntityLoadoutPrototype> _loadoutEntities = new();
     private readonly HashSet<ProtoId<LoadoutCategoryPrototype>> _root = new();
+    private readonly Dictionary<ProtoId<LoadoutCategoryPrototype>, Button> _categoryButtons = new();
 
     public ProtoId<LoadoutCategoryPrototype>? CurrentCategory = null;
 
@@ -52,6 +53,13 @@ public void RefreshLoadoutItemCategories()
     {
         HashSet<LoadoutCategoryPrototype> allCategories;
 
+        foreach (var button in _categoryButtons.Values)
+        {
+            button.Orphan();
+        }
+
+        _categoryButtons.Clear();
+
         if (CurrentCategory != null)
         {
             allCategories = _loadoutCategories[CurrentCategory.Value]
@@ -68,29 +76,33 @@ public void RefreshLoadoutItemCategories()
 
         var (itemCategories, subCategories) = GetCategoryTypes(allCategories);
 
-        foreach (var itemCategory in itemCategories)
+        foreach (var category in itemCategories)
         {
             var button = new Button
             {
-                Margin = new Thickness(5, 2),
+                Text = category.Name,
+                Margin = new Thickness(5, 1),
                 HorizontalExpand = true,
-                SetHeight = 35
+                SetHeight = 25
             };
 
             LoadoutItemSelection.LoadoutItemCategoryContainer.AddChild(button);
+            _categoryButtons.Add(category, button);
         }
 
-        foreach (var itemCategory in subCategories)
+        foreach (var category in subCategories)
         {
             var button = new Button
             {
-                Margin = new Thickness(5, 2),
+                Text = "boo",
+                Margin = new Thickness(5, 1),
                 HorizontalExpand = true,
-                SetHeight = 35,
+                SetHeight = 25,
                 StyleClasses = { "ButtonColorGreen" }
             };
 
             LoadoutItemSelection.LoadoutItemCategoryContainer.AddChild(button);
+            _categoryButtons.Add(category, button);
         }
     }
 
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.xaml.cs b/Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.xaml.cs
index 9d8e725e73e..7bad2a0cd37 100644
--- a/Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.xaml.cs
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/LoadoutProfilesContainer.xaml.cs
@@ -26,6 +26,7 @@ public sealed partial class LoadoutProfilesContainer : BoxContainer
     public LoadoutProfilesContainer()
     {
         RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
 
         _popupCategories = new Dictionary<Guid, LoadoutProfileCategory>();
 
diff --git a/Content.Client/_DEN/Lobby/UI/Loadouts/Subcontainers/LoadoutItemSelection.xaml b/Content.Client/_DEN/Lobby/UI/Loadouts/Subcontainers/LoadoutItemSelection.xaml
index a11dd4c263f..78b1d0c3bcb 100644
--- a/Content.Client/_DEN/Lobby/UI/Loadouts/Subcontainers/LoadoutItemSelection.xaml
+++ b/Content.Client/_DEN/Lobby/UI/Loadouts/Subcontainers/LoadoutItemSelection.xaml
@@ -8,8 +8,8 @@
                         Margin="0 5">
             <BoxContainer Name="LoadoutItemCategoryContainer"
                           Access="Public"
-                          SeparationOverride="1"
-                          Orientation="Vertical">
+                          Orientation="Vertical"
+                          Margin="0 5">
 
             </BoxContainer>
         </PanelContainer>
diff --git a/Resources/Prototypes/_DEN/Loadouts/Test/loadout_category_test.yml b/Resources/Prototypes/_DEN/Loadouts/Test/loadout_category_test.yml
index 17a6c04de9c..356081172a2 100644
--- a/Resources/Prototypes/_DEN/Loadouts/Test/loadout_category_test.yml
+++ b/Resources/Prototypes/_DEN/Loadouts/Test/loadout_category_test.yml
@@ -1,5 +1,6 @@
 - type: loadoutCategory
   id: test-one
+  name: loadout-name-test1
   root: true
   items:
   - test1
@@ -9,6 +10,7 @@
 
 - type: loadoutCategory
   id: test-two
+  name: loadout-name-test2
   root: true
   subCategories:
   - test-three
@@ -16,6 +18,7 @@
 
 - type: loadoutCategory
   id: test-three
+  name: loadout-name-test3
   subCategories:
   - test-four
   - test-five
@@ -24,24 +27,28 @@
 
 - type: loadoutCategory
   id: test-four
+  name: loadout-name-test4
   items:
   - test4
   maxItems: 1
 
 - type: loadoutCategory
   id: test-five
+  name: loadout-name-test5
   items:
   - test5
   maxItems: 1
 
 - type: loadoutCategory
   id: test-six
+  name: loadout-name-test6
   subCategories:
   - test-six-seven
   maxItems: 1
 
 - type: loadoutCategory
   id: test-six-seven
+  name: loadout-name-test7
   items:
   - test6
   - test67