diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml
index 565f557f8cf..3aa826c8a6e 100644
--- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml
+++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml
@@ -175,6 +175,8 @@ SPDX-License-Identifier: AGPL-3.0-or-later
                 <BoxContainer Orientation="Vertical">
                     <!-- Jobs -->
                     <OptionButton Name="PreferenceUnavailableButton" />
+                    <!-- Amour edit -->
+                    <Button Name="BaseLoadoutButton" Text="{Loc loadout-window-base}" Margin="0 5" />
                     <ScrollContainer VerticalExpand="True">
                         <BoxContainer Name="JobList" Orientation="Vertical" />
                     </ScrollContainer>
diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
index ba243438fc4..396d762d7ad 100644
--- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
@@ -272,6 +272,12 @@ public sealed partial class HumanoidProfileEditor : BoxContainer
 
         private List<(string, RequirementsSelector)> _jobPriorities = new();
 
+        // Amour edit start
+        // Loadout buttons per role (jobs / antags). Used to highlight roles whose loadouts differ from base.
+        private readonly Dictionary<string, Button> _jobLoadoutButtons = new();
+        private readonly Dictionary<string, Button> _antagLoadoutButtons = new();
+        // Amour edit end
+
         private readonly Dictionary<string, BoxContainer> _jobCategories;
 
         private Direction _previewRotation = Direction.North;
@@ -675,6 +681,8 @@ public HumanoidProfileEditor(
                 SetDirty();
             };
 
+            BaseLoadoutButton.OnPressed += _ => OpenBaseLoadout(); // Amour edit
+
             _jobCategories = new Dictionary<string, BoxContainer>();
 
             RefreshAntags();
@@ -1198,9 +1206,86 @@ public void RefreshSpecies()
             }
         }
 
+        // Amour edit start
+        private bool RoleLoadoutDiffersFromBase(string roleId)
+        {
+            if (Profile == null)
+                return false;
+
+            var baseLoadout = Profile.BaseLoadout;
+
+            if (!Profile.Loadouts.TryGetValue(roleId, out var roleLoadout))
+                return false;
+
+            if (roleLoadout.EntityNameOverridden)
+            {
+                var baseName = baseLoadout.EntityName ?? string.Empty;
+                var roleName = roleLoadout.EntityName ?? string.Empty;
+                if (baseName != roleName)
+                    return true;
+            }
+
+            foreach (var groupId in roleLoadout.OverriddenGroups)
+            {
+                if (!baseLoadout.SelectedLoadouts.TryGetValue(groupId, out var baseGroupLoadouts))
+                    continue;
+
+                if (!roleLoadout.SelectedLoadouts.TryGetValue(groupId, out var roleGroupLoadouts))
+                {
+                    if (baseGroupLoadouts.Count > 0)
+                        return true;
+                    continue;
+                }
+
+                var baseSet = baseGroupLoadouts.Select(l => l.Prototype.Id).ToHashSet();
+                var roleSet = roleGroupLoadouts.Select(l => l.Prototype.Id).ToHashSet();
+
+                if (!baseSet.SetEquals(roleSet))
+                    return true;
+            }
+
+            return false;
+        }
+
+        private void UpdateRoleLoadoutButtonHighlight(string roleId)
+        {
+            if (_jobLoadoutButtons.TryGetValue(roleId, out var jobBtn))
+                UpdateRoleLoadoutButtonHighlight(jobBtn, roleId);
+
+            if (_antagLoadoutButtons.TryGetValue(roleId, out var antagBtn))
+                UpdateRoleLoadoutButtonHighlight(antagBtn, roleId);
+        }
+
+        private void UpdateAllRoleLoadoutButtonHighlights()
+        {
+            foreach (var (roleId, btn) in _jobLoadoutButtons)
+                UpdateRoleLoadoutButtonHighlight(btn, roleId);
+
+            foreach (var (roleId, btn) in _antagLoadoutButtons)
+                UpdateRoleLoadoutButtonHighlight(btn, roleId);
+        }
+
+        private void UpdateRoleLoadoutButtonHighlight(Button btn, string roleId)
+        {
+            var differs = RoleLoadoutDiffersFromBase(roleId);
+
+            // Reuse an existing caution style for a visible highlight.
+            if (differs)
+            {
+                if (!btn.StyleClasses.Contains(StyleBase.ButtonCaution))
+                    btn.StyleClasses.Add(StyleBase.ButtonCaution);
+            }
+            else
+            {
+                btn.StyleClasses.Remove(StyleBase.ButtonCaution);
+            }
+        }
+        // Amour edit end
+
         public void RefreshAntags()
         {
             AntagList.DisposeAllChildren();
+            _antagLoadoutButtons.Clear(); // Amour edit
             var items = new[]
             {
                 ("humanoid-profile-editor-antag-preference-yes-button", 0),
@@ -1257,8 +1342,10 @@ public void RefreshAntags()
                     Margin = new Thickness(3f, 0f, 0f, 0f),
                 };
 
+                var antagRoleId = LoadoutSystem.GetAntagPrototype(antag.ID); // Amour edit
+
                 // Goob start
-                if (!_prototypeManager.TryIndex<RoleLoadoutPrototype>(LoadoutSystem.GetAntagPrototype(antag.ID), out var roleLoadoutProto))
+                if (!_prototypeManager.TryIndex<RoleLoadoutPrototype>(antagRoleId, out var roleLoadoutProto))
                 {
                     loadoutWindowBtn.Disabled = true;
                 }
@@ -1268,7 +1355,7 @@ public void RefreshAntags()
                     {
                         RoleLoadout? loadout = null;
 
-                        Profile?.Loadouts.TryGetValue(LoadoutSystem.GetAntagPrototype(antag.ID), out loadout);
+                        Profile?.Loadouts.TryGetValue(antagRoleId, out loadout);
                         loadout = loadout?.Clone();
 
                         if (loadout == null)
@@ -1281,6 +1368,12 @@ public void RefreshAntags()
                     };
                 }
 
+                // Amour edit start
+                // Track & highlight role loadout button if this role has per-role overrides.
+                _antagLoadoutButtons[antagRoleId] = loadoutWindowBtn;
+                UpdateRoleLoadoutButtonHighlight(loadoutWindowBtn, antagRoleId);
+                // Amour edit end
+
                 antagContainer.AddChild(loadoutWindowBtn);
                 // Goob end
 
@@ -1432,6 +1525,7 @@ public void RefreshJobs()
             JobList.DisposeAllChildren();
             _jobCategories.Clear();
             _jobPriorities.Clear();
+            _jobLoadoutButtons.Clear();
             var firstCategory = true;
 
             // Get all displayed departments
@@ -1575,8 +1669,10 @@ public void RefreshJobs()
                     var collection = IoCManager.Instance!;
                     var protoManager = collection.Resolve<IPrototypeManager>();
 
+                    var jobRoleId = LoadoutSystem.GetJobPrototype(job.ID);
+
                     // If no loadout found then disabled button
-                    if (!protoManager.TryIndex<RoleLoadoutPrototype>(LoadoutSystem.GetJobPrototype(job.ID), out var roleLoadoutProto))
+                    if (!protoManager.TryIndex<RoleLoadoutPrototype>(jobRoleId, out var roleLoadoutProto))
                     {
                         loadoutWindowBtn.Disabled = true;
                     }
@@ -1588,7 +1684,7 @@ public void RefreshJobs()
                             RoleLoadout? loadout = null;
 
                             // Clone so we don't modify the underlying loadout.
-                            Profile?.Loadouts.TryGetValue(LoadoutSystem.GetJobPrototype(job.ID), out loadout);
+                            Profile?.Loadouts.TryGetValue(jobRoleId, out loadout);
                             loadout = loadout?.Clone();
 
                             if (loadout == null)
@@ -1601,6 +1697,10 @@ public void RefreshJobs()
                         };
                     }
 
+                    // Track & highlight role loadout button if this role has per-role overrides.
+                    _jobLoadoutButtons[jobRoleId] = loadoutWindowBtn;
+                    UpdateRoleLoadoutButtonHighlight(loadoutWindowBtn, jobRoleId);
+
                     _jobPriorities.Add((job.ID, selector));
                     jobContainer.AddChild(selector);
                     jobContainer.AddChild(loadoutWindowBtn);
@@ -1611,6 +1711,66 @@ public void RefreshJobs()
             UpdateJobPriorities();
         }
 
+        // Amour edit start
+        private void OpenBaseLoadout()
+        {
+            if (Profile == null)
+                return;
+
+            var collection = IoCManager.Instance!;
+            var protoManager = collection.Resolve<IPrototypeManager>();
+
+            if (!protoManager.TryIndex<RoleLoadoutPrototype>(HumanoidCharacterProfile.BaseLoadoutProtoId, out var baseProto))
+                return;
+
+            var session = _playerManager.LocalSession;
+            if (session == null)
+                return;
+
+            var baseLoadout = Profile.BaseLoadout.Clone();
+            baseLoadout.Role = HumanoidCharacterProfile.BaseLoadoutProtoId;
+            baseLoadout.SetDefault(Profile, session, protoManager);
+
+            _loadoutWindow?.Dispose();
+            _loadoutWindow = new LoadoutWindow(Profile, baseLoadout, baseProto, session, collection);
+            _loadoutWindow.Title = Loc.GetString("loadout-window-base");
+
+            _loadoutWindow.OnNameChanged += name =>
+            {
+                if (Profile == null)
+                    return;
+
+                baseLoadout.EntityName = string.IsNullOrWhiteSpace(name) ? null : name;
+                baseLoadout.EntityNameOverridden = !string.IsNullOrWhiteSpace(name);
+                Profile = Profile.WithBaseLoadout(baseLoadout);
+                SetDirty();
+            };
+
+            _loadoutWindow.OnLoadoutPressed += (loadoutGroup, loadoutProto) =>
+            {
+                if (Profile == null)
+                    return;
+
+                baseLoadout.AddLoadout(loadoutGroup, loadoutProto, protoManager);
+                Profile = Profile.WithBaseLoadout(baseLoadout);
+                _loadoutWindow.RefreshLoadouts(baseLoadout, session, collection);
+                SetDirty();
+            };
+
+            _loadoutWindow.OnLoadoutUnpressed += (loadoutGroup, loadoutProto) =>
+            {
+                if (Profile == null)
+                    return;
+
+                baseLoadout.RemoveLoadout(loadoutGroup, loadoutProto, protoManager);
+                Profile = Profile.WithBaseLoadout(baseLoadout);
+                _loadoutWindow.RefreshLoadouts(baseLoadout, session, collection);
+                SetDirty();
+            };
+
+            _loadoutWindow.OpenCentered();
+        }
+
         private void OpenLoadout(JobPrototype? jobProto, RoleLoadout roleLoadout, RoleLoadoutPrototype roleLoadoutProto, string? title = null)
         {
             _loadoutWindow?.Dispose();
@@ -1623,35 +1783,100 @@ private void OpenLoadout(JobPrototype? jobProto, RoleLoadout roleLoadout, RoleLo
             JobOverride = jobProto;
             var session = _playerManager.LocalSession;
 
-            _loadoutWindow = new LoadoutWindow(Profile, roleLoadout, roleLoadoutProto, _playerManager.LocalSession, collection)
+            var roleId = roleLoadout.Role.Id;
+
+            // Override loadout (delta) stored on profile.
+            var hadOverride = Profile.Loadouts.TryGetValue(roleId, out var overrideLoadout);
+            overrideLoadout ??= new RoleLoadout(roleId);
+
+            // Only force defaults when this override entry is brand new.
+            // Otherwise we would wipe the user's saved per-role changes every time the window is opened.
+            overrideLoadout.SetDefault(Profile, session, _prototypeManager, force: !hadOverride);
+
+            // Effective loadout (base + overrides) shown in UI.
+            var effective = Profile.GetEffectiveLoadout(roleId, session, _prototypeManager);
+
+            _loadoutWindow = new LoadoutWindow(Profile, effective, roleLoadoutProto, session, collection, showRevertToBase: true)
             {
                 Title = title ?? jobProto?.ID + "-loadout",
             };
 
-            // Refresh the buttons etc.
-            _loadoutWindow.RefreshLoadouts(roleLoadout, session, collection);
+            _loadoutWindow.RefreshLoadouts(effective, session, collection);
             _loadoutWindow.OpenCenteredLeft();
 
+            _loadoutWindow.OnRevertToBase += () =>
+            {
+                if (Profile == null)
+                    return;
+
+                // Clear per-role overrides so this role inherits from the base loadout again.
+                foreach (var group in roleLoadoutProto.Groups)
+                {
+                    overrideLoadout.SelectedLoadouts.Remove(group);
+                    overrideLoadout.OverriddenGroups.Remove(group);
+                }
+
+                if (roleLoadoutProto.CanCustomizeName)
+                {
+                    overrideLoadout.EntityName = null;
+                    overrideLoadout.EntityNameOverridden = false;
+                }
+
+                // If nothing is overridden anymore, drop the override entry entirely.
+                Profile = overrideLoadout.OverriddenGroups.Count == 0 && !overrideLoadout.EntityNameOverridden
+                    ? Profile.WithoutLoadout(roleId)
+                    : Profile.WithLoadout(overrideLoadout);
+
+                effective = Profile.GetEffectiveLoadout(roleId, session, _prototypeManager);
+                _loadoutWindow.RefreshLoadouts(effective, session, collection);
+                UpdateRoleLoadoutButtonHighlight(roleId);
+                SetDirty();
+                ReloadPreview();
+            };
+
             _loadoutWindow.OnNameChanged += name =>
             {
-                roleLoadout.EntityName = name;
-                Profile = Profile.WithLoadout(roleLoadout);
+                if (Profile == null)
+                    return;
+
+                overrideLoadout.EntityName = string.IsNullOrWhiteSpace(name) ? null : name;
+                overrideLoadout.EntityNameOverridden = true;
+                Profile = Profile.WithLoadout(overrideLoadout);
+                effective = Profile.GetEffectiveLoadout(roleId, session, _prototypeManager);
+                _loadoutWindow.RefreshLoadouts(effective, session, collection);
+                UpdateRoleLoadoutButtonHighlight(roleId);
                 SetDirty();
             };
 
             _loadoutWindow.OnLoadoutPressed += (loadoutGroup, loadoutProto) =>
             {
-                roleLoadout.AddLoadout(loadoutGroup, loadoutProto, _prototypeManager);
-                _loadoutWindow.RefreshLoadouts(roleLoadout, session, collection);
-                Profile = Profile?.WithLoadout(roleLoadout);
+                if (Profile == null)
+                    return;
+
+                EnsureGroupOverridden(overrideLoadout, effective, loadoutGroup); 
+
+                overrideLoadout.AddLoadout(loadoutGroup, loadoutProto, _prototypeManager);
+                Profile = Profile.WithLoadout(overrideLoadout);
+                effective = Profile.GetEffectiveLoadout(roleId, session, _prototypeManager);
+                _loadoutWindow.RefreshLoadouts(effective, session, collection);
+                UpdateRoleLoadoutButtonHighlight(roleId);
+                SetDirty();
                 ReloadPreview();
             };
 
             _loadoutWindow.OnLoadoutUnpressed += (loadoutGroup, loadoutProto) =>
             {
-                roleLoadout.RemoveLoadout(loadoutGroup, loadoutProto, _prototypeManager);
-                _loadoutWindow.RefreshLoadouts(roleLoadout, session, collection);
-                Profile = Profile?.WithLoadout(roleLoadout);
+                if (Profile == null)
+                    return;
+
+                EnsureGroupOverridden(overrideLoadout, effective, loadoutGroup); 
+
+                overrideLoadout.RemoveLoadout(loadoutGroup, loadoutProto, _prototypeManager);
+                Profile = Profile.WithLoadout(overrideLoadout);
+                effective = Profile.GetEffectiveLoadout(roleId, session, _prototypeManager);
+                _loadoutWindow.RefreshLoadouts(effective, session, collection);
+                UpdateRoleLoadoutButtonHighlight(roleId);
+                SetDirty();
                 ReloadPreview();
             };
 
@@ -1670,6 +1895,24 @@ private void OpenLoadout(JobPrototype? jobProto, RoleLoadout roleLoadout, RoleLo
             UpdateJobPriorities();
         }
 
+        private static void EnsureGroupOverridden(
+            RoleLoadout overrideLoadout,
+            RoleLoadout effective,
+            ProtoId<LoadoutGroupPrototype> loadoutGroup)
+        {
+            if (overrideLoadout.OverriddenGroups.Contains(loadoutGroup))
+                return;
+
+            // Inherit selections from base until the first modification.
+            if (effective.SelectedLoadouts.TryGetValue(loadoutGroup, out var sel))
+                overrideLoadout.SelectedLoadouts[loadoutGroup] = new List<Loadout>(sel);
+            else
+                overrideLoadout.SelectedLoadouts[loadoutGroup] = new List<Loadout>();
+
+            overrideLoadout.OverriddenGroups.Add(loadoutGroup);
+        }
+        // Amour edit end
+
         private void OnFlavorTextChange(string content)
         {
             if (Profile is null)
diff --git a/Content.Client/Lobby/UI/Loadouts/LoadoutContainer.xaml.cs b/Content.Client/Lobby/UI/Loadouts/LoadoutContainer.xaml.cs
index 6c727d51343..ef68cf52262 100644
--- a/Content.Client/Lobby/UI/Loadouts/LoadoutContainer.xaml.cs
+++ b/Content.Client/Lobby/UI/Loadouts/LoadoutContainer.xaml.cs
@@ -11,6 +11,7 @@
 using Content.Shared.Clothing;
 using Content.Shared.Preferences.Loadouts;
 using Robust.Client.AutoGenerated;
+using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
@@ -20,6 +21,14 @@
 
 namespace Content.Client.Lobby.UI.Loadouts;
 
+// Amour edit start
+public enum LoadoutSourceType
+{
+    UserSelected,
+    InheritedFromBase
+}
+// Amour edit end
+
 [GenerateTypedNameReferences]
 public sealed partial class LoadoutContainer : BoxContainer
 {
@@ -28,6 +37,12 @@ public sealed partial class LoadoutContainer : BoxContainer
 
     private readonly EntityUid? _entity;
 
+    // Amour edit start
+    private LoadoutSourceType _sourceType = LoadoutSourceType.UserSelected;
+
+    private static readonly Color ColorInheritedFromBase = new Color(0.4f, 0.7f, 0.9f, 1.0f);
+    // Amour edit end
+
     public Button Select => SelectButton;
 
     public string? Text
@@ -36,6 +51,33 @@ public string? Text
         set => SelectButton.Text = value;
     }
 
+    // Amour edit start
+    public LoadoutSourceType SourceType
+    {
+        get => _sourceType;
+        set
+        {
+            _sourceType = value;
+            UpdateButtonStyle();
+        }
+    }
+
+    private void UpdateButtonStyle()
+    {
+        if (!SelectButton.Pressed)
+        {
+            SelectButton.ModulateSelfOverride = null;
+            return;
+        }
+
+        SelectButton.ModulateSelfOverride = _sourceType switch
+        {
+            LoadoutSourceType.InheritedFromBase => ColorInheritedFromBase,
+            _ => null
+        };
+    }
+    // Amour edit end
+
     public LoadoutContainer(ProtoId<LoadoutPrototype> proto, bool disabled, FormattedMessage? reason)
     {
         RobustXamlLoader.Load(this);
diff --git a/Content.Client/Lobby/UI/Loadouts/LoadoutGroupContainer.xaml.cs b/Content.Client/Lobby/UI/Loadouts/LoadoutGroupContainer.xaml.cs
index 8c76649cacb..0cc1f9c98f8 100644
--- a/Content.Client/Lobby/UI/Loadouts/LoadoutGroupContainer.xaml.cs
+++ b/Content.Client/Lobby/UI/Loadouts/LoadoutGroupContainer.xaml.cs
@@ -222,6 +222,7 @@ private void UpdateSubGroupSelectedInfo(LoadoutContainer loadout, string itemNam
     /// <returns>A fully initialized LoadoutContainer for UI display.</returns>
     private LoadoutContainer CreateLoadoutUI(LoadoutPrototype proto, HumanoidCharacterProfile profile, RoleLoadout loadout, ICommonSession session, IDependencyCollection collection, LoadoutSystem loadoutSystem)
     {
+        var protoMan = collection.Resolve<IPrototypeManager>();
         var selected = loadout.SelectedLoadouts[_groupProto.ID];
 
         var pressed = selected.Any(e => e.Prototype == proto.ID);
@@ -234,6 +235,13 @@ private LoadoutContainer CreateLoadoutUI(LoadoutPrototype proto, HumanoidCharact
 
         cont.Select.Pressed = pressed;
 
+        // Amour edit start
+        if (pressed)
+        {
+            cont.SourceType = DetermineLoadoutSourceType(proto.ID, loadout, profile);
+        }
+        // Amour edit end
+
         cont.Select.OnPressed += args =>
         {
             if (args.Button.Pressed)
@@ -244,4 +252,24 @@ private LoadoutContainer CreateLoadoutUI(LoadoutPrototype proto, HumanoidCharact
 
         return cont;
     }
+
+    // Amour edit start
+    private LoadoutSourceType DetermineLoadoutSourceType(
+        ProtoId<LoadoutPrototype> loadoutId,
+        RoleLoadout roleLoadout,
+        HumanoidCharacterProfile profile)
+    {
+        // Check if this group is NOT overridden and the loadout comes from base
+        if (!roleLoadout.OverriddenGroups.Contains(_groupProto.ID))
+        {
+            if (profile.BaseLoadout.SelectedLoadouts.TryGetValue(_groupProto.ID, out var baseSelected))
+            {
+                if (baseSelected.Any(l => l.Prototype == loadoutId))
+                    return LoadoutSourceType.InheritedFromBase;
+            }
+        }
+
+        return LoadoutSourceType.UserSelected;
+    }
+    // Amour edit end
 }
diff --git a/Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml b/Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml
index cf900cdec08..aed4b9c1978 100644
--- a/Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml
+++ b/Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml
@@ -15,6 +15,11 @@ SPDX-License-Identifier: AGPL-3.0-or-later
          SetSize="800 800"
          MinSize="800 128">
     <BoxContainer Orientation="Vertical" VerticalExpand="True">
+        <!-- Amour edit start -->
+        <BoxContainer Name="HeaderButtons" Orientation="Horizontal" Margin="10" HorizontalExpand="True">
+            <Button Name="RevertToBaseButton" Text="{Loc loadout-window-revert-to-base}" Visible="False"/>
+        </BoxContainer>
+        <!-- Amour edit end -->
         <BoxContainer Name="RoleNameBox" Orientation="Vertical" Margin="10">
             <Label Name="LoadoutNameLabel"/>
             <PanelContainer HorizontalExpand="True" SetHeight="24">
diff --git a/Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml.cs b/Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml.cs
index 16d36650bfe..e0878af3ae9 100644
--- a/Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml.cs
+++ b/Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml.cs
@@ -68,6 +68,7 @@ public sealed partial class LoadoutWindow : FancyWindow
     public event Action<string>? OnNameChanged;
     public event Action<ProtoId<LoadoutGroupPrototype>, ProtoId<LoadoutPrototype>>? OnLoadoutPressed;
     public event Action<ProtoId<LoadoutGroupPrototype>, ProtoId<LoadoutPrototype>>? OnLoadoutUnpressed;
+    public event Action? OnRevertToBase; // Amour edit
 
     private List<LoadoutGroupContainer> _groups = new();
 
@@ -76,10 +77,15 @@ public sealed partial class LoadoutWindow : FancyWindow
     // CCvar.
     private int _maxLoadoutNameLength;
 
-    public LoadoutWindow(HumanoidCharacterProfile profile, RoleLoadout loadout, RoleLoadoutPrototype proto, ICommonSession session, IDependencyCollection collection)
+    // Amour edit start
+    public LoadoutWindow(HumanoidCharacterProfile profile, RoleLoadout loadout, RoleLoadoutPrototype proto, ICommonSession session, IDependencyCollection collection, bool showRevertToBase = false)
     {
         RobustXamlLoader.Load(this);
         Profile = profile;
+
+        RevertToBaseButton.Visible = showRevertToBase;
+        RevertToBaseButton.OnPressed += _ => OnRevertToBase?.Invoke();
+        // Amour edit end
         var protoManager = collection.Resolve<IPrototypeManager>();
         var configManager = collection.Resolve<IConfigurationManager>();
 
diff --git a/Content.Server.Database/Migrations/Postgres/20260131214748_BaseLoadouts.cs b/Content.Server.Database/Migrations/Postgres/20260131214748_BaseLoadouts.cs
new file mode 100644
index 00000000000..11707fb070e
--- /dev/null
+++ b/Content.Server.Database/Migrations/Postgres/20260131214748_BaseLoadouts.cs
@@ -0,0 +1,48 @@
+// SPDX-FileCopyrightText: 2026
+// SPDX-License-Identifier: MIT
+
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Postgres;
+
+[DbContext(typeof(PostgresServerDbContext))]
+[Migration("20260131214748_BaseLoadouts")]
+/// <inheritdoc />
+public partial class BaseLoadouts : Migration
+{
+    /// <inheritdoc />
+    protected override void Up(MigrationBuilder migrationBuilder)
+    {
+        migrationBuilder.AddColumn<bool>(
+            name: "is_base",
+            table: "profile_role_loadout",
+            type: "boolean",
+            nullable: false,
+            defaultValue: false);
+
+        migrationBuilder.AddColumn<string>(
+            name: "overridden_groups",
+            table: "profile_role_loadout",
+            type: "text",
+            nullable: true);
+
+        migrationBuilder.AddColumn<bool>(
+            name: "entity_name_overridden",
+            table: "profile_role_loadout",
+            type: "boolean",
+            nullable: false,
+            defaultValue: false);
+    }
+
+    /// <inheritdoc />
+    protected override void Down(MigrationBuilder migrationBuilder)
+    {
+        migrationBuilder.DropColumn(name: "is_base", table: "profile_role_loadout");
+        migrationBuilder.DropColumn(name: "overridden_groups", table: "profile_role_loadout");
+        migrationBuilder.DropColumn(name: "entity_name_overridden", table: "profile_role_loadout");
+    }
+}
diff --git a/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs b/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
index 714a7e6dc45..7352de79ba1 100644
--- a/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
+++ b/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
@@ -1228,6 +1228,18 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("character varying(256)")
                         .HasColumnName("entity_name");
 
+                    b.Property<bool>("EntityNameOverridden")
+                        .HasColumnType("boolean")
+                        .HasColumnName("entity_name_overridden");
+
+                    b.Property<bool>("IsBase")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_base");
+
+                    b.Property<string>("OverriddenGroups")
+                        .HasColumnType("text")
+                        .HasColumnName("overridden_groups");
+
                     b.Property<int>("ProfileId")
                         .HasColumnType("integer")
                         .HasColumnName("profile_id");
diff --git a/Content.Server.Database/Migrations/Sqlite/20260131214748_BaseLoadouts.cs b/Content.Server.Database/Migrations/Sqlite/20260131214748_BaseLoadouts.cs
new file mode 100644
index 00000000000..14190bf57d1
--- /dev/null
+++ b/Content.Server.Database/Migrations/Sqlite/20260131214748_BaseLoadouts.cs
@@ -0,0 +1,48 @@
+// SPDX-FileCopyrightText: 2026
+// SPDX-License-Identifier: MIT
+
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Sqlite;
+
+[DbContext(typeof(SqliteServerDbContext))]
+[Migration("20260131214748_BaseLoadouts")]
+/// <inheritdoc />
+public partial class BaseLoadouts : Migration
+{
+    /// <inheritdoc />
+    protected override void Up(MigrationBuilder migrationBuilder)
+    {
+        migrationBuilder.AddColumn<bool>(
+            name: "is_base",
+            table: "profile_role_loadout",
+            type: "INTEGER",
+            nullable: false,
+            defaultValue: false);
+
+        migrationBuilder.AddColumn<string>(
+            name: "overridden_groups",
+            table: "profile_role_loadout",
+            type: "TEXT",
+            nullable: true);
+
+        migrationBuilder.AddColumn<bool>(
+            name: "entity_name_overridden",
+            table: "profile_role_loadout",
+            type: "INTEGER",
+            nullable: false,
+            defaultValue: false);
+    }
+
+    /// <inheritdoc />
+    protected override void Down(MigrationBuilder migrationBuilder)
+    {
+        migrationBuilder.DropColumn(name: "is_base", table: "profile_role_loadout");
+        migrationBuilder.DropColumn(name: "overridden_groups", table: "profile_role_loadout");
+        migrationBuilder.DropColumn(name: "entity_name_overridden", table: "profile_role_loadout");
+    }
+}
diff --git a/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs b/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
index 485849c5d24..e89f90de56c 100644
--- a/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
+++ b/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
@@ -1167,6 +1167,18 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("TEXT")
                         .HasColumnName("entity_name");
 
+                    b.Property<bool>("EntityNameOverridden")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("entity_name_overridden");
+
+                    b.Property<bool>("IsBase")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("is_base");
+
+                    b.Property<string>("OverriddenGroups")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("overridden_groups");
+
                     b.Property<int>("ProfileId")
                         .HasColumnType("INTEGER")
                         .HasColumnName("profile_id");
diff --git a/Content.Server.Database/Model.cs b/Content.Server.Database/Model.cs
index be9a8bdebb1..49b02422ddf 100644
--- a/Content.Server.Database/Model.cs
+++ b/Content.Server.Database/Model.cs
@@ -748,12 +748,31 @@ public class ProfileRoleLoadout
         /// </summary>
         public string RoleName { get; set; } = string.Empty;
 
+        // Amour edit start
+        /// <summary>
+        /// If true, this entry represents the profile's base (global) loadout.
+        /// </summary>
+        public bool IsBase { get; set; }
+
+        /// <summary>
+        /// Comma-separated list of group IDs that are overridden for this role.
+        /// </summary>
+        public string? OverriddenGroups { get; set; }
+        // Amour edit end
+
         /// <summary>
         /// Custom name of the role loadout if it supports it.
         /// </summary>
         [MaxLength(256)]
         public string? EntityName { get; set; }
 
+        // Amour edit start
+        /// <summary>
+        /// Whether <see cref="EntityName"/> is overridden for this role.
+        /// </summary>
+        public bool EntityNameOverridden { get; set; }
+        // Amour edit end
+
         /// <summary>
         /// Store the saved loadout groups. These may get validated and removed when loaded at runtime.
         /// </summary>
diff --git a/Content.Server/Database/ServerDbBase.cs b/Content.Server/Database/ServerDbBase.cs
index 0d424fdca80..651f9d6a121 100644
--- a/Content.Server/Database/ServerDbBase.cs
+++ b/Content.Server/Database/ServerDbBase.cs
@@ -381,13 +381,22 @@ private static HumanoidCharacterProfile ConvertProfiles(Profile profile)
             }
 
             var loadouts = new Dictionary<string, RoleLoadout>();
+            // Amour edit start
+            RoleLoadout? baseLoadout = null;
 
             foreach (var role in profile.Loadouts)
             {
                 var loadout = new RoleLoadout(role.RoleName)
                 {
                     EntityName = role.EntityName,
+                    EntityNameOverridden = role.EntityNameOverridden,
+                    OverriddenGroups = string.IsNullOrWhiteSpace(role.OverriddenGroups)
+                        ? new HashSet<ProtoId<LoadoutGroupPrototype>>()
+                        : role.OverriddenGroups.Split(',', StringSplitOptions.RemoveEmptyEntries)
+                            .Select(s => new ProtoId<LoadoutGroupPrototype>(s.Trim()))
+                            .ToHashSet(),
                 };
+                // Amour edit end
 
                 foreach (var group in role.Groups)
                 {
@@ -401,7 +410,12 @@ private static HumanoidCharacterProfile ConvertProfiles(Profile profile)
                     }
                 }
 
-                loadouts[role.RoleName] = loadout;
+                // Amour edit start
+                if (role.IsBase)
+                    baseLoadout = loadout;
+                else
+                    loadouts[role.RoleName] = loadout;
+                // Amour edit end
             }
 
             var barkVoice = profile.BarkVoice ?? SharedHumanoidAppearanceSystem.DefaultBarkVoice; // Goob Station - Barks
@@ -444,6 +458,7 @@ private static HumanoidCharacterProfile ConvertProfiles(Profile profile)
                 (PreferenceUnavailableMode) profile.PreferenceUnavailable,
                 antags.ToHashSet(),
                 traits.ToHashSet(),
+                baseLoadout,
                 loadouts,
                 barkVoice, // Goob Station - Barks
                 voice // Amour - TTS
@@ -517,12 +532,39 @@ private static Profile ConvertProfiles(HumanoidCharacterProfile humanoid, int sl
 
             profile.Loadouts.Clear();
 
+            // Amour edit start
+            // Save base loadout.
+            var baseEntry = new ProfileRoleLoadout
+            {
+                RoleName = humanoid.BaseLoadout.Role,
+                IsBase = true,
+                EntityName = humanoid.BaseLoadout.EntityName,
+                EntityNameOverridden = humanoid.BaseLoadout.EntityNameOverridden,
+                OverriddenGroups = string.Join(',', humanoid.BaseLoadout.OverriddenGroups.Select(g => g.Id)),
+            };
+
+            foreach (var (group, groupLoadouts) in humanoid.BaseLoadout.SelectedLoadouts)
+            {
+                var profileGroup = new ProfileLoadoutGroup { GroupName = group };
+                foreach (var loadout in groupLoadouts)
+                    profileGroup.Loadouts.Add(new ProfileLoadout { LoadoutName = loadout.Prototype });
+                baseEntry.Groups.Add(profileGroup);
+            }
+
+            profile.Loadouts.Add(baseEntry);
+            // Amour edit end
+
             foreach (var (role, loadouts) in humanoid.Loadouts)
             {
                 var dz = new ProfileRoleLoadout
                 {
                     RoleName = role,
-                    EntityName = loadouts.EntityName ?? string.Empty,
+                    // Amour edit start
+                    IsBase = false,
+                    EntityName = loadouts.EntityName,
+                    EntityNameOverridden = loadouts.EntityNameOverridden,
+                    OverriddenGroups = string.Join(',', loadouts.OverriddenGroups.Select(g => g.Id)),
+                    // Amour edit end
                 };
 
                 foreach (var (group, groupLoadouts) in loadouts.SelectedLoadouts)
diff --git a/Content.Server/Station/Systems/StationSpawningSystem.cs b/Content.Server/Station/Systems/StationSpawningSystem.cs
index 1bfa6f38cf0..75706498cf8 100644
--- a/Content.Server/Station/Systems/StationSpawningSystem.cs
+++ b/Content.Server/Station/Systems/StationSpawningSystem.cs
@@ -190,17 +190,13 @@ public EntityUid SpawnPlayerMob(
         // Need to get the loadout up-front to handle names if we use an entity spawn override.
         var jobLoadout = LoadoutSystem.GetJobPrototype(prototype?.ID);
 
-        if (_prototypeManager.TryIndex(jobLoadout, out RoleLoadoutPrototype? roleProto))
+        // Amour edit start
+        if (_prototypeManager.TryIndex(jobLoadout, out RoleLoadoutPrototype? roleProto) && profile != null)
         {
-            profile?.Loadouts.TryGetValue(jobLoadout, out loadout);
-
-            // Set to default if not present
-            if (loadout == null)
-            {
-                loadout = new RoleLoadout(jobLoadout);
-                loadout.SetDefault(profile, _actors.GetSession(entity), _prototypeManager);
-            }
+            // Base + per-role overrides.
+            loadout = profile.GetEffectiveLoadout(jobLoadout, _actors.GetSession(entity), _prototypeManager);
         }
+        // Amour edit end
 
         // If we're not spawning a humanoid, we're gonna exit early without doing all the humanoid stuff.
         if (prototype?.JobEntity != null)
diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
index 7197f8125b6..3e944024dbe 100644
--- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs
+++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
@@ -109,9 +109,30 @@ public sealed partial class HumanoidCharacterProfile : ICharacterProfile
         /// </summary>
         public IReadOnlyDictionary<string, RoleLoadout> Loadouts => _loadouts;
 
+        // Amour edit start
+        /// <summary>
+        /// Prototype ID for the base crew loadout.
+        /// </summary>
+        public const string BaseLoadoutProtoId = "BaseCrew";
+
+        /// <summary>
+        /// Base loadout applied to all crew job loadouts, unless overridden.
+        /// Stored separately from per-role overrides.
+        /// </summary>
+        public RoleLoadout BaseLoadout => _baseLoadout;
+        // Amour edit end
+
         [DataField]
         private Dictionary<string, RoleLoadout> _loadouts = new();
 
+        // Amour edit start
+        /// <summary>
+        /// Base loadout applied to all crew jobs.
+        /// </summary>
+        [DataField]
+        private RoleLoadout _baseLoadout = new(BaseLoadoutProtoId);
+        // Amour edit end
+
         [DataField]
         public string Name { get; set; } = "John Doe";
 
@@ -251,6 +272,7 @@ public HumanoidCharacterProfile(
             PreferenceUnavailableMode preferenceUnavailable,
             HashSet<ProtoId<AntagPrototype>> antagPreferences,
             HashSet<ProtoId<TraitPrototype>> traitPreferences,
+            RoleLoadout? baseLoadout, // Amour edit
             Dictionary<string, RoleLoadout> loadouts,
             ProtoId<BarkPrototype> barkVoice, // Goob Station - Barks
             ProtoId<TTSVoicePrototype> voice) // Amour - TTS
@@ -282,6 +304,7 @@ public HumanoidCharacterProfile(
             PreferenceUnavailable = preferenceUnavailable;
             _antagPreferences = antagPreferences;
             _traitPreferences = traitPreferences;
+            _baseLoadout = baseLoadout ?? new RoleLoadout(BaseLoadoutProtoId); // Amour edit
             _loadouts = loadouts;
             BarkVoice = barkVoice; // Goob Station - Barks
             Voice = voice; // Amour - TTS
@@ -330,7 +353,8 @@ public HumanoidCharacterProfile(HumanoidCharacterProfile other)
                 other.PreferenceUnavailable,
                 new HashSet<ProtoId<AntagPrototype>>(other.AntagPreferences),
                 new HashSet<ProtoId<TraitPrototype>>(other.TraitPreferences),
-                new Dictionary<string, RoleLoadout>(other.Loadouts),
+                other.BaseLoadout.Clone(), // Amour edit
+                other.Loadouts.ToDictionary(kvp => kvp.Key, kvp => kvp.Value.Clone()), // Amour edit - deep copy loadouts
                 other.BarkVoice, // Goob Station - Barks
                 other.Voice) // Amour - TTS
         {
@@ -722,6 +746,7 @@ public bool MemberwiseEquals(ICharacterProfile maybeOther)
             if (!_antagPreferences.SequenceEqual(other._antagPreferences)) return false;
             if (!_traitPreferences.SequenceEqual(other._traitPreferences)) return false;
             if (!Loadouts.SequenceEqual(other.Loadouts)) return false;
+            if (!BaseLoadout.Equals(other.BaseLoadout)) return false; // Amour edit
             if (FlavorText != other.FlavorText) return false;
             // Orion-Start
             if (OocFlavorText != other.OocFlavorText) return false;
@@ -1040,6 +1065,12 @@ public void EnsureValid(ICommonSession session, IDependencyCollection collection
             // Checks prototypes exist for all loadouts and dump / set to default if not.
             var toRemove = new ValueList<string>();
 
+            // Amour edit start
+            // Validate base loadout.
+            _baseLoadout.Role = BaseLoadoutProtoId;
+            _baseLoadout.EnsureValid(this, session, collection);
+            // Amour edit end
+
             foreach (var (roleName, loadouts) in _loadouts)
             {
                 if (!prototypeManager.HasIndex<RoleLoadoutPrototype>(roleName))
@@ -1123,6 +1154,7 @@ public override int GetHashCode()
             hashCode.Add(_jobPriorities);
             hashCode.Add(_antagPreferences);
             hashCode.Add(_traitPreferences);
+            hashCode.Add(_baseLoadout);
             hashCode.Add(_loadouts);
             hashCode.Add(Name);
             hashCode.Add(FlavorText);
@@ -1158,6 +1190,13 @@ public void SetLoadout(RoleLoadout loadout)
             _loadouts[loadout.Role.Id] = loadout;
         }
 
+        // Amour edit start
+        public void SetBaseLoadout(RoleLoadout loadout)
+        {
+            _baseLoadout = loadout;
+        }
+        // Amour edit end
+
         public HumanoidCharacterProfile WithLoadout(RoleLoadout loadout)
         {
             // Deep copies so we don't modify the DB profile.
@@ -1177,6 +1216,36 @@ public HumanoidCharacterProfile WithLoadout(RoleLoadout loadout)
             return profile;
         }
 
+        // Amour edit start
+        /// <summary>
+        /// Removes the per-role loadout overrides for the specified role.
+        /// This makes the role inherit purely from <see cref="BaseLoadout"/> again.
+        /// </summary>
+        public HumanoidCharacterProfile WithoutLoadout(string roleId)
+        {
+            var copied = new Dictionary<string, RoleLoadout>();
+
+            foreach (var (key, value) in _loadouts)
+            {
+                if (key == roleId)
+                    continue;
+
+                copied[key] = value.Clone();
+            }
+
+            var profile = Clone();
+            profile._loadouts = copied;
+            return profile;
+        }
+
+        public HumanoidCharacterProfile WithBaseLoadout(RoleLoadout loadout)
+        {
+            var profile = Clone();
+            profile._baseLoadout = loadout.Clone();
+            return profile;
+        }
+        // Amour edit end
+
         public RoleLoadout GetLoadoutOrDefault(string id, ICommonSession? session, ProtoId<SpeciesPrototype>? species, IEntityManager entManager, IPrototypeManager protoManager)
         {
             if (!_loadouts.TryGetValue(id, out var loadout))
@@ -1189,6 +1258,48 @@ public RoleLoadout GetLoadoutOrDefault(string id, ICommonSession? session, Proto
             return loadout;
         }
 
+        // Amour edit start
+        public RoleLoadout GetEffectiveLoadout(string roleId, ICommonSession? session, IPrototypeManager protoManager)
+        {
+            var effective = new RoleLoadout(roleId);
+            effective.SetDefault(this, session, protoManager, force: true);
+
+            var baseCopy = _baseLoadout.Clone();
+            baseCopy.Role = BaseLoadoutProtoId;
+            baseCopy.SetDefault(this, session, protoManager);
+
+            if (protoManager.TryIndex<RoleLoadoutPrototype>(roleId, out var roleProto))
+            {
+                foreach (var group in roleProto.Groups)
+                {
+                    if (baseCopy.SelectedLoadouts.TryGetValue(group, out var baseSel))
+                        effective.SelectedLoadouts[group] = new List<Loadout>(baseSel);
+                }
+
+                // Inherit base name if role name not overridden.
+                if (baseCopy.EntityName != null)
+                    effective.EntityName = baseCopy.EntityName;
+            }
+
+            // Apply role overrides.
+            if (_loadouts.TryGetValue(roleId, out var overrides))
+            {
+                overrides.SetDefault(this, session, protoManager);
+
+                foreach (var group in overrides.OverriddenGroups)
+                {
+                    if (overrides.SelectedLoadouts.TryGetValue(group, out var sel))
+                        effective.SelectedLoadouts[group] = new List<Loadout>(sel);
+                }
+
+                if (overrides.EntityNameOverridden)
+                    effective.EntityName = overrides.EntityName;
+            }
+
+            return effective;
+        }
+        // Amour edit end
+
         // Orion-Start
         private string FormatTags(string inputTags)
         {
diff --git a/Content.Shared/Preferences/Loadouts/RoleLoadout.cs b/Content.Shared/Preferences/Loadouts/RoleLoadout.cs
index 8910e4228ac..0448b4bc5b0 100644
--- a/Content.Shared/Preferences/Loadouts/RoleLoadout.cs
+++ b/Content.Shared/Preferences/Loadouts/RoleLoadout.cs
@@ -94,11 +94,29 @@ public sealed partial class RoleLoadout : IEquatable<RoleLoadout>
     [DataField]
     public Dictionary<ProtoId<LoadoutGroupPrototype>, List<Loadout>> SelectedLoadouts = new();
 
+    // Amour edit start
+    /// <summary>
+    /// Groups that have been overridden for this role.
+    /// If a group is not present here, it is inherited from the base loadout.
+    /// </summary>
+    [DataField]
+    public HashSet<ProtoId<LoadoutGroupPrototype>> OverriddenGroups = new();
+    // Amour edit end
+
     /// <summary>
     /// Loadout specific name.
     /// </summary>
     public string? EntityName;
 
+    // Amour edit start
+    /// <summary>
+    /// Whether <see cref="EntityName"/> has been explicitly overridden for this role.
+    /// If false, the effective name is inherited from the base loadout.
+    /// </summary>
+    [DataField]
+    public bool EntityNameOverridden;
+    // Amour edit end
+
     /*
      * Loadout-specific data used for validation.
      */
@@ -120,6 +138,10 @@ public RoleLoadout Clone()
         }
 
         weh.EntityName = EntityName;
+        // Amour edit start
+        weh.EntityNameOverridden = EntityNameOverridden;
+        weh.OverriddenGroups = new HashSet<ProtoId<LoadoutGroupPrototype>>(OverriddenGroups);
+        // Amour edit end
 
         return weh;
     }
@@ -144,6 +166,7 @@ public void EnsureValid(HumanoidCharacterProfile profile, ICommonSession session
         if (!roleProto.CanCustomizeName)
         {
             EntityName = null;
+            EntityNameOverridden = false; // Amour edit
         }
 
         // Validate name length
@@ -161,6 +184,7 @@ public void EnsureValid(HumanoidCharacterProfile profile, ICommonSession session
             if (name.Length == 0)
             {
                 EntityName = null;
+                EntityNameOverridden = false; // Amour edit
             }
         }
 
@@ -300,10 +324,8 @@ public void SetDefault(HumanoidCharacterProfile? profile, ICommonSession? sessio
 
             if (groupProto.MinLimit > 0)
             {
-                // Apply any loadouts we can.
                 foreach (var protoId in groupProto.Loadouts)
                 {
-                    // Reached the limit, time to stop
                     if (loadouts.Count >= groupProto.MinLimit)
                         break;
 
@@ -315,7 +337,6 @@ public void SetDefault(HumanoidCharacterProfile? profile, ICommonSession? sessio
                         Prototype = loadoutProto.ID,
                     };
 
-                    // Not valid so don't default to it anyway.
                     if (!IsValid(profile, session, defaultLoadout.Prototype, collection, out _))
                         continue;
 
@@ -428,7 +449,11 @@ public bool Equals(RoleLoadout? other)
         if (!Role.Equals(other.Role) ||
             SelectedLoadouts.Count != other.SelectedLoadouts.Count ||
             Points != other.Points ||
-            EntityName != other.EntityName)
+            EntityName != other.EntityName ||
+            // Amour edit start
+            EntityNameOverridden != other.EntityNameOverridden ||
+            !OverriddenGroups.SetEquals(other.OverriddenGroups))
+            // Amour edit end
         {
             return false;
         }
@@ -453,6 +478,6 @@ public override bool Equals(object? obj)
 
     public override int GetHashCode()
     {
-        return HashCode.Combine(Role, SelectedLoadouts, Points);
+        return HashCode.Combine(Role, SelectedLoadouts, OverriddenGroups, Points, EntityName, EntityNameOverridden); // Amour edit
     }
 }
\ No newline at end of file
diff --git a/Resources/Locale/en-US/job/loadouts.ftl b/Resources/Locale/en-US/job/loadouts.ftl
index 379c7a60568..92fb6b5529d 100644
--- a/Resources/Locale/en-US/job/loadouts.ftl
+++ b/Resources/Locale/en-US/job/loadouts.ftl
@@ -4,4 +4,6 @@
 # SPDX-License-Identifier: MIT
 
 loadout-window = Loadout
+loadout-window-base = Base loadouts
+loadout-window-revert-to-base = Revert to base loadouts
 loadout-none = None
diff --git a/Resources/Locale/ru-RU/job/loadouts.ftl b/Resources/Locale/ru-RU/job/loadouts.ftl
index 0d909d95c6b..889431e9575 100644
--- a/Resources/Locale/ru-RU/job/loadouts.ftl
+++ b/Resources/Locale/ru-RU/job/loadouts.ftl
@@ -1,2 +1,4 @@
 loadout-window = Снаряжение
+loadout-window-base = Базовые лодауты
+loadout-window-revert-to-base = Откатиться к базовым лодаутам
 loadout-none = Ничего
diff --git a/Resources/Prototypes/_Amour/Loadouts/base_role_loadout.yml b/Resources/Prototypes/_Amour/Loadouts/base_role_loadout.yml
new file mode 100644
index 00000000000..f47d9acae63
--- /dev/null
+++ b/Resources/Prototypes/_Amour/Loadouts/base_role_loadout.yml
@@ -0,0 +1,9 @@
+- type: roleLoadout
+  id: BaseCrew
+  groups:
+  - Trinkets
+  - Animals
+  - Undershirt
+  - Underwear
+  - Socks
+  - Wrists