diff --git a/Content.Client/Humanoid/HumanoidAppearanceSystem.cs b/Content.Client/Humanoid/HumanoidAppearanceSystem.cs
index 22e2170c9f..8087d1833e 100644
--- a/Content.Client/Humanoid/HumanoidAppearanceSystem.cs
+++ b/Content.Client/Humanoid/HumanoidAppearanceSystem.cs
@@ -204,8 +204,8 @@ public override void LoadProfile(EntityUid uid, HumanoidCharacterProfile profile
         humanoid.Species = profile.Species;
         humanoid.SkinColor = profile.Appearance.SkinColor;
         humanoid.EyeColor = profile.Appearance.EyeColor;
-        humanoid.Height = profile.Height; // Parkstation-HeightSlider
-        humanoid.Width = profile.Width; // Parkstation-HeightSlider
+        humanoid.Height = profile.Height;
+        humanoid.Width = profile.Width;
 
         UpdateSprite(humanoid, Comp<SpriteComponent>(uid));
     }
diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
index 2242720dac..e1be2e1fe2 100644
--- a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
+++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
@@ -109,7 +109,7 @@
                                     <Control HorizontalExpand="True"/>
                                     <OptionButton Name="CSpawnPriorityButton" HorizontalAlignment="Right" />
                                 </BoxContainer>
-								<!-- Height -->
+								                <!-- Height -->
                                 <BoxContainer HorizontalExpand="True">
                                     <Label Name="CHeightLabel" MinWidth="110" />
                                     <Slider Name="CHeightSlider" MinValue="0.5" Value="1" MaxValue="1.5" HorizontalExpand="True" Margin="5 0 5 0" />
@@ -121,6 +121,10 @@
                                     <Slider Name="CWidthSlider" MinValue="0.5" Value="1" MaxValue="1.5" HorizontalExpand="True" Margin="5 0 5 0" />
                                     <Button Name="CWidthReset" Text="{Loc 'ui-options-bind-reset'}" />
                                 </BoxContainer>
+                                <!--Weight -->
+                                <BoxContainer HorizontalExpand="True">
+                                    <Label Name="CWeightLabel" />
+                                </BoxContainer>
                             </BoxContainer>
                             <!-- Skin -->
                             <BoxContainer Margin="10" HorizontalExpand="True" Orientation="Vertical">
@@ -154,18 +158,29 @@
                         <BoxContainer Name="CAntagList" Orientation="Vertical" />
                     </ScrollContainer>
                 </BoxContainer>
-                <BoxContainer Orientation="Vertical" Margin="10">
+                <BoxContainer Name="CTraitsTab" Orientation="Vertical" Margin="10">
                     <!-- Traits -->
-                    <ScrollContainer VerticalExpand="True">
-                        <BoxContainer Name="CTraitsList" Orientation="Vertical" />
-                    </ScrollContainer>
+                    <Label Name="TraitPointsLabel" HorizontalAlignment="Stretch" Align="Center" />
+                    <ProgressBar Name="TraitPointsBar" MaxValue="1" Value="1" MaxHeight="8" Margin="0 5" />
+
+                    <Button Name="TraitsShowUnusableButton"
+                            Text="{Loc 'humanoid-profile-editor-traits-show-unusable-button'}"
+                            ToolTip="{Loc 'humanoid-profile-editor-traits-show-unusable-button-tooltip'}"
+                            ToggleMode="True"
+                            Margin="0 0 0 5" />
+
+                    <TabContainer Name="CTraitsTabs" VerticalExpand="True" />
                 </BoxContainer>
                 <BoxContainer Name="CLoadoutsTab" Orientation="Vertical" Margin="10">
                     <!-- Loadouts -->
                     <Label Name="LoadoutPointsLabel" HorizontalAlignment="Stretch" Align="Center" />
                     <ProgressBar Name="LoadoutPointsBar" MaxValue="1" Value="1" MaxHeight="8" Margin="0 5" />
 
-                    <Button Name="CHideShowUnusableButton" Text="{Loc 'humanoid-profile-editor-loadouts-show-unusable-button'}" ToolTip="{Loc 'humanoid-profile-editor-loadouts-show-unusable-button-tooltip'}" ToggleMode="True" Margin="0 0 0 5" />
+                    <Button Name="LoadoutsShowUnusableButton"
+                            Text="{Loc 'humanoid-profile-editor-loadouts-show-unusable-button'}"
+                            ToolTip="{Loc 'humanoid-profile-editor-loadouts-show-unusable-button-tooltip'}"
+                            ToggleMode="True"
+                            Margin="0 0 0 5" />
 
                     <TabContainer Name="CLoadoutsTabs" VerticalExpand="True" />
                 </BoxContainer>
diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
index 537b19479c..d8c1d395d5 100644
--- a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
@@ -14,6 +14,7 @@
 using Content.Shared.CCVar;
 using Content.Shared.Clothing.Loadouts.Prototypes;
 using Content.Shared.Clothing.Loadouts.Systems;
+using Content.Shared.Customization.Systems;
 using Content.Shared.GameTicking;
 using Content.Shared.Humanoid;
 using Content.Shared.Humanoid.Markings;
@@ -32,6 +33,7 @@
 using Robust.Shared.Configuration;
 using Robust.Shared.Enums;
 using Robust.Shared.Map;
+using Robust.Shared.Physics;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
@@ -63,6 +65,7 @@ public sealed partial class HumanoidProfileEditor : Control
         private readonly IConfigurationManager _configurationManager;
         private readonly MarkingManager _markingManager;
         private readonly JobRequirementsManager _requirements;
+        private readonly CharacterRequirementsSystem _characterRequirementsSystem;
         private readonly LoadoutSystem _loadoutSystem;
 
         private LineEdit _ageEdit => CAgeEdit;
@@ -87,10 +90,15 @@ public sealed partial class HumanoidProfileEditor : Control
         private TabContainer _tabContainer => CTabContainer;
         private BoxContainer _jobList => CJobList;
         private BoxContainer _antagList => CAntagList;
-        private BoxContainer _traitsList => CTraitsList;
+        private Label _traitPointsLabel => TraitPointsLabel;
+        private int _traitCount;
+        private ProgressBar _traitPointsBar => TraitPointsBar;
+        private Button _traitsShowUnusableButton => TraitsShowUnusableButton;
+        private BoxContainer _traitsTab => CTraitsTab;
+        private TabContainer _traitsTabs => CTraitsTabs;
         private Label _loadoutPointsLabel => LoadoutPointsLabel;
         private ProgressBar _loadoutPointsBar => LoadoutPointsBar;
-        private Button _loadoutsShowUnusableButton => CHideShowUnusableButton;
+        private Button _loadoutsShowUnusableButton => LoadoutsShowUnusableButton;
         private BoxContainer _loadoutsTab => CLoadoutsTab;
         private TabContainer _loadoutsTabs => CLoadoutsTabs;
         private readonly List<JobPrioritySelector> _jobPriorities;
@@ -128,6 +136,7 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
             _preferencesManager = preferencesManager;
             _configurationManager = configurationManager;
             _markingManager = IoCManager.Resolve<MarkingManager>();
+            _characterRequirementsSystem = EntitySystem.Get<CharacterRequirementsSystem>();
             _loadoutSystem = EntitySystem.Get<LoadoutSystem>();
 
             SpeciesInfoButton.ToolTip = Loc.GetString("humanoid-profile-editor-guidebook-button-tooltip");
@@ -217,7 +226,8 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
             _heightSlider.MinValue = prototype.MinHeight;
             _heightSlider.MaxValue = prototype.MaxHeight;
             _heightSlider.Value = Profile?.Height ?? prototype.DefaultHeight;
-            CHeightLabel.Text = Loc.GetString("humanoid-profile-editor-height-label", ("height", _heightSlider.Value));
+            var height = MathF.Round(prototype.AverageHeight * _heightSlider.Value);
+            CHeightLabel.Text = Loc.GetString("humanoid-profile-editor-height-label", ("height", (int) height));
 
             _heightSlider.OnValueChanged += args =>
             {
@@ -227,22 +237,25 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
                 prototype = _speciesList.Find(x => x.ID == Profile.Species) ?? _speciesList.First(); // Just in case
 
                 var value = Math.Clamp(args.Value, prototype.MinHeight, prototype.MaxHeight);
-                var height = value.ToString(CultureInfo.InvariantCulture);
-                CHeightLabel.Text = Loc.GetString("humanoid-profile-editor-height-label", ("height", height.Length > 4 ? height[..4] : height));
+                var height = MathF.Round(prototype.AverageHeight * value);
+                CHeightLabel.Text = Loc.GetString("humanoid-profile-editor-height-label", ("height", (int) height));
                 SetProfileHeight(value);
+                UpdateWeight();
             };
 
             CHeightReset.OnPressed += _ =>
             {
                 _heightSlider.Value = prototype.DefaultHeight;
                 SetProfileHeight(prototype.DefaultHeight);
+                UpdateWeight();
             };
 
 
             _widthSlider.MinValue = prototype.MinWidth;
             _widthSlider.MaxValue = prototype.MaxWidth;
             _widthSlider.Value = Profile?.Width ?? prototype.DefaultWidth;
-            CWidthLabel.Text = Loc.GetString("humanoid-profile-editor-width-label", ("width", _widthSlider.Value));
+            var width = MathF.Round(prototype.AverageWidth * _widthSlider.Value);
+            CWidthLabel.Text = Loc.GetString("humanoid-profile-editor-width-label", ("width", width));
 
             _widthSlider.OnValueChanged += args =>
             {
@@ -252,17 +265,35 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
                 prototype = _speciesList.Find(x => x.ID == Profile.Species) ?? _speciesList.First(); // Just in case
 
                 var value = Math.Clamp(args.Value, prototype.MinWidth, prototype.MaxWidth);
-                var width = value.ToString(CultureInfo.InvariantCulture);
-                CWidthLabel.Text = Loc.GetString("humanoid-profile-editor-width-label", ("width", width.Length > 4 ? width[..4] : width));
+                var width = MathF.Round(prototype.AverageWidth * value);
+                CWidthLabel.Text = Loc.GetString("humanoid-profile-editor-width-label", ("width", width));
                 SetProfileWidth(value);
+                UpdateWeight();
             };
 
             CWidthReset.OnPressed += _ =>
             {
                 _widthSlider.Value = prototype.DefaultWidth;
                 SetProfileWidth(prototype.DefaultWidth);
+                UpdateWeight();
             };
 
+            prototypeManager.Index(prototype.Prototype).TryGetComponent<FixturesComponent>(out var fixture);
+            if (fixture != null)
+            {
+                var radius = fixture.Fixtures["fix1"].Shape.Radius;
+                var density = fixture.Fixtures["fix1"].Density;
+                var avg = (_widthSlider.Value + _heightSlider.Value) / 2;
+                var weight = MathF.Round(MathF.PI * MathF.Pow(radius * avg, 2) * density);
+                CWeightLabel.Text = Loc.GetString("humanoid-profile-editor-weight-label", ("weight", (int) weight));
+            }
+            else
+            {
+                //Whelp, the fixture doesn't exist, guesstimate it instead
+                CWeightLabel.Text = Loc.GetString("humanoid-profile-editor-weight-label", ("weight", (int) 71));
+            }
+
+
             #endregion Height
 
             #region Skin
@@ -504,33 +535,19 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
 
             #region Traits
 
-            var traits = prototypeManager.EnumeratePrototypes<TraitPrototype>().OrderBy(t => Loc.GetString(t.Name)).ToList();
-            _traitPreferences = new List<TraitPreferenceSelector>();
+            // Set up the traits tab
             _tabContainer.SetTabTitle(3, Loc.GetString("humanoid-profile-editor-traits-tab"));
+            _traitPreferences = new List<TraitPreferenceSelector>();
 
-            if (traits.Count > 0)
-            {
-                foreach (var trait in traits)
-                {
-                    var selector = new TraitPreferenceSelector(trait);
-                    _traitsList.AddChild(selector);
-                    _traitPreferences.Add(selector);
+            // Show/Hide the traits tab if they ever get enabled/disabled
+            var traitsEnabled = _configurationManager.GetCVar(CCVars.GameTraitsEnabled);
+            _tabContainer.SetTabVisible(3, traitsEnabled);
+            _configurationManager.OnValueChanged(CCVars.GameTraitsEnabled,
+                enabled => _tabContainer.SetTabVisible(3, enabled));
 
-                    selector.PreferenceChanged += preference =>
-                    {
-                        Profile = Profile?.WithTraitPreference(trait.ID, preference);
-                        IsDirty = true;
-                    };
-                }
-            }
-            else
-            {
-                _traitsList.AddChild(new Label
-                {
-                    Text = "No traits available :(",
-                    FontColorOverride = Color.Gray,
-                });
-            }
+            _traitsShowUnusableButton.OnToggled += args => UpdateTraits(args.Pressed);
+
+            UpdateTraits(false);
 
             #endregion
 
@@ -540,14 +557,17 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
             _tabContainer.SetTabTitle(4, Loc.GetString("humanoid-profile-editor-loadouts-tab"));
             _loadoutPreferences = new List<LoadoutPreferenceSelector>();
 
-            // Show/Hide loadouts tab if they ever get enabled/disabled
+            // Show/Hide the loadouts tab if they ever get enabled/disabled
             var loadoutsEnabled = _configurationManager.GetCVar(CCVars.GameLoadoutsEnabled);
             _tabContainer.SetTabVisible(4, loadoutsEnabled);
             ShowLoadouts.Visible = loadoutsEnabled;
-            _configurationManager.OnValueChanged(CCVars.GameLoadoutsEnabled, enabled => LoadoutsChanged(enabled));
+            _configurationManager.OnValueChanged(CCVars.GameLoadoutsEnabled,
+                enabled => LoadoutsChanged(enabled));
 
             _loadoutsShowUnusableButton.OnToggled += args => UpdateLoadouts(args.Pressed);
 
+            UpdateLoadouts(false);
+
             #endregion
 
             #region Save
@@ -602,8 +622,6 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
             _previewDummy = _entMan.SpawnEntity(dollProto, MapCoordinates.Nullspace);
             _previewSpriteView.SetEntity(_previewDummy);
 
-            UpdateLoadouts(false); // Initial UpdateLoadouts call has to have a dummy to get information from
-
             #endregion Dummy
 
             #endregion Left
@@ -622,6 +640,7 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
             IsDirty = false;
         }
 
+
         private void LoadoutsChanged(bool enabled)
         {
             _tabContainer.SetTabVisible(4, enabled);
@@ -943,6 +962,7 @@ private void SetSpecies(string newSpecies)
             UpdateSexControls(); // update sex for new species
             UpdateHeightControls();// - Changing species provides inaccurate sliders
             UpdateWidthControls();// - Changing species provides inaccurate sliders
+            UpdateWeight();
             RebuildSpriteView(); // they might have different inv so we need a new dummy
             UpdateSpeciesGuidebookIcon();
             IsDirty = true;
@@ -1199,9 +1219,8 @@ private void UpdateHeightControls()
             _heightSlider.MinValue = species.MinHeight;
             _heightSlider.Value = Profile.Height;
             _heightSlider.MaxValue = species.MaxHeight;
-
-            var height = Profile.Height.ToString(CultureInfo.InvariantCulture);
-            CHeightLabel.Text = Loc.GetString("humanoid-profile-editor-height-label", ("height", height.Length > 4 ? height[..4] : height));
+            var height = MathF.Round(species.AverageHeight * _heightSlider.Value);
+            CHeightLabel.Text = Loc.GetString("humanoid-profile-editor-height-label", ("height", (int) height));
         }
 
         private void UpdateWidthControls()
@@ -1214,9 +1233,25 @@ private void UpdateWidthControls()
             _widthSlider.MinValue = species.MinWidth;
             _widthSlider.Value = Profile.Width;
             _widthSlider.MaxValue = species.MaxWidth;
+            var width = MathF.Round(species.AverageWidth * _widthSlider.Value);
+            CWidthLabel.Text = Loc.GetString("humanoid-profile-editor-width-label", ("width", (int) width));
+        }
 
-            var width = Profile.Width.ToString(CultureInfo.InvariantCulture);
-            CWidthLabel.Text = Loc.GetString("humanoid-profile-editor-width-label", ("width", width.Length > 4 ? width[..4] : width));
+        private void UpdateWeight()
+        {
+            if (Profile == null)
+                return;
+            var species = _speciesList.Find(x => x.ID == Profile.Species) ?? _speciesList.First();
+            _prototypeManager.Index(species.Prototype).TryGetComponent<FixturesComponent>(out var fixture);
+            if (fixture != null)
+            {
+                var radius = fixture.Fixtures["fix1"].Shape.Radius;
+                var density = fixture.Fixtures["fix1"].Density;
+                var avg = (Profile.Width + Profile.Height) / 2;
+                var weight = MathF.Round(MathF.PI * MathF.Pow(radius * avg, 2) * density);
+                CWeightLabel.Text = Loc.GetString("humanoid-profile-editor-weight-label", ("weight", (int) weight));
+            }
+            _previewSpriteView.InvalidateMeasure();
         }
 
         private void UpdateHairPickers()
@@ -1376,6 +1411,7 @@ public void UpdateControls()
             UpdateCMarkingsFacialHair();
             UpdateHeightControls();
             UpdateWidthControls();
+            UpdateWeight();
 
             _preferenceUnavailableButton.SelectId((int) Profile.PreferenceUnavailable);
         }
@@ -1555,12 +1591,264 @@ private void UpdateAntagPreferences()
 
         private void UpdateTraitPreferences()
         {
+            var points = _configurationManager.GetCVar(CCVars.GameTraitsDefaultPoints);
+            _traitCount = 0;
+
             foreach (var preferenceSelector in _traitPreferences)
             {
                 var traitId = preferenceSelector.Trait.ID;
                 var preference = Profile?.TraitPreferences.Contains(traitId) ?? false;
 
                 preferenceSelector.Preference = preference;
+
+                if (!preference)
+                    continue;
+
+                points += preferenceSelector.Trait.Points;
+                _traitCount += 1;
+            }
+
+            _traitPointsBar.Value = points;
+            _traitPointsLabel.Text = Loc.GetString("humanoid-profile-editor-traits-header",
+                ("points", points), ("traits", _traitCount),
+                ("maxTraits", _configurationManager.GetCVar(CCVars.GameTraitsMax)));
+        }
+
+        // Yeah this is mostly just copied from UpdateLoadouts
+        // This whole file is bad though and a lot of loadout code came from traits originally
+        //TODO Make this file not hell
+        private void UpdateTraits(bool showUnusable)
+        {
+            // Reset trait points so you don't get -14 points or something for no reason
+            var points = _configurationManager.GetCVar(CCVars.GameTraitsDefaultPoints);
+            _traitPointsLabel.Text = Loc.GetString("humanoid-profile-editor-traits-header",
+                ("points", points), ("traits", 0),
+                ("maxTraits", _configurationManager.GetCVar(CCVars.GameTraitsMax)));
+            _traitPointsBar.MaxValue = points;
+            _traitPointsBar.Value = points;
+
+            // Clear current listings
+            _traitPreferences.Clear();
+            _traitsTabs.DisposeAllChildren();
+
+
+            // Get the highest priority job to use for trait filtering
+            var highJob = _jobPriorities.FirstOrDefault(j => j.Priority == JobPriority.High);
+
+            // Get all trait prototypes
+            var enumeratedTraits = _prototypeManager.EnumeratePrototypes<TraitPrototype>().ToList();
+            // Get all trait categories
+            var categories = _prototypeManager.EnumeratePrototypes<TraitCategoryPrototype>().ToList();
+
+            // If showUnusable is false filter out traits that are unusable based on your current character setup
+            var traits = enumeratedTraits.Where(trait =>
+                showUnusable || // Ignore everything if this is true
+                _characterRequirementsSystem.CheckRequirementsValid(
+                    trait,
+                    trait.Requirements,
+                    highJob?.Proto ?? new JobPrototype(),
+                    Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(),
+                    new Dictionary<string, TimeSpan>(), //TODO Make this use real playtimes
+                    _entMan,
+                    _prototypeManager,
+                    _configurationManager,
+                    out _
+                )
+            ).ToList();
+
+            // Traits to highlight red when showUnusable is true
+            var traitsUnusable = enumeratedTraits.Where(trait =>
+                _characterRequirementsSystem.CheckRequirementsValid(
+                    trait,
+                    trait.Requirements,
+                    highJob?.Proto ?? new JobPrototype(),
+                    Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(),
+                    new Dictionary<string, TimeSpan>(),
+                    _entMan,
+                    _prototypeManager,
+                    _configurationManager,
+                    out _
+                )
+            ).ToList();
+
+            // Every trait not in the traits list
+            var otherTraits = enumeratedTraits.Where(trait => !traits.Contains(trait)).ToList();
+
+
+            if (traits.Count == 0)
+            {
+                _traitsTab.AddChild(new Label { Text = Loc.GetString("humanoid-profile-editor-traits-no-traits") });
+                return;
+            }
+
+            // Make Uncategorized category
+            var uncategorized = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Vertical,
+                VerticalExpand = true,
+                Name = "Uncategorized_0",
+                // I hate ScrollContainers
+                Children =
+                {
+                    new ScrollContainer
+                    {
+                        HScrollEnabled = false,
+                        HorizontalExpand = true,
+                        VerticalExpand = true,
+                        Children =
+                        {
+                            new BoxContainer
+                            {
+                                Orientation = LayoutOrientation.Vertical,
+                                HorizontalExpand = true,
+                                VerticalExpand = true,
+                            },
+                        },
+                    },
+                },
+            };
+
+            _traitsTabs.AddChild(uncategorized);
+            _traitsTabs.SetTabTitle(0, Loc.GetString("trait-category-Uncategorized"));
+
+
+            // Make categories
+            var currentCategory = 1; // 1 because we already made 0 as Uncategorized, I am not not zero-indexing :)
+            foreach (var category in categories.OrderBy(c => Loc.GetString($"trait-category-{c.ID}")))
+            {
+                // Check for existing category
+                BoxContainer? match = null;
+                foreach (var child in _traitsTabs.Children)
+                {
+                    if (string.IsNullOrEmpty(child.Name))
+                        continue;
+
+                    if (child.Name.Split("_")[0] == category.ID)
+                        match = (BoxContainer) child;
+                }
+
+                // If there is a category do nothing
+                if (match != null)
+                    continue;
+
+                // If not, make it
+                var box = new BoxContainer
+                {
+                    Orientation = LayoutOrientation.Vertical,
+                    VerticalExpand = true,
+                    Name = $"{category.ID}_{currentCategory}",
+                    // I hate ScrollContainers
+                    Children =
+                    {
+                        new ScrollContainer
+                        {
+                            HScrollEnabled = false,
+                            HorizontalExpand = true,
+                            VerticalExpand = true,
+                            Children =
+                            {
+                                new BoxContainer
+                                {
+                                    Orientation = LayoutOrientation.Vertical,
+                                    HorizontalExpand = true,
+                                    VerticalExpand = true,
+                                },
+                            },
+                        },
+                    },
+                };
+
+                _traitsTabs.AddChild(box);
+                _traitsTabs.SetTabTitle(currentCategory, Loc.GetString($"trait-category-{category.ID}"));
+                currentCategory++;
+            }
+
+
+            // Fill categories
+            foreach (var trait in traits.OrderBy(t => -t.Points).ThenBy(t => Loc.GetString($"trait-name-{t.ID}")))
+            {
+                var selector = new TraitPreferenceSelector(trait, highJob?.Proto ?? new JobPrototype(),
+                    Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(),
+                    traitsUnusable.Contains(trait) ? "" : "ButtonColorRed",
+                    _entMan, _prototypeManager, _configurationManager, _characterRequirementsSystem);
+
+                // Look for an existing trait category
+                BoxContainer? match = null;
+                foreach (var child in _traitsTabs.Children)
+                {
+                    if (string.IsNullOrEmpty(child.Name))
+                        continue;
+
+                    // This is fucked up
+                    if (child.Name.Split("_")[0] == trait.Category
+                        && child.Children.FirstOrDefault()?.Children.FirstOrDefault(g =>
+                            g.GetType() == typeof(BoxContainer)) is {} g != default)
+                        match = (BoxContainer) g;
+                }
+
+                // If there is no category put it in Uncategorized
+                if (string.IsNullOrEmpty(match?.Parent?.Parent?.Name)
+                    || match.Parent.Parent.Name.Split("_")[0] != trait.Category)
+                    uncategorized.AddChild(selector);
+                else
+                    match.AddChild(selector);
+
+
+                AddSelector(selector, trait.Points, trait.ID);
+            }
+
+            // Add the selected unusable traits to the point counter
+            foreach (var trait in otherTraits.OrderBy(t => -t.Points).ThenBy(t => Loc.GetString($"trait-name-{t.ID}")))
+            {
+                var selector = new TraitPreferenceSelector(trait, highJob?.Proto ?? new JobPrototype(),
+                    Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(), "",
+                    _entMan, _prototypeManager, _configurationManager, _characterRequirementsSystem);
+
+
+                AddSelector(selector, trait.Points, trait.ID);
+            }
+
+
+            // Hide Uncategorized tab if it's empty, other tabs already shouldn't exist if they're empty
+            _traitsTabs.SetTabVisible(0, uncategorized.Children.Any());
+
+            // Add fake tabs until tab container is happy
+            for (var i = _traitsTabs.ChildCount - 1; i < _traitsTabs.CurrentTab; i++)
+            {
+                _traitsTabs.AddChild(new BoxContainer());
+                _traitsTabs.SetTabVisible(i + 1, false);
+            }
+
+            UpdateTraitPreferences();
+            return;
+
+
+            void AddSelector(TraitPreferenceSelector selector, int points, string id)
+            {
+                if (points > 0)
+                    _traitPointsBar.MaxValue += points;
+
+                _traitPreferences.Add(selector);
+                selector.PreferenceChanged += preference =>
+                {
+                    // Make sure they have enough trait points
+                    preference = preference ? CheckPoints(points, preference) : CheckPoints(-points, preference);
+                    // Don't allow having too many traits
+                    preference = preference && _traitCount + 1 <= _configurationManager.GetCVar(CCVars.GameTraitsMax);
+
+                    // Update Preferences
+                    Profile = Profile?.WithTraitPreference(id, preference);
+                    IsDirty = true;
+                    UpdateTraitPreferences();
+                    UpdateTraits(_traitsShowUnusableButton.Pressed);
+                    UpdateLoadouts(_loadoutsShowUnusableButton.Pressed);
+                };
+            }
+
+            bool CheckPoints(int points, bool preference)
+            {
+                var temp = _traitPointsBar.Value + points;
+                return preference ? !(temp < 0) : temp < 0;
             }
         }
 
@@ -1604,15 +1892,18 @@ private void UpdateLoadouts(bool showUnusable)
 
             // Get all loadout prototypes
             var enumeratedLoadouts = _prototypeManager.EnumeratePrototypes<LoadoutPrototype>().ToList();
+            // Get all loadout categories
+            var categories = _prototypeManager.EnumeratePrototypes<LoadoutCategoryPrototype>().ToList();
 
             // If showUnusable is false filter out loadouts that are unusable based on your current character setup
             var loadouts = enumeratedLoadouts.Where(loadout =>
                 showUnusable || // Ignore everything if this is true
-                _loadoutSystem.CheckRequirementsValid(
+                _characterRequirementsSystem.CheckRequirementsValid(
+                    loadout,
                     loadout.Requirements,
                     highJob?.Proto ?? new JobPrototype(),
                     Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(),
-                    new Dictionary<string, TimeSpan>(),
+                    new Dictionary<string, TimeSpan>(), //TODO Make this use real playtimes
                     _entMan,
                     _prototypeManager,
                     _configurationManager,
@@ -1622,7 +1913,8 @@ out _
 
             // Loadouts to highlight red when showUnusable is true
             var loadoutsUnusable = enumeratedLoadouts.Where(loadout =>
-                _loadoutSystem.CheckRequirementsValid(
+                _characterRequirementsSystem.CheckRequirementsValid(
+                    loadout,
                     loadout.Requirements,
                     highJob?.Proto ?? new JobPrototype(),
                     Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(),
@@ -1650,23 +1942,47 @@ out _
                 Orientation = LayoutOrientation.Vertical,
                 VerticalExpand = true,
                 Name = "Uncategorized_0",
+                // I hate ScrollContainers
+                Children =
+                {
+                    new ScrollContainer
+                    {
+                        HScrollEnabled = false,
+                        HorizontalExpand = true,
+                        VerticalExpand = true,
+                        Children =
+                        {
+                            new BoxContainer
+                            {
+                                Orientation = LayoutOrientation.Vertical,
+                                HorizontalExpand = true,
+                                VerticalExpand = true,
+                            },
+                        },
+                    },
+                },
             };
 
             _loadoutsTabs.AddChild(uncategorized);
-            _loadoutsTabs.SetTabTitle(0, Loc.GetString("humanoid-profile-editor-loadouts-uncategorized-tab"));
+            _loadoutsTabs.SetTabTitle(0, Loc.GetString("loadout-category-Uncategorized"));
+
 
             // Make categories
             var currentCategory = 1; // 1 because we already made 0 as Uncategorized, I am not not zero-indexing :)
-            foreach (var loadout in loadouts.OrderBy(l => l.Category))
+            foreach (var category in categories.OrderBy(c => Loc.GetString($"loadout-category-{c.ID}")))
             {
                 // Check for existing category
                 BoxContainer? match = null;
                 foreach (var child in _loadoutsTabs.Children)
                 {
-                    if (match != null || child.Name == null)
+                    if (string.IsNullOrEmpty(child.Name))
                         continue;
-                    if (child.Name.Split("_")[0] == loadout.Category)
-                        match = (BoxContainer) child;
+
+                    // This is fucked up
+                    if (child.Name.Split("_")[0] == category.ID
+                        && child.Children.FirstOrDefault()?.Children.FirstOrDefault(g =>
+                            g.GetType() == typeof(BoxContainer)) is {} g != default)
+                        match = (BoxContainer) g;
                 }
 
                 // If there is a category do nothing
@@ -1678,7 +1994,7 @@ out _
                 {
                     Orientation = LayoutOrientation.Vertical,
                     VerticalExpand = true,
-                    Name = $"{loadout.Category}_{currentCategory}",
+                    Name = $"{category.ID}_{currentCategory}",
                     // I hate ScrollContainers
                     Children =
                     {
@@ -1701,23 +2017,24 @@ out _
                 };
 
                 _loadoutsTabs.AddChild(box);
-                _loadoutsTabs.SetTabTitle(currentCategory, Loc.GetString($"loadout-category-{loadout.Category}"));
+                _loadoutsTabs.SetTabTitle(currentCategory, Loc.GetString($"loadout-category-{category.ID}"));
                 currentCategory++;
             }
 
+
             // Fill categories
-            foreach (var loadout in loadouts.OrderBy(l => l.ID))
+            foreach (var loadout in loadouts.OrderBy(l => l.Cost).ThenBy(l => Loc.GetString($"loadout-{l.ID}-name")))
             {
                 var selector = new LoadoutPreferenceSelector(loadout, highJob?.Proto ?? new JobPrototype(),
                     Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(),
-                    loadoutsUnusable.Contains(loadout) ? "" : "ButtonColorRed", _entMan, _prototypeManager,
-                    _configurationManager, _loadoutSystem);
+                    loadoutsUnusable.Contains(loadout) ? "" : "ButtonColorRed",
+                    _entMan, _prototypeManager, _configurationManager, _characterRequirementsSystem);
 
                 // Look for an existing loadout category
                 BoxContainer? match = null;
                 foreach (var child in _loadoutsTabs.Children)
                 {
-                    if (match != null || child.Name == null)
+                    if (string.IsNullOrEmpty(child.Name))
                         continue;
 
                     if (child.Name.Split("_")[0] == loadout.Category)
@@ -1725,80 +2042,30 @@ out _
                 }
 
                 // If there is no category put it in Uncategorized
-                if (match?.Parent?.Parent?.Name == null)
+                if (string.IsNullOrEmpty(match?.Parent?.Parent?.Name)
+                    || match.Parent.Parent.Name.Split("_")[0] != loadout.Category)
                     uncategorized.AddChild(selector);
                 else
                     match.AddChild(selector);
 
-                _loadoutPreferences.Add(selector);
-                selector.PreferenceChanged += preference =>
-                {
-                    // Make sure they have enough loadout points
-                    if (preference)
-                    {
-                        var temp = _loadoutPointsBar.Value - loadout.Cost;
-                        if (temp < 0)
-                            preference = false;
-                        else
-                        {
-                            _loadoutPointsLabel.Text = Loc.GetString("humanoid-profile-editor-loadouts-points-label",
-                                ("points", temp), ("max", _loadoutPointsBar.MaxValue));
-                            _loadoutPointsBar.Value = temp;
-                        }
-                    }
-                    else
-                    {
-                        _loadoutPointsLabel.Text = Loc.GetString("humanoid-profile-editor-loadouts-points-label",
-                            ("points", _loadoutPointsBar.Value), ("max", _loadoutPointsBar.MaxValue));
-                        _loadoutPointsBar.Value += loadout.Cost;
-                    }
-                    // Update Preference
-                    Profile = Profile?.WithLoadoutPreference(loadout.ID, preference);
-                    IsDirty = true;
-                    UpdateLoadoutPreferences();
-                };
+
+                AddSelector(selector, loadout.Cost, loadout.ID);
             }
 
             // Add the selected unusable loadouts to the point counter
-            foreach (var loadout in otherLoadouts.OrderBy(l => l.ID))
+            foreach (var loadout in otherLoadouts.OrderBy(l => l.Cost).ThenBy(l => Loc.GetString($"loadout-{l.ID}-name")))
             {
                 var selector = new LoadoutPreferenceSelector(loadout, highJob?.Proto ?? new JobPrototype(),
-                    Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(), "", _entMan, _prototypeManager,
-                    _configurationManager, _loadoutSystem);
+                    Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(), "",
+                    _entMan, _prototypeManager, _configurationManager, _characterRequirementsSystem);
 
-                _loadoutPreferences.Add(selector);
-                selector.PreferenceChanged += preference =>
-                {
-                    // Make sure they have enough loadout points
-                    if (preference)
-                    {
-                        var temp = _loadoutPointsBar.Value - loadout.Cost;
-                        if (temp < 0)
-                            preference = false;
-                        else
-                        {
-                            _loadoutPointsLabel.Text = Loc.GetString("humanoid-profile-editor-loadouts-points-label",
-                                ("points", temp), ("max", _loadoutPointsBar.MaxValue));
-                            _loadoutPointsBar.Value = temp;
-                        }
-                    }
-                    else
-                    {
-                        _loadoutPointsLabel.Text = Loc.GetString("humanoid-profile-editor-loadouts-points-label",
-                            ("points", _loadoutPointsBar.Value), ("max", _loadoutPointsBar.MaxValue));
-                        _loadoutPointsBar.Value += loadout.Cost;
-                    }
-                    // Update Preference
-                    Profile = Profile?.WithLoadoutPreference(loadout.ID, preference);
-                    IsDirty = true;
-                    UpdateLoadoutPreferences();
-                };
+
+                AddSelector(selector, loadout.Cost, loadout.ID);
             }
 
 
             // Hide Uncategorized tab if it's empty, other tabs already shouldn't exist if they're empty
-            if (!uncategorized.Children.Any())
-                _loadoutsTabs.SetTabVisible(0, false);
+            _loadoutsTabs.SetTabVisible(0, uncategorized.Children.Any());
 
             // Add fake tabs until tab container is happy
             for (var i = _loadoutsTabs.ChildCount - 1; i < _loadoutsTabs.CurrentTab; i++)
@@ -1808,6 +2075,31 @@ out _
             }
 
             UpdateLoadoutPreferences();
+            return;
+
+
+            void AddSelector(LoadoutPreferenceSelector selector, int points, string id)
+            {
+                _loadoutPreferences.Add(selector);
+                selector.PreferenceChanged += preference =>
+                {
+                    // Make sure they have enough loadout points
+                    preference = preference ? CheckPoints(points, preference) : CheckPoints(-points, preference);
+
+                    // Update Preferences
+                    Profile = Profile?.WithLoadoutPreference(id, preference);
+                    IsDirty = true;
+                    UpdateLoadoutPreferences();
+                    UpdateLoadouts(_loadoutsShowUnusableButton.Pressed);
+                    UpdateTraits(_traitsShowUnusableButton.Pressed);
+                };
+            }
+
+            bool CheckPoints(int points, bool preference)
+            {
+                var temp = _loadoutPointsBar.Value + points;
+                return preference ? !(temp < 0) : temp < 0;
+            }
         }
 
 
@@ -1859,19 +2151,68 @@ public bool Preference
 
             public event Action<bool>? PreferenceChanged;
 
-            public TraitPreferenceSelector(TraitPrototype trait)
+            public TraitPreferenceSelector(TraitPrototype trait, JobPrototype highJob,
+                HumanoidCharacterProfile profile, string style, IEntityManager entityManager, IPrototypeManager prototypeManager,
+                IConfigurationManager configManager, CharacterRequirementsSystem characterRequirementsSystem)
             {
                 Trait = trait;
 
-                _button = new Button {Text = Loc.GetString(trait.Name)};
-                _button.ToggleMode = true;
+                // Create a checkbox to get the loadout
+                _button = new Button
+                {
+                    VerticalAlignment = VAlignment.Center,
+                    ToggleMode = true,
+                    StyleClasses = { StyleBase.ButtonOpenLeft },
+                    Children =
+                    {
+                        new BoxContainer
+                        {
+                            Children =
+                            {
+                                new Label
+                                {
+                                    Text = trait.Points.ToString(),
+                                    StyleClasses = { StyleBase.StyleClassLabelHeading },
+                                    MinWidth = 32,
+                                    MaxWidth = 32,
+                                    ClipText = true,
+                                    Margin = new Thickness(0, 0, 8, 0),
+                                },
+                                new Label { Text = Loc.GetString($"trait-name-{trait.ID}") },
+                            },
+                        },
+                    },
+                };
                 _button.OnToggled += OnButtonToggled;
+                _button.AddStyleClass(style);
+
+                var tooltip = new StringBuilder();
+                // Add the loadout description to the tooltip if there is one
+                var desc = Loc.GetString($"trait-description-{trait.ID}");
+                if (!string.IsNullOrEmpty(desc) && desc != $"trait-description-{trait.ID}")
+                    tooltip.Append(desc);
+
+
+                // Get requirement reasons
+                characterRequirementsSystem.CheckRequirementsValid(trait, trait.Requirements, highJob, profile,
+                    new Dictionary<string, TimeSpan>(),
+                    entityManager, prototypeManager, configManager,
+                    out var reasons);
 
-                if (trait.Description is { } desc)
+                // Add requirement reasons to the tooltip
+                foreach (var reason in reasons)
+                    tooltip.Append($"\n{reason.ToMarkup()}");
+
+                // Combine the tooltip and format it in the checkbox supplier
+                if (tooltip.Length > 0)
                 {
-                    _button.ToolTip = Loc.GetString(desc);
+                    var formattedTooltip = new Tooltip();
+                    formattedTooltip.SetMessage(FormattedMessage.FromMarkupPermissive(tooltip.ToString()));
+                    _button.TooltipSupplier = _ => formattedTooltip;
                 }
 
+
+                // Add the loadout preview and the checkbox to the control
                 AddChild(new BoxContainer
                 {
                     Orientation = LayoutOrientation.Horizontal,
@@ -1900,7 +2241,7 @@ public bool Preference
 
             public LoadoutPreferenceSelector(LoadoutPrototype loadout, JobPrototype highJob,
                 HumanoidCharacterProfile profile, string style, IEntityManager entityManager, IPrototypeManager prototypeManager,
-                IConfigurationManager configManager, LoadoutSystem loadoutSystem)
+                IConfigurationManager configManager, CharacterRequirementsSystem characterRequirementsSystem)
             {
                 Loadout = loadout;
 
@@ -1922,11 +2263,32 @@ public LoadoutPreferenceSelector(LoadoutPrototype loadout, JobPrototype highJob,
                 // Create a checkbox to get the loadout
                 _button = new Button
                 {
-                    Text = $"[{loadout.Cost}] {(Loc.GetString($"loadout-name-{loadout.ID}") == $"loadout-name-{loadout.ID}"
-                        ? entityManager.GetComponent<MetaDataComponent>(dummyLoadoutItem).EntityName
-                        : Loc.GetString($"loadout-name-{loadout.ID}"))}",
-                    VerticalAlignment = VAlignment.Center,
                     ToggleMode = true,
+                    StyleClasses = { StyleBase.ButtonOpenLeft },
+                    Children =
+                    {
+                        new BoxContainer
+                        {
+                            Children =
+                            {
+                                new Label
+                                {
+                                    Text = loadout.Cost.ToString(),
+                                    StyleClasses = { StyleBase.StyleClassLabelHeading },
+                                    MinWidth = 32,
+                                    MaxWidth = 32,
+                                    ClipText = true,
+                                    Margin = new Thickness(0, 0, 8, 0),
+                                },
+                                new Label
+                                {
+                                    Text = Loc.GetString($"loadout-name-{loadout.ID}") == $"loadout-name-{loadout.ID}"
+                                        ? entityManager.GetComponent<MetaDataComponent>(dummyLoadoutItem).EntityName
+                                        : Loc.GetString($"loadout-name-{loadout.ID}"),
+                                },
+                            },
+                        },
+                    },
                 };
                 _button.OnToggled += OnButtonToggled;
                 _button.AddStyleClass(style);
@@ -1941,7 +2303,10 @@ public LoadoutPreferenceSelector(LoadoutPrototype loadout, JobPrototype highJob,
 
 
                 // Get requirement reasons
-                loadoutSystem.CheckRequirementsValid(loadout.Requirements, highJob, profile, new Dictionary<string, TimeSpan>(), entityManager, prototypeManager, configManager, out var reasons);
+                characterRequirementsSystem.CheckRequirementsValid(loadout, loadout.Requirements, highJob, profile,
+                    new Dictionary<string, TimeSpan>(),
+                    entityManager, prototypeManager, configManager,
+                    out var reasons);
 
                 // Add requirement reasons to the tooltip
                 foreach (var reason in reasons)
diff --git a/Content.Client/Traits/ParacusiaSystem.cs b/Content.Client/Traits/ParacusiaSystem.cs
index 3789f24cb0..d01c7c0005 100644
--- a/Content.Client/Traits/ParacusiaSystem.cs
+++ b/Content.Client/Traits/ParacusiaSystem.cs
@@ -1,11 +1,12 @@
 using System.Numerics;
-using Content.Shared.Traits.Assorted;
+using Content.Shared.Traits.Assorted.Systems;
 using Robust.Shared.Random;
 using Robust.Client.Player;
 using Robust.Shared.Player;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Timing;
+using Content.Shared.Traits.Assorted.Components;
 
 namespace Content.Client.Traits;
 
diff --git a/Content.Server/Flash/FlashSystem.cs b/Content.Server/Flash/FlashSystem.cs
index fe7eb81d1e..013ee37a41 100644
--- a/Content.Server/Flash/FlashSystem.cs
+++ b/Content.Server/Flash/FlashSystem.cs
@@ -14,13 +14,13 @@
 using Content.Shared.Inventory;
 using Content.Shared.Physics;
 using Content.Shared.Tag;
-using Content.Shared.Traits.Assorted;
 using Content.Shared.Weapons.Melee.Events;
 using Robust.Server.Audio;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Timing;
 using InventoryComponent = Content.Shared.Inventory.InventoryComponent;
+using Content.Shared.Traits.Assorted.Components;
 
 namespace Content.Server.Flash
 {
diff --git a/Content.Server/Implants/ImplanterSystem.cs b/Content.Server/Implants/ImplanterSystem.cs
index 0d46241f41..3cfa3a9f5f 100644
--- a/Content.Server/Implants/ImplanterSystem.cs
+++ b/Content.Server/Implants/ImplanterSystem.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using Content.Server.Popups;
 using Content.Shared.DoAfter;
 using Content.Shared.IdentityManagement;
@@ -57,6 +58,17 @@ private void OnImplanterAfterInteract(EntityUid uid, ImplanterComponent componen
                 return;
             }
 
+            // Check if we are trying to implant a implant which is already implanted
+            if (implant.HasValue && !component.AllowMultipleImplants && CheckSameImplant(target, implant.Value))
+            {
+                var name = Identity.Name(target, EntityManager, args.User);
+                var msg = Loc.GetString("implanter-component-implant-already", ("implant", implant), ("target", name));
+                _popup.PopupEntity(msg, target, args.User);
+                args.Handled = true;
+                return;
+            }
+
+
             //Implant self instantly, otherwise try to inject the target.
             if (args.User == target)
                 Implant(target, target, uid, component);
@@ -67,6 +79,15 @@ private void OnImplanterAfterInteract(EntityUid uid, ImplanterComponent componen
         args.Handled = true;
     }
 
+    public bool CheckSameImplant(EntityUid target, EntityUid implant)
+    {
+        if (!TryComp<ImplantedComponent>(target, out var implanted))
+            return false;
+
+        var implantPrototype = Prototype(implant);
+        return implanted.ImplantContainer.ContainedEntities.Any(entity => Prototype(entity) == implantPrototype);
+    }
+
     /// <summary>
     /// Attempt to implant someone else.
     /// </summary>
diff --git a/Content.Server/StationEvents/Events/MassHallucinationsRule.cs b/Content.Server/StationEvents/Events/MassHallucinationsRule.cs
index 722a489541..4fc158f864 100644
--- a/Content.Server/StationEvents/Events/MassHallucinationsRule.cs
+++ b/Content.Server/StationEvents/Events/MassHallucinationsRule.cs
@@ -2,7 +2,7 @@
 using Content.Server.StationEvents.Components;
 using Content.Server.Traits.Assorted;
 using Content.Shared.Mind.Components;
-using Content.Shared.Traits.Assorted;
+using Content.Shared.Traits.Assorted.Components;
 
 namespace Content.Server.StationEvents.Events;
 
diff --git a/Content.Server/Traits/Assorted/ParacusiaSystem.cs b/Content.Server/Traits/Assorted/ParacusiaSystem.cs
index 4b0205ff53..cf08e09e90 100644
--- a/Content.Server/Traits/Assorted/ParacusiaSystem.cs
+++ b/Content.Server/Traits/Assorted/ParacusiaSystem.cs
@@ -1,5 +1,7 @@
 using Content.Shared.Traits.Assorted;
+using Content.Shared.Traits.Assorted.Systems;
 using Robust.Shared.Audio;
+using Content.Shared.Traits.Assorted.Components;
 
 namespace Content.Server.Traits.Assorted;
 
diff --git a/Content.Server/Traits/TraitSystem.cs b/Content.Server/Traits/TraitSystem.cs
index 22ee0e4861..be2c3c0503 100644
--- a/Content.Server/Traits/TraitSystem.cs
+++ b/Content.Server/Traits/TraitSystem.cs
@@ -1,7 +1,13 @@
+using System.Linq;
 using Content.Server.GameTicking;
+using Content.Server.Players.PlayTimeTracking;
+using Content.Shared.Customization.Systems;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
+using Content.Shared.Roles;
 using Content.Shared.Traits;
+using Pidgin.Configuration;
+using Robust.Shared.Configuration;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager;
 
@@ -9,9 +15,12 @@ namespace Content.Server.Traits;
 
 public sealed class TraitSystem : EntitySystem
 {
-    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-    [Dependency] private readonly ISerializationManager _serializationManager = default!;
-    [Dependency] private readonly SharedHandsSystem _sharedHandsSystem = default!;
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
+    [Dependency] private readonly ISerializationManager _serialization = default!;
+    [Dependency] private readonly SharedHandsSystem _hands = default!;
+    [Dependency] private readonly CharacterRequirementsSystem _characterRequirements = default!;
+    [Dependency] private readonly PlayTimeTrackingManager _playTimeTracking = default!;
+    [Dependency] private readonly IConfigurationManager _configuration = default!;
 
     public override void Initialize()
     {
@@ -25,16 +34,17 @@ private void OnPlayerSpawnComplete(PlayerSpawnCompleteEvent args)
     {
         foreach (var traitId in args.Profile.TraitPreferences)
         {
-            if (!_prototypeManager.TryIndex<TraitPrototype>(traitId, out var traitPrototype))
+            if (!_prototype.TryIndex<TraitPrototype>(traitId, out var traitPrototype))
             {
                 Log.Warning($"No trait found with ID {traitId}!");
                 return;
             }
 
-            if (traitPrototype.Whitelist != null && !traitPrototype.Whitelist.IsValid(args.Mob))
-                continue;
-
-            if (traitPrototype.Blacklist != null && traitPrototype.Blacklist.IsValid(args.Mob))
+            if (!_characterRequirements.CheckRequirementsValid(traitPrototype, traitPrototype.Requirements,
+                _prototype.Index<JobPrototype>(args.JobId ?? _prototype.EnumeratePrototypes<JobPrototype>().First().ID),
+                args.Profile, _playTimeTracking.GetTrackerTimes(args.Player),
+                EntityManager, _prototype, _configuration,
+                out _))
                 continue;
 
             // Add all components required by the prototype
@@ -43,22 +53,10 @@ private void OnPlayerSpawnComplete(PlayerSpawnCompleteEvent args)
                 if (HasComp(args.Mob, entry.Component.GetType()))
                     continue;
 
-                var comp = (Component) _serializationManager.CreateCopy(entry.Component, notNullableOverride: true);
+                var comp = (Component) _serialization.CreateCopy(entry.Component, notNullableOverride: true);
                 comp.Owner = args.Mob;
                 EntityManager.AddComponent(args.Mob, comp);
             }
-
-            // Add item required by the trait
-            if (traitPrototype.TraitGear != null)
-            {
-                if (!TryComp(args.Mob, out HandsComponent? handsComponent))
-                    continue;
-
-                var coords = Transform(args.Mob).Coordinates;
-                var inhandEntity = EntityManager.SpawnEntity(traitPrototype.TraitGear, coords);
-                _sharedHandsSystem.TryPickup(args.Mob, inhandEntity, checkActionBlocker: false,
-                    handsComp: handsComponent);
-            }
         }
     }
 }
diff --git a/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs b/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
index 31c9b0d2b8..4749fd8b4b 100644
--- a/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
+++ b/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
@@ -8,6 +8,7 @@
 using Content.Shared.Actions.Events;
 using Content.Shared.Administration.Components;
 using Content.Shared.CombatMode;
+using Content.Shared.Contests;
 using Content.Shared.Damage.Events;
 using Content.Shared.Damage.Systems;
 using Content.Shared.Database;
@@ -43,6 +44,7 @@ public sealed class MeleeWeaponSystem : SharedMeleeWeaponSystem
     [Dependency] private readonly SharedColorFlashEffectSystem _color = default!;
     [Dependency] private readonly SolutionContainerSystem _solutions = default!;
     [Dependency] private readonly TagSystem _tag = default!;
+    [Dependency] private readonly ContestsSystem _contests = default!;
 
     public override void Initialize()
     {
@@ -138,7 +140,7 @@ protected override bool DoDisarm(EntityUid user, DisarmAttackEvent ev, EntityUid
         if (attemptEvent.Cancelled)
             return false;
 
-        var chance = CalculateDisarmChance(user, target, inTargetHand, combatMode);
+        var chance = CalculateDisarmChance(user, target, inTargetHand, combatMode) * _contests.MassContest(user, target);
 
         if (_random.Prob(chance))
         {
diff --git a/Content.Server/Weapons/Ranged/Systems/FireOnDropSystem.cs b/Content.Server/Weapons/Ranged/Systems/FireOnDropSystem.cs
index 11bb6a3fad..a6112ad49c 100644
--- a/Content.Server/Weapons/Ranged/Systems/FireOnDropSystem.cs
+++ b/Content.Server/Weapons/Ranged/Systems/FireOnDropSystem.cs
@@ -21,7 +21,7 @@ public override void Initialize()
 
     private void HandleLand(EntityUid uid, GunComponent component, ref ThrowDoHitEvent args)
     {
-        if (_random.Prob(component.Reliability))
+        if (_random.Prob(component.FireOnDropChance))
             _gun.AttemptShoot(uid, uid, component, Transform(uid).Coordinates.Offset(Transform(uid).LocalRotation.ToVec()));
     }
 }
diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
index b8f8f12211..ff3116a8fd 100644
--- a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
+++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
@@ -6,6 +6,7 @@
 using Content.Server.Power.EntitySystems;
 using Content.Server.Stunnable;
 using Content.Server.Weapons.Ranged.Components;
+using Content.Shared.Contests;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Systems;
 using Content.Shared.Database;
@@ -39,6 +40,7 @@ public sealed partial class GunSystem : SharedGunSystem
     [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly StaminaSystem _stamina = default!;
     [Dependency] private readonly StunSystem _stun = default!;
+    [Dependency] private readonly ContestsSystem _contests = default!;
 
     public const float DamagePitchVariation = SharedMeleeWeaponSystem.DamagePitchVariation;
     public const float GunClumsyChance = 0.5f;
@@ -97,7 +99,7 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid?
         var toMap = toCoordinates.ToMapPos(EntityManager, TransformSystem);
         var mapDirection = toMap - fromMap.Position;
         var mapAngle = mapDirection.ToAngle();
-        var angle = GetRecoilAngle(Timing.CurTime, gun, mapDirection.ToAngle());
+        var angle = GetRecoilAngle(Timing.CurTime, gun, mapDirection.ToAngle(), user);
 
         // If applicable, this ensures the projectile is parented to grid on spawn, instead of the map.
         var fromEnt = MapManager.TryFindGridAt(fromMap, out var gridUid, out var grid)
@@ -311,7 +313,7 @@ private Angle[] LinearSpread(Angle start, Angle end, int intervals)
         return angles;
     }
 
-    private Angle GetRecoilAngle(TimeSpan curTime, GunComponent component, Angle direction)
+    private Angle GetRecoilAngle(TimeSpan curTime, GunComponent component, Angle direction, EntityUid? shooter)
     {
         var timeSinceLastFire = (curTime - component.LastFire).TotalSeconds;
         var newTheta = MathHelper.Clamp(component.CurrentAngle.Theta + component.AngleIncreaseModified.Theta - component.AngleDecayModified.Theta * timeSinceLastFire, component.MinAngleModified.Theta, component.MaxAngleModified.Theta);
@@ -319,7 +321,8 @@ private Angle GetRecoilAngle(TimeSpan curTime, GunComponent component, Angle dir
         component.LastFire = component.NextFire;
 
         // Convert it so angle can go either side.
-        var random = Random.NextFloat(-0.5f, 0.5f);
+
+        var random = Random.NextFloat(-0.5f, 0.5f) / _contests.MassContest(shooter);
         var spread = component.CurrentAngle.Theta * random;
         var angle = new Angle(direction.Theta + component.CurrentAngle.Theta * random);
         DebugTools.Assert(spread <= component.MaxAngleModified.Theta);
diff --git a/Content.Server/Zombies/ZombieSystem.Transform.cs b/Content.Server/Zombies/ZombieSystem.Transform.cs
index 53128aade3..21f2508042 100644
--- a/Content.Server/Zombies/ZombieSystem.Transform.cs
+++ b/Content.Server/Zombies/ZombieSystem.Transform.cs
@@ -35,8 +35,8 @@
 using Content.Shared.Weapons.Melee;
 using Content.Shared.Zombies;
 using Content.Shared.Prying.Components;
-using Content.Shared.Traits.Assorted;
 using Robust.Shared.Audio.Systems;
+using Content.Shared.Traits.Assorted.Components;
 
 namespace Content.Server.Zombies
 {
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index 11ced9b5da..de56c8be3a 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -341,14 +341,34 @@ public static readonly CVarDef<bool>
         public static readonly CVarDef<bool> DebugCoordinatesAdminOnly =
             CVarDef.Create("game.debug_coordinates_admin_only", true, CVar.SERVER | CVar.REPLICATED);
 
+
+        /// <summary>
+        ///     Whether to allow characters to select traits.
+        /// </summary>
+        public static readonly CVarDef<bool> GameTraitsEnabled =
+            CVarDef.Create("game.traits_enabled", true, CVar.REPLICATED);
+
+        /// <summary>
+        ///     How many traits a character can have at most.
+        /// </summary>
+        public static readonly CVarDef<int> GameTraitsMax =
+            CVarDef.Create("game.traits_max", 5, CVar.REPLICATED);
+
+        /// <summary>
+        ///     How many points a character should start with.
+        /// </summary>
+        public static readonly CVarDef<int> GameTraitsDefaultPoints =
+            CVarDef.Create("game.traits_default_points", 5, CVar.REPLICATED);
+
+
         /// <summary>
-        /// Whether or not to allow characters to select loadout items.
+        ///     Whether to allow characters to select loadout items.
         /// </summary>
         public static readonly CVarDef<bool> GameLoadoutsEnabled =
             CVarDef.Create("game.loadouts_enabled", true, CVar.REPLICATED);
 
         /// <summary>
-        /// How many points to give to each player for loadouts.
+        ///     How many points to give to each player for loadouts.
         /// </summary>
         public static readonly CVarDef<int> GameLoadoutsPoints =
             CVarDef.Create("game.loadouts_points", 14, CVar.REPLICATED);
@@ -2134,6 +2154,17 @@ public static readonly CVarDef<float>
             CVarDef.Create("psionics.rolls_enabled", true, CVar.SERVERONLY);
 
         /// <summary>
+        ///     Whether height & width sliders adjust a character's Fixture Component
+        /// </summary>
+        public static readonly CVarDef<bool> HeightAdjustModifiesHitbox =
+            CVarDef.Create("heightadjust.modifies_hitbox", true, CVar.SERVERONLY);
+
+        /// <summary>
+        ///     Whether height & width sliders adjust a player's view distance
+        /// </summary>
+        public static readonly CVarDef<bool> HeightAdjustModifiesZoom =
+            CVarDef.Create("heightadjust.modifies_zoom", true, CVar.SERVERONLY);
+
         ///     Enables station goals
         /// </summary>
         public static readonly CVarDef<bool> StationGoalsEnabled =
@@ -2144,5 +2175,18 @@ public static readonly CVarDef<float>
         /// </summary>
         public static readonly CVarDef<float> StationGoalsChance =
             CVarDef.Create("game.station_goals_chance", 0.1f, CVar.SERVERONLY);
+
+        /// <summary>
+        ///     Toggles all MassContest functions. All mass contests output 1f when false
+        /// </summary>
+        public static readonly CVarDef<bool> DoMassContests =
+            CVarDef.Create("contests.do_mass_contests", true, CVar.REPLICATED | CVar.SERVER);
+
+        /// <summary>
+        ///     The maximum amount that Mass Contests can modify a physics multiplier, given as a +/- percentage
+        ///     Default of 0.25f outputs between * 0.75f and 1.25f
+        /// </summary>
+        public static readonly CVarDef<float> MassContestsMaxPercentage =
+            CVarDef.Create("contests.max_percentage", 0.25f, CVar.REPLICATED | CVar.SERVER);
     }
 }
diff --git a/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutCategoryPrototype.cs b/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutCategoryPrototype.cs
index 5dd880d3f1..445cbc10e6 100644
--- a/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutCategoryPrototype.cs
+++ b/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutCategoryPrototype.cs
@@ -2,6 +2,7 @@
 
 namespace Content.Shared.Clothing.Loadouts.Prototypes;
 
+
 /// <summary>
 ///     A prototype defining a valid category for <see cref="LoadoutPrototype"/>s to go into.
 /// </summary>
diff --git a/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutPrototype.cs b/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutPrototype.cs
index bc31fc1570..9ca575fa72 100644
--- a/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutPrototype.cs
+++ b/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutPrototype.cs
@@ -1,10 +1,12 @@
 using Content.Shared.Clothing.Loadouts.Systems;
+using Content.Shared.Customization.Systems;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Shared.Clothing.Loadouts.Prototypes;
 
+
 [Prototype("loadout")]
 public sealed class LoadoutPrototype : IPrototype
 {
@@ -17,7 +19,7 @@ public sealed class LoadoutPrototype : IPrototype
     /// <summary>
     ///     Which tab category to put this under
     /// </summary>
-    [DataField(customTypeSerializer:typeof(PrototypeIdSerializer<LoadoutCategoryPrototype>))]
+    [DataField, ValidatePrototypeId<LoadoutCategoryPrototype>]
     public string Category = "Uncategorized";
 
     /// <summary>
@@ -41,5 +43,5 @@ public sealed class LoadoutPrototype : IPrototype
 
 
     [DataField]
-    public List<LoadoutRequirement> Requirements = new();
+    public List<CharacterRequirement> Requirements = new();
 }
diff --git a/Content.Shared/Clothing/Loadouts/Systems/LoadoutRequirements.cs b/Content.Shared/Clothing/Loadouts/Systems/LoadoutRequirements.cs
deleted file mode 100644
index 422a5b15a4..0000000000
--- a/Content.Shared/Clothing/Loadouts/Systems/LoadoutRequirements.cs
+++ /dev/null
@@ -1,376 +0,0 @@
-using System.Linq;
-using Content.Shared.CCVar;
-using Content.Shared.Humanoid.Prototypes;
-using Content.Shared.Players.PlayTimeTracking;
-using Content.Shared.Preferences;
-using Content.Shared.Roles;
-using Content.Shared.Roles.Jobs;
-using Content.Shared.Traits;
-using JetBrains.Annotations;
-using Robust.Shared.Configuration;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
-using Robust.Shared.Utility;
-
-namespace Content.Shared.Clothing.Loadouts.Systems;
-
-[ImplicitDataDefinitionForInheritors, MeansImplicitUse]
-[Serializable, NetSerializable]
-public abstract partial class LoadoutRequirement
-{
-    /// <summary>
-    ///     If true valid requirements will be treated as invalid and vice versa
-    /// </summary>
-    [DataField]
-    public bool Inverted = false;
-
-    /// <summary>
-    ///     Checks if this loadout requirement is valid for the given parameters
-    /// </summary>
-    /// <param name="reason">Description for the requirement, shown when not null</param>
-    public abstract bool IsValid(
-        JobPrototype job,
-        HumanoidCharacterProfile profile,
-        Dictionary<string, TimeSpan> playTimes,
-        IEntityManager entityManager,
-        IPrototypeManager prototypeManager,
-        IConfigurationManager configManager,
-        out FormattedMessage? reason
-    );
-}
-
-
-#region HumanoidCharacterProfile
-
-/// <summary>
-///     Requires the profile to be within an age range
-/// </summary>
-[UsedImplicitly]
-[Serializable, NetSerializable]
-public sealed partial class LoadoutAgeRequirement : LoadoutRequirement
-{
-    [DataField(required: true)]
-    public int Min;
-
-    [DataField(required: true)]
-    public int Max;
-
-    public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
-        Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager, IPrototypeManager prototypeManager,
-        IConfigurationManager configManager, out FormattedMessage? reason)
-    {
-        reason = FormattedMessage.FromMarkup(Loc.GetString("loadout-age-requirement",
-            ("min", Min), ("max", Max)));
-        return profile.Age >= Min && profile.Age <= Max;
-    }
-}
-
-/// <summary>
-///   Requires the profile to use either a Backpack, Satchel, or Duffelbag
-/// </summary>
-[UsedImplicitly]
-[Serializable, NetSerializable]
-public sealed partial class LoadoutBackpackTypeRequirement : LoadoutRequirement
-{
-    [DataField(required: true)]
-    public BackpackPreference Preference;
-
-    public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
-        Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager, IPrototypeManager prototypeManager,
-        IConfigurationManager configManager, out FormattedMessage? reason)
-    {
-        reason = FormattedMessage.FromMarkup(Loc.GetString("loadout-backpack-type-requirement",
-            ("type", Loc.GetString($"humanoid-profile-editor-preference-{Preference.ToString().ToLower()}"))));
-        return profile.Backpack == Preference;
-    }
-}
-
-/// <summary>
-///     Requires the profile to use either Jumpsuits or Jumpskirts
-/// </summary>
-[UsedImplicitly]
-[Serializable, NetSerializable]
-public sealed partial class LoadoutClothingPreferenceRequirement : LoadoutRequirement
-{
-    [DataField(required: true)]
-    public ClothingPreference Preference;
-
-    public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
-        Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager, IPrototypeManager prototypeManager,
-        IConfigurationManager configManager, out FormattedMessage? reason)
-    {
-        reason = FormattedMessage.FromMarkup(Loc.GetString("loadout-clothing-preference-requirement",
-            ("preference", Loc.GetString($"humanoid-profile-editor-preference-{Preference.ToString().ToLower()}"))));
-        return profile.Clothing == Preference;
-    }
-}
-
-/// <summary>
-///     Requires the profile to be a certain species
-/// </summary>
-[UsedImplicitly]
-[Serializable, NetSerializable]
-public sealed partial class LoadoutSpeciesRequirement : LoadoutRequirement
-{
-    [DataField(required: true)]
-    public List<ProtoId<SpeciesPrototype>> Species;
-
-    public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
-        Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager, IPrototypeManager prototypeManager,
-        IConfigurationManager configManager, out FormattedMessage? reason)
-    {
-        var speciesString = string.Join(", ", Species.Select(j => Loc.GetString(prototypeManager.Index(j).Name)));
-        speciesString = Loc.GetString("loadout-species-requirement", ("species", speciesString));
-        reason = FormattedMessage.FromMarkup(speciesString);
-        return Species.Contains(profile.Species);
-    }
-}
-
-/// <summary>
-///     Requires the profile to have a certain trait
-/// </summary>
-[UsedImplicitly]
-[Serializable, NetSerializable]
-public sealed partial class LoadoutTraitRequirement : LoadoutRequirement
-{
-    [DataField(required: true)]
-    public ProtoId<TraitPrototype> Trait;
-
-    public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
-        Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager, IPrototypeManager prototypeManager,
-        IConfigurationManager configManager, out FormattedMessage? reason)
-    {
-        reason = FormattedMessage.FromMarkup(Loc.GetString("loadout-trait-requirement",
-            ("trait", Loc.GetString($"trait-{Trait.ToString().ToLower()}-name"))));
-        return profile.TraitPreferences.Contains(Trait.ToString());
-    }
-}
-
-#endregion
-
-#region Jobs
-
-/// <summary>
-///     Requires the selected job to be a certain one
-/// </summary>
-[UsedImplicitly]
-[Serializable, NetSerializable]
-public sealed partial class LoadoutJobRequirement : LoadoutRequirement
-{
-    [DataField(required: true)]
-    public List<ProtoId<JobPrototype>> Jobs;
-
-    public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
-        Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager, IPrototypeManager prototypeManager,
-        IConfigurationManager configManager, out FormattedMessage? reason)
-    {
-        // Join localized job names with a comma
-        var jobsString = string.Join(", ", Jobs.Select(j => Loc.GetString(prototypeManager.Index(j).Name)));
-        // Form the reason message
-        jobsString = Loc.GetString("loadout-job-requirement", ("job", jobsString));
-
-        reason = FormattedMessage.FromMarkup(jobsString);
-        return Jobs.Contains(job.ID);
-    }
-}
-
-/// <summary>
-///     Requires the playtime for a department to be within a certain range
-/// </summary>
-[UsedImplicitly]
-[Serializable, NetSerializable]
-public sealed partial class LoadoutDepartmentTimeRequirement : LoadoutRequirement
-{
-    [DataField]
-    public TimeSpan Min = TimeSpan.MinValue;
-
-    [DataField]
-    public TimeSpan Max = TimeSpan.MaxValue;
-
-    [DataField(required: true)]
-    public ProtoId<DepartmentPrototype> Department;
-
-    public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
-        Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager, IPrototypeManager prototypeManager,
-        IConfigurationManager configManager, out FormattedMessage? reason)
-    {
-        // Disable the requirement if the role timers are disabled
-        if (!configManager.GetCVar(CCVars.GameRoleTimers))
-        {
-            reason = null;
-            return !Inverted;
-        }
-
-        var department = prototypeManager.Index(Department);
-
-        // Combine all of this department's job playtimes
-        var playtime = TimeSpan.Zero;
-        foreach (var other in department.Roles)
-        {
-            var proto = prototypeManager.Index<JobPrototype>(other).PlayTimeTracker;
-
-            playTimes.TryGetValue(proto, out var otherTime);
-            playtime += otherTime;
-        }
-
-        if (playtime > Max)
-        {
-            // Show the reason if invalid
-            reason = Inverted
-                ? null
-                : FormattedMessage.FromMarkup(Loc.GetString("loadout-timer-department-too-high",
-                    ("time", playtime.Minutes - Max.Minutes),
-                    ("department", Loc.GetString($"department-{department.ID}")),
-                    ("departmentColor", department.Color)));
-            return false;
-        }
-
-        if (playtime < Min)
-        {
-            // Show the reason if invalid
-            reason = Inverted
-                ? null
-                : FormattedMessage.FromMarkup(Loc.GetString("loadout-timer-department-insufficient",
-                    ("time", Min.Minutes - playtime.Minutes),
-                    ("department", Loc.GetString($"department-{department.ID}")),
-                    ("departmentColor", department.Color)));
-            return false;
-        }
-
-        reason = null;
-        return true;
-    }
-}
-
-/// <summary>
-///     Requires the player to have a certain amount of overall job time
-/// </summary>
-[UsedImplicitly]
-[Serializable, NetSerializable]
-public sealed partial class LoadoutOverallTimeRequirement : LoadoutRequirement
-{
-    [DataField]
-    public TimeSpan Min = TimeSpan.MinValue;
-
-    [DataField]
-    public TimeSpan Max = TimeSpan.MaxValue;
-
-    public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
-        Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager, IPrototypeManager prototypeManager,
-        IConfigurationManager configManager, out FormattedMessage? reason)
-    {
-        // Disable the requirement if the role timers are disabled
-        if (!configManager.GetCVar(CCVars.GameRoleTimers))
-        {
-            reason = null;
-            return !Inverted;
-        }
-
-        // Get the overall time
-        var overallTime = playTimes.GetValueOrDefault(PlayTimeTrackingShared.TrackerOverall);
-
-        if (overallTime > Max)
-        {
-            // Show the reason if invalid
-            reason = Inverted
-                ? null
-                : FormattedMessage.FromMarkup(Loc.GetString("loadout-timer-overall-too-high",
-                    ("time", overallTime.Minutes - Max.Minutes)));
-            return false;
-        }
-
-        if (overallTime < Min)
-        {
-            // Show the reason if invalid
-            reason = Inverted
-                ? null
-                : FormattedMessage.FromMarkup(Loc.GetString("loadout-timer-overall-insufficient",
-                    ("time", Min.Minutes - overallTime.Minutes)));
-            return false;
-        }
-
-        reason = null;
-        return true;
-    }
-}
-
-/// <summary>
-///     Requires the playtime for a tracker to be within a certain range
-/// </summary>
-[UsedImplicitly]
-[Serializable, NetSerializable]
-public sealed partial class LoadoutPlaytimeRequirement : LoadoutRequirement
-{
-    [DataField]
-    public TimeSpan Min = TimeSpan.MinValue;
-
-    [DataField]
-    public TimeSpan Max = TimeSpan.MaxValue;
-
-    [DataField(required: true)]
-    public ProtoId<PlayTimeTrackerPrototype> Tracker;
-
-    public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
-        Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager, IPrototypeManager prototypeManager,
-        IConfigurationManager configManager, out FormattedMessage? reason)
-    {
-        // Disable the requirement if the role timers are disabled
-        if (!configManager.GetCVar(CCVars.GameRoleTimers))
-        {
-            reason = null;
-            return !Inverted;
-        }
-
-        // Get SharedJobSystem
-        if (!entityManager.EntitySysManager.TryGetEntitySystem(out SharedJobSystem? jobSystem))
-        {
-            DebugTools.Assert("LoadoutRequirements: SharedJobSystem not found");
-            reason = null;
-            return false;
-        }
-
-        // Get the JobPrototype of the Tracker
-        var trackerJob = jobSystem.GetJobPrototype(Tracker);
-
-        // Get the primary department of the Tracker
-        if (!jobSystem.TryGetPrimaryDepartment(trackerJob, out var department) &&
-            !jobSystem.TryGetDepartment(trackerJob, out department))
-        {
-            DebugTools.Assert($"LoadoutRequirements: Department not found for job {trackerJob}");
-            reason = null;
-            return false;
-        }
-
-        // Get the time for the tracker
-        playTimes.TryGetValue(Tracker, out var time);
-        reason = null;
-
-        if (time > Max)
-        {
-            // Show the reason if invalid
-            reason = Inverted
-                ? null
-                : FormattedMessage.FromMarkup(Loc.GetString("loadout-timer-role-too-high",
-                    ("time", time.Minutes - Max.Minutes),
-                    ("job", trackerJob),
-                    ("departmentColor", department.Color)));
-            return false;
-        }
-
-        if (time < Min)
-        {
-            // Show the reason if invalid
-            reason = Inverted
-                ? null
-                : FormattedMessage.FromMarkup(Loc.GetString("loadout-timer-role-insufficient",
-                    ("time", Min.Minutes - time.Minutes),
-                    ("job", trackerJob),
-                    ("departmentColor", department.Color)));
-            return false;
-        }
-
-        return true;
-    }
-}
-
-#endregion
diff --git a/Content.Shared/Clothing/Loadouts/Systems/LoadoutSystem.cs b/Content.Shared/Clothing/Loadouts/Systems/LoadoutSystem.cs
index eb9a5dcbc8..09e3db3793 100644
--- a/Content.Shared/Clothing/Loadouts/Systems/LoadoutSystem.cs
+++ b/Content.Shared/Clothing/Loadouts/Systems/LoadoutSystem.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Clothing.Components;
 using Content.Shared.Clothing.Loadouts.Prototypes;
+using Content.Shared.Customization.Systems;
 using Content.Shared.Inventory;
 using Content.Shared.Preferences;
 using Content.Shared.Roles;
@@ -17,7 +18,8 @@ public sealed class LoadoutSystem : EntitySystem
     [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly InventorySystem _inventory = default!;
-    [Dependency] private readonly IConfigurationManager _configurationManager = default!;
+    [Dependency] private readonly IConfigurationManager _configuration = default!;
+    [Dependency] private readonly CharacterRequirementsSystem _characterRequirements = default!;
 
     public override void Initialize()
     {
@@ -66,8 +68,9 @@ public List<EntityUid> ApplyCharacterLoadout(EntityUid uid, JobPrototype job, Hu
                 continue;
 
 
-            if (!CheckRequirementsValid(loadoutProto.Requirements, job, profile,
-                playTimes ?? new Dictionary<string, TimeSpan>(), EntityManager, _prototype, _configurationManager,
+            if (!_characterRequirements.CheckRequirementsValid(loadoutProto, loadoutProto.Requirements, job, profile,
+                playTimes ?? new Dictionary<string, TimeSpan>(),
+                EntityManager, _prototype, _configuration,
                 out _))
                 continue;
 
@@ -115,35 +118,4 @@ public List<EntityUid> ApplyCharacterLoadout(EntityUid uid, JobPrototype job, Hu
         // The server has more information about the inventory system than the client does and the client doesn't need to put loadouts in backpacks
         return failedLoadouts;
     }
-
-
-    public bool CheckRequirementsValid(List<LoadoutRequirement> requirements, JobPrototype job,
-        HumanoidCharacterProfile profile, Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager,
-        IPrototypeManager prototypeManager, IConfigurationManager configManager, out List<FormattedMessage> reasons)
-    {
-        reasons = new List<FormattedMessage>();
-        var valid = true;
-
-        foreach (var requirement in requirements)
-        {
-            // Set valid to false if the requirement is invalid and not inverted, if it's inverted set it to true when it's valid
-            if (!requirement.IsValid(job, profile, playTimes, entityManager, prototypeManager, configManager, out var reason))
-            {
-                if (valid)
-                    valid = requirement.Inverted;
-            }
-            else
-            {
-                if (valid)
-                    valid = !requirement.Inverted;
-            }
-
-            if (reason != null)
-            {
-                reasons.Add(reason);
-            }
-        }
-
-        return valid;
-    }
 }
diff --git a/Content.Shared/Contests/ContestsSystem.CVars.cs b/Content.Shared/Contests/ContestsSystem.CVars.cs
new file mode 100644
index 0000000000..2775c8adb4
--- /dev/null
+++ b/Content.Shared/Contests/ContestsSystem.CVars.cs
@@ -0,0 +1,19 @@
+using Content.Shared.CCVar;
+using Robust.Shared.Configuration;
+
+namespace Content.Shared.Contests
+{
+    public sealed partial class ContestsSystem
+    {
+        [Dependency] private readonly IConfigurationManager _cfg = default!;
+
+        public bool DoMassContests { get; private set; }
+        public float MassContestsMaxPercentage { get; private set; }
+
+        private void InitializeCVars()
+        {
+            Subs.CVar(_cfg, CCVars.DoMassContests, value => DoMassContests = value, true);
+            Subs.CVar(_cfg, CCVars.MassContestsMaxPercentage, value => MassContestsMaxPercentage = value, true);
+        }
+    }
+}
diff --git a/Content.Shared/Contests/ContestsSystem.cs b/Content.Shared/Contests/ContestsSystem.cs
new file mode 100644
index 0000000000..2a105816b4
--- /dev/null
+++ b/Content.Shared/Contests/ContestsSystem.cs
@@ -0,0 +1,116 @@
+using Robust.Shared.Physics.Components;
+
+namespace Content.Shared.Contests
+{
+    public sealed partial class ContestsSystem : EntitySystem
+    {
+        // Defaulted to the average mass of an adult human
+        /// <summary>
+        ///     The presumed average mass of a player entity
+        /// </summary>
+        private const float AverageMass = 71f;
+        public override void Initialize()
+        {
+            base.Initialize();
+
+            InitializeCVars();
+
+        }
+        // REGION
+        // Mass Contests
+        /// <summary>
+        ///     Outputs the ratio of mass between a performer and the average human mass
+        /// </summary>
+        /// <param name="performerUid">Uid of Performer</param>
+        /// <returns></returns>
+        public float MassContest(EntityUid performerUid, float otherMass = AverageMass)
+        {
+            if (DoMassContests
+                && TryComp<PhysicsComponent>(performerUid, out var performerPhysics)
+                && performerPhysics.Mass != 0)
+                return Math.Clamp(performerPhysics.Mass / otherMass, 1 - MassContestsMaxPercentage, 1 + MassContestsMaxPercentage);
+
+            return 1f;
+        }
+
+        public float MassContest(EntityUid? performerUid, float otherMass = AverageMass)
+        {
+            if (DoMassContests)
+            {
+                var ratio = performerUid is { } uid ? MassContest(uid, otherMass) : 1f;
+                return ratio;
+            }
+
+            return 1f;
+        }
+
+        /// <summary>
+        ///     Outputs the ratio of mass between a performer and the average human mass
+        ///     If a function already has the performer's physics component, this is faster
+        /// </summary>
+        /// <param name="performerPhysics"></param>
+        /// <returns></returns>
+        public float MassContest(PhysicsComponent performerPhysics, float otherMass = AverageMass)
+        {
+            if (DoMassContests
+                && performerPhysics.Mass != 0)
+                return Math.Clamp(performerPhysics.Mass / otherMass, 1 - MassContestsMaxPercentage, 1 + MassContestsMaxPercentage);
+
+            return 1f;
+        }
+
+        /// <summary>
+        ///     Outputs the ratio of mass between a performer and a target, accepts either EntityUids or PhysicsComponents in any combination
+        ///     If you have physics components already in your function, use those instead
+        /// </summary>
+        /// <param name="performerUid"></param>
+        /// <param name="targetUid"></param>
+        /// <returns></returns>
+        public float MassContest(EntityUid performerUid, EntityUid targetUid)
+        {
+            if (DoMassContests
+                && TryComp<PhysicsComponent>(performerUid, out var performerPhysics)
+                && TryComp<PhysicsComponent>(targetUid, out var targetPhysics)
+                && performerPhysics.Mass != 0
+                && targetPhysics.InvMass != 0)
+                return Math.Clamp(performerPhysics.Mass * targetPhysics.InvMass, 1 - MassContestsMaxPercentage, 1 + MassContestsMaxPercentage);
+
+            return 1f;
+        }
+
+        /// <inheritdoc cref="MassContest(EntityUid, EntityUid)"/>
+        public float MassContest(EntityUid performerUid, PhysicsComponent targetPhysics)
+        {
+            if (DoMassContests
+                && TryComp<PhysicsComponent>(performerUid, out var performerPhysics)
+                && performerPhysics.Mass != 0
+                && targetPhysics.InvMass != 0)
+                return Math.Clamp(performerPhysics.Mass * targetPhysics.InvMass, 1 - MassContestsMaxPercentage, 1 + MassContestsMaxPercentage);
+
+            return 1f;
+        }
+
+        /// <inheritdoc cref="MassContest(EntityUid, EntityUid)"/>
+        public float MassContest(PhysicsComponent performerPhysics, EntityUid targetUid)
+        {
+            if (DoMassContests
+                && TryComp<PhysicsComponent>(targetUid, out var targetPhysics)
+                && performerPhysics.Mass != 0
+                && targetPhysics.InvMass != 0)
+                return Math.Clamp(performerPhysics.Mass * targetPhysics.InvMass, 1 - MassContestsMaxPercentage, 1 + MassContestsMaxPercentage);
+
+            return 1f;
+        }
+
+        /// <inheritdoc cref="MassContest(EntityUid, EntityUid)"/>
+        public float MassContest(PhysicsComponent performerPhysics, PhysicsComponent targetPhysics)
+        {
+            if (DoMassContests
+                && performerPhysics.Mass != 0
+                && targetPhysics.InvMass != 0)
+                return Math.Clamp(performerPhysics.Mass * targetPhysics.InvMass, 1 - MassContestsMaxPercentage, 1 + MassContestsMaxPercentage);
+
+            return 1f;
+        }
+    }
+}
diff --git a/Content.Shared/Cuffs/Components/HandcuffComponent.cs b/Content.Shared/Cuffs/Components/HandcuffComponent.cs
index 77a77cf2f8..a5593cd271 100644
--- a/Content.Shared/Cuffs/Components/HandcuffComponent.cs
+++ b/Content.Shared/Cuffs/Components/HandcuffComponent.cs
@@ -12,37 +12,37 @@ public sealed partial class HandcuffComponent : Component
     /// <summary>
     ///     The time it takes to cuff an entity.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public float CuffTime = 3.5f;
 
     /// <summary>
     ///     The time it takes to uncuff an entity.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public float UncuffTime = 3.5f;
 
     /// <summary>
     ///     The time it takes for a cuffed entity to uncuff itself.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public float BreakoutTime = 15f;
 
     /// <summary>
     ///     If an entity being cuffed is stunned, this amount of time is subtracted from the time it takes to add/remove their cuffs.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public float StunBonus = 2f;
 
     /// <summary>
     ///     Will the cuffs break when removed?
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public bool BreakOnRemove;
 
     /// <summary>
     ///     Will the cuffs break when removed?
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public EntProtoId? BrokenPrototype;
 
     /// <summary>
@@ -55,35 +55,42 @@ public sealed partial class HandcuffComponent : Component
     /// <summary>
     ///     The path of the RSI file used for the player cuffed overlay.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public string? CuffedRSI = "Objects/Misc/handcuffs.rsi";
 
     /// <summary>
     ///     The iconstate used with the RSI file for the player cuffed overlay.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public string? BodyIconState = "body-overlay";
 
     /// <summary>
     /// An opptional color specification for <see cref="BodyIconState"/>
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public Color Color = Color.White;
 
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public SoundSpecifier StartCuffSound = new SoundPathSpecifier("/Audio/Items/Handcuffs/cuff_start.ogg");
 
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public SoundSpecifier EndCuffSound = new SoundPathSpecifier("/Audio/Items/Handcuffs/cuff_end.ogg");
 
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public SoundSpecifier StartBreakoutSound = new SoundPathSpecifier("/Audio/Items/Handcuffs/cuff_breakout_start.ogg");
 
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public SoundSpecifier StartUncuffSound = new SoundPathSpecifier("/Audio/Items/Handcuffs/cuff_takeoff_start.ogg");
 
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public SoundSpecifier EndUncuffSound = new SoundPathSpecifier("/Audio/Items/Handcuffs/cuff_takeoff_end.ogg");
+
+    /// <summary>
+    ///     Both a bool and a multiplier combined. If it is 0, handcuffs are unaffected by mass contests. The absolute value of any nonzero acts as a multiplier on how much mass affects uncuff speed.
+    ///     A value of 1 provides the full modifier from MassContest. 0.5 is half the effect of mass contests, and so on.
+    /// </summary>
+    [DataField]
+    public float UncuffMassModifier = 0f;
 }
 
 /// <summary>
diff --git a/Content.Shared/Cuffs/SharedCuffableSystem.cs b/Content.Shared/Cuffs/SharedCuffableSystem.cs
index fc005fd30f..0fa77b182c 100644
--- a/Content.Shared/Cuffs/SharedCuffableSystem.cs
+++ b/Content.Shared/Cuffs/SharedCuffableSystem.cs
@@ -5,6 +5,7 @@
 using Content.Shared.Alert;
 using Content.Shared.Atmos.Piping.Unary.Components;
 using Content.Shared.Buckle.Components;
+using Content.Shared.Contests;
 using Content.Shared.Cuffs.Components;
 using Content.Shared.Database;
 using Content.Shared.DoAfter;
@@ -58,6 +59,7 @@ public abstract partial class SharedCuffableSystem : EntitySystem
         [Dependency] private readonly SharedPopupSystem _popup = default!;
         [Dependency] private readonly SharedTransformSystem _transform = default!;
         [Dependency] private readonly UseDelaySystem _delay = default!;
+        [Dependency] private readonly ContestsSystem _contests = default!;
 
         public override void Initialize()
         {
@@ -559,7 +561,7 @@ public void TryUncuff(EntityUid target, EntityUid user, EntityUid? cuffsToRemove
                 return;
             }
 
-            var uncuffTime = isOwner ? cuff.BreakoutTime : cuff.UncuffTime;
+            var uncuffTime = (isOwner ? cuff.BreakoutTime : cuff.UncuffTime) * (_contests.MassContest(user) * Math.Abs(cuff.UncuffMassModifier));
 
             if (isOwner)
             {
diff --git a/Content.Shared/Customization/Systems/CharacterRequirements.cs b/Content.Shared/Customization/Systems/CharacterRequirements.cs
new file mode 100644
index 0000000000..b7200c60e8
--- /dev/null
+++ b/Content.Shared/Customization/Systems/CharacterRequirements.cs
@@ -0,0 +1,529 @@
+using System.Linq;
+using Content.Shared.CCVar;
+using Content.Shared.Clothing.Loadouts.Prototypes;
+using Content.Shared.Humanoid.Prototypes;
+using Content.Shared.Players.PlayTimeTracking;
+using Content.Shared.Preferences;
+using Content.Shared.Roles;
+using Content.Shared.Roles.Jobs;
+using Content.Shared.Traits;
+using JetBrains.Annotations;
+using Robust.Shared.Configuration;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Customization.Systems;
+
+
+[ImplicitDataDefinitionForInheritors, MeansImplicitUse]
+[Serializable, NetSerializable]
+public abstract partial class CharacterRequirement
+{
+    /// <summary>
+    ///     If true valid requirements will be treated as invalid and vice versa
+    /// </summary>
+    [DataField]
+    public bool Inverted;
+
+    /// <summary>
+    ///     Checks if this character requirement is valid for the given parameters
+    /// </summary>
+    /// <param name="reason">Description for the requirement, shown when not null</param>
+    public abstract bool IsValid(
+        IPrototype prototype,
+        JobPrototype job,
+        HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes,
+        IEntityManager entityManager,
+        IPrototypeManager prototypeManager,
+        IConfigurationManager configManager,
+        out FormattedMessage? reason
+    );
+}
+
+
+#region HumanoidCharacterProfile
+
+/// <summary>
+///     Requires the profile to be within an age range
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class CharacterAgeRequirement : CharacterRequirement
+{
+    [DataField(required: true)]
+    public int Min;
+
+    [DataField(required: true)]
+    public int Max;
+
+    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes,
+        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
+        out FormattedMessage? reason)
+    {
+        reason = FormattedMessage.FromMarkup(Loc.GetString("character-age-requirement",
+            ("inverted", Inverted), ("min", Min), ("max", Max)));
+        return profile.Age >= Min && profile.Age <= Max;
+    }
+}
+
+/// <summary>
+///   Requires the profile to use either a Backpack, Satchel, or Duffelbag
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class CharacterBackpackTypeRequirement : CharacterRequirement
+{
+    [DataField(required: true)]
+    public BackpackPreference Preference;
+
+    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes,
+        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
+        out FormattedMessage? reason)
+    {
+        reason = FormattedMessage.FromMarkup(Loc.GetString("character-backpack-type-requirement",
+            ("inverted", Inverted),
+            ("type", Loc.GetString($"humanoid-profile-editor-preference-{Preference.ToString().ToLower()}"))));
+        return profile.Backpack == Preference;
+    }
+}
+
+/// <summary>
+///     Requires the profile to use either Jumpsuits or Jumpskirts
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class CharacterClothingPreferenceRequirement : CharacterRequirement
+{
+    [DataField(required: true)]
+    public ClothingPreference Preference;
+
+    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes,
+        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
+        out FormattedMessage? reason)
+    {
+        reason = FormattedMessage.FromMarkup(Loc.GetString("character-clothing-preference-requirement",
+            ("inverted", Inverted),
+            ("preference", Loc.GetString($"humanoid-profile-editor-preference-{Preference.ToString().ToLower()}"))));
+        return profile.Clothing == Preference;
+    }
+}
+
+/// <summary>
+///     Requires the profile to be a certain species
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class CharacterSpeciesRequirement : CharacterRequirement
+{
+    [DataField(required: true)]
+    public ProtoId<SpeciesPrototype> Species;
+
+    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes,
+        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
+        out FormattedMessage? reason)
+    {
+        reason = FormattedMessage.FromMarkup(Loc.GetString("character-species-requirement",
+            ("inverted", Inverted),
+            ("species", Loc.GetString($"species-name-{Species.ToString().ToLower()}"))));
+        return profile.Species == Species;
+    }
+}
+
+/// <summary>
+///     Requires the profile to have one of the specified traits
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class CharacterTraitRequirement : CharacterRequirement
+{
+    [DataField(required: true)]
+    public List<ProtoId<TraitPrototype>> Traits;
+
+    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes,
+        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
+        out FormattedMessage? reason)
+    {
+        reason = FormattedMessage.FromMarkup(Loc.GetString("character-trait-requirement", ("inverted", Inverted),
+            ("traits", string.Join(", ", Traits.Select(t => Loc.GetString($"trait-name-{t}"))))));
+
+        return Traits.Any(t => profile.TraitPreferences.Contains(t.ToString()));
+    }
+}
+
+/// <summary>
+///     Requires the profile to have one of the specified loadouts
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class CharacterLoadoutRequirement : CharacterRequirement
+{
+    [DataField(required: true)]
+    public List<ProtoId<LoadoutPrototype>> Loadouts;
+
+    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager, IPrototypeManager prototypeManager,
+        IConfigurationManager configManager, out FormattedMessage? reason)
+    {
+        reason = FormattedMessage.FromMarkup(Loc.GetString("character-loadout-requirement", ("inverted", Inverted),
+            ("loadouts", string.Join(", ", Loadouts.Select(l => Loc.GetString($"loadout-{l}"))))));
+
+        return Loadouts.Any(l => profile.LoadoutPreferences.Contains(l.ToString()));
+    }
+}
+
+#endregion
+
+#region Jobs
+
+/// <summary>
+///     Requires the selected job to be one of the specified jobs
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class CharacterJobRequirement : CharacterRequirement
+{
+    [DataField(required: true)]
+    public List<ProtoId<JobPrototype>> Jobs;
+
+    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes,
+        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
+        out FormattedMessage? reason)
+    {
+        var jobs = new List<FormattedMessage>();
+
+        // Get the job names and department colors
+        foreach (var j in Jobs)
+        {
+            var jobProto = prototypeManager.Index(j);
+            var color = Color.LightBlue;
+
+            foreach (var dept in prototypeManager.EnumeratePrototypes<DepartmentPrototype>()
+                .OrderBy(d => Loc.GetString($"department-{d.ID}")))
+            {
+                if (!dept.Roles.Contains(j))
+                    continue;
+
+                color = dept.Color;
+                break;
+            }
+
+            jobs.Add(FormattedMessage.FromMarkup($"[color={color.ToHex()}]{Loc.GetString(jobProto.Name)}[/color]"));
+        }
+
+        // Join the job names
+        var jobsList = string.Join(", ", jobs.Select(j => j.ToMarkup()));
+        var jobsString = Loc.GetString("character-job-requirement",
+            ("inverted", Inverted), ("jobs", jobsList));
+
+        reason = FormattedMessage.FromMarkup(jobsString);
+        return Jobs.Contains(job.ID);
+    }
+}
+
+/// <summary>
+///     Requires the selected job to be in one of the specified departments
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class CharacterDepartmentRequirement : CharacterRequirement
+{
+    [DataField(required: true)]
+    public List<ProtoId<DepartmentPrototype>> Departments;
+
+    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes,
+        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
+        out FormattedMessage? reason)
+    {
+        var departments = new List<FormattedMessage>();
+
+        // Get the department names and colors
+        foreach (var d in Departments)
+        {
+            var deptProto = prototypeManager.Index(d);
+            var color = deptProto.Color;
+
+            departments.Add(FormattedMessage.FromMarkup($"[color={color.ToHex()}]{Loc.GetString($"department-{deptProto.ID}")}[/color]"));
+        }
+
+        // Join the department names
+        var departmentsList = string.Join(", ", departments.Select(d => d.ToMarkup()));
+        var departmentsString = Loc.GetString("character-department-requirement",
+            ("inverted", Inverted), ("departments", departmentsList));
+
+        reason = FormattedMessage.FromMarkup(departmentsString);
+        return Departments.Any(d => prototypeManager.Index(d).Roles.Contains(job.ID));
+    }
+}
+
+/// <summary>
+///     Requires the playtime for a department to be within a certain range
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class CharacterDepartmentTimeRequirement : CharacterRequirement
+{
+    [DataField]
+    public TimeSpan Min = TimeSpan.MinValue;
+
+    [DataField]
+    public TimeSpan Max = TimeSpan.MaxValue;
+
+    [DataField(required: true)]
+    public ProtoId<DepartmentPrototype> Department;
+
+    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes,
+        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
+        out FormattedMessage? reason)
+    {
+        // Disable the requirement if the role timers are disabled
+        if (!configManager.GetCVar(CCVars.GameRoleTimers))
+        {
+            reason = null;
+            return !Inverted;
+        }
+
+        var department = prototypeManager.Index(Department);
+
+        // Combine all of this department's job playtimes
+        var playtime = TimeSpan.Zero;
+        foreach (var other in department.Roles)
+        {
+            var proto = prototypeManager.Index<JobPrototype>(other).PlayTimeTracker;
+
+            playTimes.TryGetValue(proto, out var otherTime);
+            playtime += otherTime;
+        }
+
+        if (playtime > Max)
+        {
+            // Show the reason if invalid
+            reason = Inverted
+                ? null
+                : FormattedMessage.FromMarkup(Loc.GetString("character-timer-department-too-high",
+                    ("time", playtime.Minutes - Max.Minutes),
+                    ("department", Loc.GetString($"department-{department.ID}")),
+                    ("departmentColor", department.Color)));
+            return false;
+        }
+
+        if (playtime < Min)
+        {
+            // Show the reason if invalid
+            reason = Inverted
+                ? null
+                : FormattedMessage.FromMarkup(Loc.GetString("character-timer-department-insufficient",
+                    ("time", Min.Minutes - playtime.Minutes),
+                    ("department", Loc.GetString($"department-{department.ID}")),
+                    ("departmentColor", department.Color)));
+            return false;
+        }
+
+        reason = null;
+        return true;
+    }
+}
+
+/// <summary>
+///     Requires the player to have a certain amount of overall job time
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class CharacterOverallTimeRequirement : CharacterRequirement
+{
+    [DataField]
+    public TimeSpan Min = TimeSpan.MinValue;
+
+    [DataField]
+    public TimeSpan Max = TimeSpan.MaxValue;
+
+    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes,
+        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
+        out FormattedMessage? reason)
+    {
+        // Disable the requirement if the role timers are disabled
+        if (!configManager.GetCVar(CCVars.GameRoleTimers))
+        {
+            reason = null;
+            return !Inverted;
+        }
+
+        // Get the overall time
+        var overallTime = playTimes.GetValueOrDefault(PlayTimeTrackingShared.TrackerOverall);
+
+        if (overallTime > Max)
+        {
+            // Show the reason if invalid
+            reason = Inverted
+                ? null
+                : FormattedMessage.FromMarkup(Loc.GetString("character-timer-overall-too-high",
+                    ("time", overallTime.Minutes - Max.Minutes)));
+            return false;
+        }
+
+        if (overallTime < Min)
+        {
+            // Show the reason if invalid
+            reason = Inverted
+                ? null
+                : FormattedMessage.FromMarkup(Loc.GetString("character-timer-overall-insufficient",
+                    ("time", Min.Minutes - overallTime.Minutes)));
+            return false;
+        }
+
+        reason = null;
+        return true;
+    }
+}
+
+/// <summary>
+///     Requires the playtime for a tracker to be within a certain range
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class CharacterPlaytimeRequirement : CharacterRequirement
+{
+    [DataField]
+    public TimeSpan Min = TimeSpan.MinValue;
+
+    [DataField]
+    public TimeSpan Max = TimeSpan.MaxValue;
+
+    [DataField(required: true)]
+    public ProtoId<PlayTimeTrackerPrototype> Tracker;
+
+    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes,
+        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
+        out FormattedMessage? reason)
+    {
+        // Disable the requirement if the role timers are disabled
+        if (!configManager.GetCVar(CCVars.GameRoleTimers))
+        {
+            reason = null;
+            return !Inverted;
+        }
+
+        // Get SharedJobSystem
+        if (!entityManager.EntitySysManager.TryGetEntitySystem(out SharedJobSystem? jobSystem))
+        {
+            DebugTools.Assert("CharacterRequirements: SharedJobSystem not found");
+            reason = null;
+            return false;
+        }
+
+        // Get the JobPrototype of the Tracker
+        var trackerJob = jobSystem.GetJobPrototype(Tracker);
+
+        // Get the primary department of the Tracker
+        if (!jobSystem.TryGetPrimaryDepartment(trackerJob, out var department) &&
+            !jobSystem.TryGetDepartment(trackerJob, out department))
+        {
+            DebugTools.Assert($"CharacterRequirements: Department not found for job {trackerJob}");
+            reason = null;
+            return false;
+        }
+
+        // Get the time for the tracker
+        var time = playTimes.GetValueOrDefault(Tracker);
+        reason = null;
+
+        if (time > Max)
+        {
+            // Show the reason if invalid
+            reason = Inverted
+                ? null
+                : FormattedMessage.FromMarkup(Loc.GetString("character-timer-role-too-high",
+                    ("time", time.Minutes - Max.Minutes),
+                    ("job", trackerJob),
+                    ("departmentColor", department.Color)));
+            return false;
+        }
+
+        if (time < Min)
+        {
+            // Show the reason if invalid
+            reason = Inverted
+                ? null
+                : FormattedMessage.FromMarkup(Loc.GetString("character-timer-role-insufficient",
+                    ("time", Min.Minutes - time.Minutes),
+                    ("job", trackerJob),
+                    ("departmentColor", department.Color)));
+            return false;
+        }
+
+        return true;
+    }
+}
+
+#endregion
+
+#region Prototype Groups
+
+/// <summary>
+///     Requires the profile to not have any of the specified traits
+/// </summary>
+/// <remarks>
+///     Only works if you put this prototype in the denied prototypes' requirements too.
+///     Can't be inverted, use <see cref="CharacterTraitRequirement"/>
+/// </remarks>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class TraitGroupExclusionRequirement : CharacterRequirement
+{
+    [DataField(required: true)]
+    public List<ProtoId<TraitPrototype>> Prototypes;
+
+    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes,
+        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
+        out FormattedMessage? reason)
+    {
+        var invalid = profile.TraitPreferences.Any(t => Prototypes.Contains(t));
+
+        reason = FormattedMessage.FromMarkup(Loc.GetString("character-trait-group-exclusion-requirement",
+            ("traits", string.Join(", ", Prototypes.Select(t => Loc.GetString($"trait-name-{t}"))))));
+
+        return Inverted ? invalid : !invalid;
+    }
+}
+
+/// <summary>
+///     Requires the profile to not have any of the specified loadouts
+/// </summary>
+/// <remarks>
+///     Only works if you put this prototype in the denied prototypes' requirements too.
+///     Can't be inverted, use <see cref="CharacterLoadoutRequirement"/>
+/// </remarks>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class LoadoutGroupExclusionRequirement : CharacterRequirement
+{
+    [DataField(required: true)]
+    public List<ProtoId<LoadoutPrototype>> Prototypes;
+
+    public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes,
+        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
+        out FormattedMessage? reason)
+    {
+        var invalid = profile.LoadoutPreferences.Any(l => Prototypes.Contains(l));
+
+        reason = FormattedMessage.FromMarkup(Loc.GetString("character-loadout-group-exclusion-requirement",
+            ("loadouts", string.Join(", ", Prototypes.Select(l => Loc.GetString($"loadout-{l}"))))));
+
+        return Inverted ? invalid : !invalid;
+    }
+}
+
+#endregion
diff --git a/Content.Shared/Customization/Systems/CharacterRequirementsSystem.cs b/Content.Shared/Customization/Systems/CharacterRequirementsSystem.cs
new file mode 100644
index 0000000000..e93c933a6a
--- /dev/null
+++ b/Content.Shared/Customization/Systems/CharacterRequirementsSystem.cs
@@ -0,0 +1,43 @@
+using Content.Shared.Preferences;
+using Content.Shared.Roles;
+using Robust.Shared.Configuration;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Customization.Systems;
+
+
+public sealed class CharacterRequirementsSystem : EntitySystem
+{
+    public bool CheckRequirementsValid(IPrototype prototype, List<CharacterRequirement> requirements, JobPrototype job,
+        HumanoidCharacterProfile profile, Dictionary<string, TimeSpan> playTimes,
+        IEntityManager entityManager, IPrototypeManager prototypeManager, IConfigurationManager configManager,
+        out List<FormattedMessage> reasons)
+    {
+        reasons = new List<FormattedMessage>();
+        var valid = true;
+
+        foreach (var requirement in requirements)
+        {
+            // Set valid to false if the requirement is invalid and not inverted
+            // If it's inverted set valid to false when it's valid
+            if (!requirement.IsValid(prototype, job, profile, playTimes,
+                entityManager, prototypeManager, configManager,
+                out var reason))
+            {
+                if (valid)
+                    valid = requirement.Inverted;
+            }
+            else
+            {
+                if (valid)
+                    valid = !requirement.Inverted;
+            }
+
+            if (reason != null) // To appease the compiler
+                reasons.Add(reason);
+        }
+
+        return valid;
+    }
+}
diff --git a/Content.Shared/Drunk/DrunkSystem.cs b/Content.Shared/Drunk/DrunkSystem.cs
index 4f9429b6a6..161d4729ed 100644
--- a/Content.Shared/Drunk/DrunkSystem.cs
+++ b/Content.Shared/Drunk/DrunkSystem.cs
@@ -1,6 +1,6 @@
 using Content.Shared.Speech.EntitySystems;
 using Content.Shared.StatusEffect;
-using Content.Shared.Traits.Assorted;
+using Content.Shared.Traits.Assorted.Components;
 
 namespace Content.Shared.Drunk;
 
diff --git a/Content.Shared/HeightAdjust/HeightAdjustSystem.cs b/Content.Shared/HeightAdjust/HeightAdjustSystem.cs
index ef97272073..43fe3b0c5c 100644
--- a/Content.Shared/HeightAdjust/HeightAdjustSystem.cs
+++ b/Content.Shared/HeightAdjust/HeightAdjustSystem.cs
@@ -1,7 +1,9 @@
 using System.Numerics;
+using Content.Shared.CCVar;
 using Content.Shared.Humanoid;
 using Content.Shared.Movement.Components;
 using Content.Shared.Movement.Systems;
+using Robust.Shared.Configuration;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Systems;
 
@@ -12,6 +14,7 @@ public sealed class HeightAdjustSystem : EntitySystem
     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
     [Dependency] private readonly SharedContentEyeSystem _eye = default!;
     [Dependency] private readonly SharedHumanoidAppearanceSystem _appearance = default!;
+    [Dependency] private readonly IConfigurationManager _config = default!;
 
 
     /// <summary>
@@ -23,12 +26,12 @@ public sealed class HeightAdjustSystem : EntitySystem
     public bool SetScale(EntityUid uid, float scale)
     {
         var succeeded = true;
-        if (EntityManager.TryGetComponent<ContentEyeComponent>(uid, out var eye))
+        if (_config.GetCVar(CCVars.HeightAdjustModifiesZoom) && EntityManager.TryGetComponent<ContentEyeComponent>(uid, out var eye))
             _eye.SetMaxZoom(uid, eye.MaxZoom * scale);
         else
             succeeded = false;
 
-        if (EntityManager.TryGetComponent<FixturesComponent>(uid, out var fixtures))
+        if (_config.GetCVar(CCVars.HeightAdjustModifiesHitbox) && EntityManager.TryGetComponent<FixturesComponent>(uid, out var fixtures))
         {
             foreach (var fixture in fixtures.Fixtures)
             {
@@ -61,12 +64,11 @@ public bool SetScale(EntityUid uid, Vector2 scale)
         var succeeded = true;
         var avg = (scale.X + scale.Y) / 2;
 
-        if (EntityManager.TryGetComponent<ContentEyeComponent>(uid, out var eye))
+        if (_config.GetCVar(CCVars.HeightAdjustModifiesZoom) && EntityManager.TryGetComponent<ContentEyeComponent>(uid, out var eye))
             _eye.SetMaxZoom(uid, eye.MaxZoom * avg);
         else
             succeeded = false;
-
-        if (EntityManager.TryGetComponent<FixturesComponent>(uid, out var fixtures))
+        if (_config.GetCVar(CCVars.HeightAdjustModifiesHitbox) && EntityManager.TryGetComponent<FixturesComponent>(uid, out var fixtures))
         {
             foreach (var fixture in fixtures.Fixtures)
             {
diff --git a/Content.Shared/Humanoid/HumanoidAppearanceComponent.cs b/Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
index 09ddfb7d50..22aaf0de09 100644
--- a/Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
+++ b/Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
@@ -101,7 +101,6 @@ public sealed partial class HumanoidAppearanceComponent : Component
     /// </summary>
     [DataField, AutoNetworkedField]
     public float Width = 1f;
-    // Parkstation-HeightSlider End
 }
 
 [DataDefinition]
diff --git a/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs b/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
index 6184ba5839..8268d0d7c7 100644
--- a/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
+++ b/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
@@ -162,6 +162,18 @@ public sealed partial class SpeciesPrototype : IPrototype
     /// </summary>
     [DataField]
     public float MaxWidth = 1.3f;
+
+    /// <summary>
+    ///     The average height in centimeters for this species, used to calculate player facing height values in UI elements
+    /// </summary>
+    [DataField]
+    public float AverageHeight = 176.1f;
+
+    /// <summary>
+    ///     The average shoulder-to-shoulder width in cm for this species, used to calculate player facing width values in UI elements
+    /// </summary>
+    [DataField]
+    public float AverageWidth = 40f;
 }
 
 public enum SpeciesNaming : byte
diff --git a/Content.Shared/Implants/Components/ImplanterComponent.cs b/Content.Shared/Implants/Components/ImplanterComponent.cs
index 32a3636163..80330aa7e6 100644
--- a/Content.Shared/Implants/Components/ImplanterComponent.cs
+++ b/Content.Shared/Implants/Components/ImplanterComponent.cs
@@ -70,6 +70,12 @@ public sealed partial class ImplanterComponent : Component
     [DataField]
     public (string, string) ImplantData;
 
+    /// <summary>
+    /// Determines if the same type of implant can be implanted into an entity multiple times.
+    /// </summary>
+    [DataField]
+    public bool AllowMultipleImplants = false;
+
     /// <summary>
     /// The <see cref="ItemSlot"/> for this implanter
     /// </summary>
diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
index 3b2d18f15d..0d9078d21b 100644
--- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs
+++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
@@ -423,21 +423,21 @@ public HumanoidCharacterProfile WithLoadoutPreference(string loadoutId, bool pre
 
         public bool MemberwiseEquals(ICharacterProfile maybeOther)
         {
-            if (maybeOther is not HumanoidCharacterProfile other ||
-                Name != other.Name ||
-                Age != other.Age ||
-                Height != other.Height ||
-                Width != other.Width ||
-                Sex != other.Sex ||
-                Gender != other.Gender ||
-                PreferenceUnavailable != other.PreferenceUnavailable ||
-                Clothing != other.Clothing ||
-                Backpack != other.Backpack ||
-                SpawnPriority != other.SpawnPriority ||
-                !_jobPriorities.SequenceEqual(other._jobPriorities) ||
-                !_antagPreferences.SequenceEqual(other._antagPreferences) ||
-                !_traitPreferences.SequenceEqual(other._traitPreferences) ||
-                !_loadoutPreferences.SequenceEqual(other._loadoutPreferences))
+            if (maybeOther is not HumanoidCharacterProfile other
+                || Name != other.Name
+                || Age != other.Age
+                || Height != other.Height
+                || Width != other.Width
+                || Sex != other.Sex
+                || Gender != other.Gender
+                || PreferenceUnavailable != other.PreferenceUnavailable
+                || Clothing != other.Clothing
+                || Backpack != other.Backpack
+                || SpawnPriority != other.SpawnPriority
+                || !_jobPriorities.SequenceEqual(other._jobPriorities)
+                || !_antagPreferences.SequenceEqual(other._antagPreferences)
+                || !_traitPreferences.SequenceEqual(other._traitPreferences)
+                || !_loadoutPreferences.SequenceEqual(other._loadoutPreferences))
                 return false;
             return Appearance.MemberwiseEquals(other.Appearance);
         }
@@ -584,23 +584,42 @@ public void EnsureValid(IConfigurationManager configManager, IPrototypeManager p
                 .Where(prototypeManager.HasIndex<TraitPrototype>)
                 .ToList();
 
+            var maxTraits = configManager.GetCVar(CCVars.GameTraitsMax);
+            var currentTraits = 0;
+            var traitPoints = configManager.GetCVar(CCVars.GameTraitsDefaultPoints);
+
+            foreach (var trait in traits.OrderBy(t => -prototypeManager.Index<TraitPrototype>(t).Points).ToList())
+            {
+                var proto = prototypeManager.Index<TraitPrototype>(trait);
+
+                if (traitPoints + proto.Points < 0 || currentTraits + 1 > maxTraits)
+                    traits.Remove(trait);
+                else
+                {
+                    traitPoints += proto.Points;
+                    currentTraits++;
+                }
+            }
+
+
             var loadouts = LoadoutPreferences
                 .Where(prototypeManager.HasIndex<LoadoutPrototype>)
                 .ToList();
 
-            var maxLoadouts = configManager.GetCVar(CCVars.GameLoadoutsPoints);
-            var currentLoadouts = 0;
+            var loadoutPoints = configManager.GetCVar(CCVars.GameLoadoutsPoints);
+            var currentPoints = 0;
 
             foreach (var loadout in loadouts.ToList())
             {
                 var proto = prototypeManager.Index<LoadoutPrototype>(loadout);
 
-                if (currentLoadouts + proto.Cost > maxLoadouts)
+                if (currentPoints + proto.Cost > loadoutPoints)
                     loadouts.Remove(loadout);
                 else
-                    currentLoadouts += proto.Cost;
+                    currentPoints += proto.Cost;
             }
 
+
             Name = name;
             FlavorText = flavortext;
             Age = age;
diff --git a/Content.Shared/Traits/Assorted/AccentlessComponent.cs b/Content.Shared/Traits/Assorted/Components/AccentlessComponent.cs
similarity index 89%
rename from Content.Shared/Traits/Assorted/AccentlessComponent.cs
rename to Content.Shared/Traits/Assorted/Components/AccentlessComponent.cs
index 96ebf4d83f..084a1e1d92 100644
--- a/Content.Shared/Traits/Assorted/AccentlessComponent.cs
+++ b/Content.Shared/Traits/Assorted/Components/AccentlessComponent.cs
@@ -1,7 +1,7 @@
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 
-namespace Content.Shared.Traits.Assorted;
+namespace Content.Shared.Traits.Assorted.Components;
 
 /// <summary>
 /// This is used for the accentless trait
diff --git a/Content.Shared/Traits/Assorted/LegsParalyzedComponent.cs b/Content.Shared/Traits/Assorted/Components/LegsParalyzedComponent.cs
similarity index 65%
rename from Content.Shared/Traits/Assorted/LegsParalyzedComponent.cs
rename to Content.Shared/Traits/Assorted/Components/LegsParalyzedComponent.cs
index 59f9ca758b..d0639e5933 100644
--- a/Content.Shared/Traits/Assorted/LegsParalyzedComponent.cs
+++ b/Content.Shared/Traits/Assorted/Components/LegsParalyzedComponent.cs
@@ -1,6 +1,7 @@
-using Robust.Shared.GameStates;
+using Content.Shared.Traits.Assorted.Systems;
+using Robust.Shared.GameStates;
 
-namespace Content.Shared.Traits.Assorted;
+namespace Content.Shared.Traits.Assorted.Components;
 
 /// <summary>
 /// Set player speed to zero and standing state to down, simulating leg paralysis.
diff --git a/Content.Shared/Traits/Assorted/LightweightDrunkComponent.cs b/Content.Shared/Traits/Assorted/Components/LightweightDrunkComponent.cs
similarity index 90%
rename from Content.Shared/Traits/Assorted/LightweightDrunkComponent.cs
rename to Content.Shared/Traits/Assorted/Components/LightweightDrunkComponent.cs
index 5d353ac963..62d2f5899a 100644
--- a/Content.Shared/Traits/Assorted/LightweightDrunkComponent.cs
+++ b/Content.Shared/Traits/Assorted/Components/LightweightDrunkComponent.cs
@@ -1,7 +1,7 @@
-using Robust.Shared.GameStates;
 using Content.Shared.Drunk;
+using Robust.Shared.GameStates;
 
-namespace Content.Shared.Traits.Assorted;
+namespace Content.Shared.Traits.Assorted.Components;
 
 /// <summary>
 /// Used for the lightweight trait. DrunkSystem will check for this component and modify the boozePower accordingly if it finds it.
diff --git a/Content.Shared/Traits/Assorted/ParacusiaComponent.cs b/Content.Shared/Traits/Assorted/Components/ParacusiaComponent.cs
similarity index 93%
rename from Content.Shared/Traits/Assorted/ParacusiaComponent.cs
rename to Content.Shared/Traits/Assorted/Components/ParacusiaComponent.cs
index 1db698359b..ff62e55c2a 100644
--- a/Content.Shared/Traits/Assorted/ParacusiaComponent.cs
+++ b/Content.Shared/Traits/Assorted/Components/ParacusiaComponent.cs
@@ -1,8 +1,9 @@
+using Content.Shared.Traits.Assorted.Systems;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
-namespace Content.Shared.Traits.Assorted;
+namespace Content.Shared.Traits.Assorted.Components;
 
 /// <summary>
 /// This component is used for paracusia, which causes auditory hallucinations.
diff --git a/Content.Shared/Traits/Assorted/PermanentBlindnessComponent.cs b/Content.Shared/Traits/Assorted/Components/PermanentBlindnessComponent.cs
similarity index 81%
rename from Content.Shared/Traits/Assorted/PermanentBlindnessComponent.cs
rename to Content.Shared/Traits/Assorted/Components/PermanentBlindnessComponent.cs
index 76ff3e1005..c1bf7e1639 100644
--- a/Content.Shared/Traits/Assorted/PermanentBlindnessComponent.cs
+++ b/Content.Shared/Traits/Assorted/Components/PermanentBlindnessComponent.cs
@@ -1,6 +1,6 @@
 using Robust.Shared.GameStates;
 
-namespace Content.Shared.Traits.Assorted;
+namespace Content.Shared.Traits.Assorted.Components;
 
 /// <summary>
 /// This is used for making something blind forever.
diff --git a/Content.Shared/Traits/Assorted/LegsParalyzedSystem.cs b/Content.Shared/Traits/Assorted/LegsParalyzedSystem.cs
deleted file mode 100644
index 7c91366937..0000000000
--- a/Content.Shared/Traits/Assorted/LegsParalyzedSystem.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using Content.Shared.Body.Systems;
-using Content.Shared.Buckle.Components;
-using Content.Shared.Movement.Events;
-using Content.Shared.Movement.Systems;
-using Content.Shared.Standing;
-using Content.Shared.Throwing;
-
-namespace Content.Shared.Traits.Assorted;
-
-public sealed class LegsParalyzedSystem : EntitySystem
-{
-    [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifierSystem = default!;
-    [Dependency] private readonly StandingStateSystem _standingSystem = default!;
-    [Dependency] private readonly SharedBodySystem _bodySystem = default!;
-
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<LegsParalyzedComponent, ComponentStartup>(OnStartup);
-        SubscribeLocalEvent<LegsParalyzedComponent, ComponentShutdown>(OnShutdown);
-        SubscribeLocalEvent<LegsParalyzedComponent, BuckleChangeEvent>(OnBuckleChange);
-        SubscribeLocalEvent<LegsParalyzedComponent, ThrowPushbackAttemptEvent>(OnThrowPushbackAttempt);
-        SubscribeLocalEvent<LegsParalyzedComponent, UpdateCanMoveEvent>(OnUpdateCanMoveEvent);
-    }
-
-    private void OnStartup(EntityUid uid, LegsParalyzedComponent component, ComponentStartup args)
-    {
-        // TODO: In future probably must be surgery related wound
-        _movementSpeedModifierSystem.ChangeBaseSpeed(uid, 0, 0, 20);
-    }
-
-    private void OnShutdown(EntityUid uid, LegsParalyzedComponent component, ComponentShutdown args)
-    {
-        _standingSystem.Stand(uid);
-        _bodySystem.UpdateMovementSpeed(uid);
-    }
-
-    private void OnBuckleChange(EntityUid uid, LegsParalyzedComponent component, ref BuckleChangeEvent args)
-    {
-        if (args.Buckling)
-        {
-            _standingSystem.Stand(args.BuckledEntity);
-        }
-        else
-        {
-            _standingSystem.Down(args.BuckledEntity);
-        }
-    }
-
-    private void OnUpdateCanMoveEvent(EntityUid uid, LegsParalyzedComponent component, UpdateCanMoveEvent args)
-    {
-        args.Cancel();
-    }
-
-    private void OnThrowPushbackAttempt(EntityUid uid, LegsParalyzedComponent component, ThrowPushbackAttemptEvent args)
-    {
-        args.Cancel();
-    }
-}
diff --git a/Content.Shared/Traits/Assorted/AccentlessSystem.cs b/Content.Shared/Traits/Assorted/Systems/AccentlessSystem.cs
similarity index 62%
rename from Content.Shared/Traits/Assorted/AccentlessSystem.cs
rename to Content.Shared/Traits/Assorted/Systems/AccentlessSystem.cs
index 2242bc6e52..f4e077bc1a 100644
--- a/Content.Shared/Traits/Assorted/AccentlessSystem.cs
+++ b/Content.Shared/Traits/Assorted/Systems/AccentlessSystem.cs
@@ -1,6 +1,4 @@
-using Robust.Shared.Serialization.Manager;
-
-namespace Content.Shared.Traits.Assorted;
+namespace Content.Shared.Traits.Assorted.Systems;
 
 /// <summary>
 /// This handles removing accents when using the accentless trait.
@@ -12,10 +10,10 @@ public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<AccentlessComponent, ComponentStartup>(RemoveAccents);
+        SubscribeLocalEvent<Components.AccentlessComponent, ComponentStartup>(RemoveAccents);
     }
 
-    private void RemoveAccents(EntityUid uid, AccentlessComponent component, ComponentStartup args)
+    private void RemoveAccents(EntityUid uid, Components.AccentlessComponent component, ComponentStartup args)
     {
         foreach (var accent in component.RemovedAccents.Values)
         {
diff --git a/Content.Shared/Traits/Assorted/Systems/LegsParalyzedSystem.cs b/Content.Shared/Traits/Assorted/Systems/LegsParalyzedSystem.cs
new file mode 100644
index 0000000000..8ae0f251b8
--- /dev/null
+++ b/Content.Shared/Traits/Assorted/Systems/LegsParalyzedSystem.cs
@@ -0,0 +1,58 @@
+using Content.Shared.Body.Systems;
+using Content.Shared.Buckle.Components;
+using Content.Shared.Movement.Events;
+using Content.Shared.Movement.Systems;
+using Content.Shared.Standing;
+using Content.Shared.Throwing;
+
+namespace Content.Shared.Traits.Assorted.Systems;
+
+public sealed class LegsParalyzedSystem : EntitySystem
+{
+    [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifierSystem = default!;
+    [Dependency] private readonly StandingStateSystem _standingSystem = default!;
+    [Dependency] private readonly SharedBodySystem _bodySystem = default!;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<Components.LegsParalyzedComponent, ComponentStartup>(OnStartup);
+        SubscribeLocalEvent<Components.LegsParalyzedComponent, ComponentShutdown>(OnShutdown);
+        SubscribeLocalEvent<Components.LegsParalyzedComponent, BuckleChangeEvent>(OnBuckleChange);
+        SubscribeLocalEvent<Components.LegsParalyzedComponent, ThrowPushbackAttemptEvent>(OnThrowPushbackAttempt);
+        SubscribeLocalEvent<Components.LegsParalyzedComponent, UpdateCanMoveEvent>(OnUpdateCanMoveEvent);
+    }
+
+    private void OnStartup(EntityUid uid, Components.LegsParalyzedComponent component, ComponentStartup args)
+    {
+        // TODO: In future probably must be surgery related wound
+        _movementSpeedModifierSystem.ChangeBaseSpeed(uid, 0, 0, 20);
+    }
+
+    private void OnShutdown(EntityUid uid, Components.LegsParalyzedComponent component, ComponentShutdown args)
+    {
+        _standingSystem.Stand(uid);
+        _bodySystem.UpdateMovementSpeed(uid);
+    }
+
+    private void OnBuckleChange(EntityUid uid, Components.LegsParalyzedComponent component, ref BuckleChangeEvent args)
+    {
+        if (args.Buckling)
+        {
+            _standingSystem.Stand(args.BuckledEntity);
+        }
+        else
+        {
+            _standingSystem.Down(args.BuckledEntity);
+        }
+    }
+
+    private void OnUpdateCanMoveEvent(EntityUid uid, Components.LegsParalyzedComponent component, UpdateCanMoveEvent args)
+    {
+        args.Cancel();
+    }
+
+    private void OnThrowPushbackAttempt(EntityUid uid, Components.LegsParalyzedComponent component, ThrowPushbackAttemptEvent args)
+    {
+        args.Cancel();
+    }
+}
diff --git a/Content.Shared/Traits/Assorted/PermanentBlindnessSystem.cs b/Content.Shared/Traits/Assorted/Systems/PermanentBlindnessSystem.cs
similarity index 59%
rename from Content.Shared/Traits/Assorted/PermanentBlindnessSystem.cs
rename to Content.Shared/Traits/Assorted/Systems/PermanentBlindnessSystem.cs
index 9fd5db8497..113939f66b 100644
--- a/Content.Shared/Traits/Assorted/PermanentBlindnessSystem.cs
+++ b/Content.Shared/Traits/Assorted/Systems/PermanentBlindnessSystem.cs
@@ -4,7 +4,7 @@
 using Content.Shared.IdentityManagement;
 using Robust.Shared.Network;
 
-namespace Content.Shared.Traits.Assorted;
+namespace Content.Shared.Traits.Assorted.Systems;
 
 /// <summary>
 /// This handles permanent blindness, both the examine and the actual effect.
@@ -18,26 +18,26 @@ public sealed class PermanentBlindnessSystem : EntitySystem
     /// <inheritdoc/>
     public override void Initialize()
     {
-        SubscribeLocalEvent<PermanentBlindnessComponent, ComponentStartup>(OnStartup);
-        SubscribeLocalEvent<PermanentBlindnessComponent, ComponentShutdown>(OnShutdown);
-        SubscribeLocalEvent<PermanentBlindnessComponent, EyeDamageChangedEvent>(OnDamageChanged);
-        SubscribeLocalEvent<PermanentBlindnessComponent, ExaminedEvent>(OnExamined);
+        SubscribeLocalEvent<Components.PermanentBlindnessComponent, ComponentStartup>(OnStartup);
+        SubscribeLocalEvent<Components.PermanentBlindnessComponent, ComponentShutdown>(OnShutdown);
+        SubscribeLocalEvent<Components.PermanentBlindnessComponent, EyeDamageChangedEvent>(OnDamageChanged);
+        SubscribeLocalEvent<Components.PermanentBlindnessComponent, ExaminedEvent>(OnExamined);
     }
 
-    private void OnExamined(Entity<PermanentBlindnessComponent> blindness, ref ExaminedEvent args)
+    private void OnExamined(Entity<Components.PermanentBlindnessComponent> blindness, ref ExaminedEvent args)
     {
         if (args.IsInDetailsRange && !_net.IsClient)
         {
-            args.PushMarkup(Loc.GetString("permanent-blindness-trait-examined", ("target", Identity.Entity(blindness, EntityManager))));
+            args.PushMarkup(Loc.GetString("trait-examined-Blindness", ("target", Identity.Entity(blindness, EntityManager))));
         }
     }
 
-    private void OnShutdown(Entity<PermanentBlindnessComponent> blindness, ref ComponentShutdown args)
+    private void OnShutdown(Entity<Components.PermanentBlindnessComponent> blindness, ref ComponentShutdown args)
     {
         _blinding.UpdateIsBlind(blindness.Owner);
     }
 
-    private void OnStartup(Entity<PermanentBlindnessComponent> blindness, ref ComponentStartup args)
+    private void OnStartup(Entity<Components.PermanentBlindnessComponent> blindness, ref ComponentStartup args)
     {
         if (!_entityManager.TryGetComponent<BlindableComponent>(blindness, out var blindable))
             return;
@@ -50,7 +50,7 @@ private void OnStartup(Entity<PermanentBlindnessComponent> blindness, ref Compon
         _blinding.AdjustEyeDamage(blindness.Owner, damageToDeal);
     }
 
-    private void OnDamageChanged(Entity<PermanentBlindnessComponent> blindness, ref EyeDamageChangedEvent args)
+    private void OnDamageChanged(Entity<Components.PermanentBlindnessComponent> blindness, ref EyeDamageChangedEvent args)
     {
         if (args.Damage >= BlurryVisionComponent.MaxMagnitude)
             return;
diff --git a/Content.Shared/Traits/Assorted/SharedParacusiaSystem.cs b/Content.Shared/Traits/Assorted/Systems/SharedParacusiaSystem.cs
similarity index 56%
rename from Content.Shared/Traits/Assorted/SharedParacusiaSystem.cs
rename to Content.Shared/Traits/Assorted/Systems/SharedParacusiaSystem.cs
index 2bfb0da1f5..151e748445 100644
--- a/Content.Shared/Traits/Assorted/SharedParacusiaSystem.cs
+++ b/Content.Shared/Traits/Assorted/Systems/SharedParacusiaSystem.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared.Traits.Assorted;
+namespace Content.Shared.Traits.Assorted.Systems;
 
 public abstract class SharedParacusiaSystem : EntitySystem
 {
diff --git a/Content.Shared/Traits/Prototypes/TraitCategoryPrototype.cs b/Content.Shared/Traits/Prototypes/TraitCategoryPrototype.cs
new file mode 100644
index 0000000000..efbac1ca7d
--- /dev/null
+++ b/Content.Shared/Traits/Prototypes/TraitCategoryPrototype.cs
@@ -0,0 +1,14 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Traits;
+
+
+/// <summary>
+///     A prototype defining a valid category for <see cref="TraitPrototype"/>s to go into.
+/// </summary>
+[Prototype("traitCategory")]
+public sealed partial class TraitCategoryPrototype : IPrototype
+{
+    [IdDataField]
+    public string ID { get; } = default!;
+}
diff --git a/Content.Shared/Traits/Prototypes/TraitPrototype.cs b/Content.Shared/Traits/Prototypes/TraitPrototype.cs
new file mode 100644
index 0000000000..2e6b7cc066
--- /dev/null
+++ b/Content.Shared/Traits/Prototypes/TraitPrototype.cs
@@ -0,0 +1,39 @@
+using Content.Shared.Customization.Systems;
+using Content.Shared.Whitelist;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Traits;
+
+
+/// <summary>
+///     Describes a trait.
+/// </summary>
+[Prototype("trait")]
+public sealed partial class TraitPrototype : IPrototype
+{
+    [ViewVariables]
+    [IdDataField]
+    public string ID { get; private set; } = default!;
+
+    /// <summary>
+    ///     Which customization tab to place this entry in
+    /// </summary>
+    [DataField(required: true), ValidatePrototypeId<TraitCategoryPrototype>]
+    public string Category = "Uncategorized";
+
+    /// <summary>
+    ///     How many points this will give the character
+    /// </summary>
+    [DataField]
+    public int Points = 0;
+
+
+    [DataField]
+    public List<CharacterRequirement> Requirements = new();
+
+    /// <summary>
+    ///     The components that get added to the player when they pick this trait.
+    /// </summary>
+    [DataField(required: true)]
+    public ComponentRegistry Components { get; private set; } = default!;
+}
diff --git a/Content.Shared/Traits/TraitPrototype.cs b/Content.Shared/Traits/TraitPrototype.cs
deleted file mode 100644
index 34feb8da22..0000000000
--- a/Content.Shared/Traits/TraitPrototype.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using Content.Shared.Whitelist;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-// don't worry about it
-
-namespace Content.Shared.Traits
-{
-    /// <summary>
-    ///     Describes a trait.
-    /// </summary>
-    [Prototype("trait")]
-    public sealed partial class TraitPrototype : IPrototype
-    {
-        [ViewVariables]
-        [IdDataField]
-        public string ID { get; private set; } = default!;
-
-        /// <summary>
-        ///     The name of this trait.
-        /// </summary>
-        [DataField("name")]
-        public string Name { get; private set; } = "";
-
-        /// <summary>
-        ///     The description of this trait.
-        /// </summary>
-        [DataField("description")]
-        public string? Description { get; private set; }
-
-        /// <summary>
-        ///     Don't apply this trait to entities this whitelist IS NOT valid for.
-        /// </summary>
-        [DataField("whitelist")]
-        public EntityWhitelist? Whitelist;
-
-        /// <summary>
-        ///     Don't apply this trait to entities this whitelist IS valid for. (hence, a blacklist)
-        /// </summary>
-        [DataField("blacklist")]
-        public EntityWhitelist? Blacklist;
-
-        /// <summary>
-        ///     The components that get added to the player, when they pick this trait.
-        /// </summary>
-        [DataField("components")]
-        public ComponentRegistry Components { get; private set; } = default!;
-
-        /// <summary>
-        ///     Gear that is given to the player, when they pick this trait.
-        /// </summary>
-        [DataField("traitGear", required: false, customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
-        public string? TraitGear;
-    }
-}
diff --git a/Content.Shared/Weapons/Ranged/Components/GunComponent.cs b/Content.Shared/Weapons/Ranged/Components/GunComponent.cs
index 0220f312fc..a18aac80ab 100644
--- a/Content.Shared/Weapons/Ranged/Components/GunComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Components/GunComponent.cs
@@ -234,7 +234,7 @@ public sealed partial class GunComponent : Component
     ///     The percentage chance of a given gun to accidentally discharge if violently thrown into a wall or person
     /// </summary>
     [DataField]
-    public float Reliability = 0.1f;
+    public float FireOnDropChance = 0.1f;
 }
 
 [Flags]
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
index d3aee5a48e..f1daa700e8 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
@@ -441,7 +441,7 @@ protected void EjectCartridge(
         {
             Angle ejectAngle = angle.Value;
             ejectAngle += 3.7f; // 212 degrees; casings should eject slightly to the right and behind of a gun
-            ThrowingSystem.TryThrow(entity, ejectAngle.ToVec().Normalized() / 100, 5f);
+            ThrowingSystem.TryThrow(entity, ejectAngle.ToVec(), 625f);
         }
         if (playSound && TryComp<CartridgeAmmoComponent>(entity, out var cartridge))
         {
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index c98ba4bf4c..49b2d5358d 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -4192,3 +4192,36 @@ Entries:
         start of every shift
   id: 6123
   time: '2024-06-17T21:42:13.0000000+00:00'
+- author: VMSolidus
+  changes:
+    - type: Add
+      message: Peacock Tails have been added for Harpies
+  id: 6124
+  time: '2024-06-20T22:07:29.0000000+00:00'
+- author: VMSolidus
+  changes:
+    - type: Add
+      message: >-
+        NanoTrasen has disabled the unneeded safeties on your guns- Make sure
+        you're careful with them!
+    - type: Tweak
+      message: >-
+        All Firearms now have a reliability stat, some are more reliable than
+        others. The more reliable a weapon is, the less likely it is to
+        accidentally discharge when yeeted.
+  id: 6125
+  time: '2024-06-20T22:17:03.0000000+00:00'
+- author: DEATHB4DEFEAT
+  changes:
+    - type: Add
+      message: Animals will no longer be a silent, soulless shell
+  id: 6126
+  time: '2024-06-20T22:24:30.0000000+00:00'
+- author: DEATHB4DEFEAT
+  changes:
+    - type: Add
+      message: Added trait points
+    - type: Add
+      message: Added categories for traits
+  id: 6127
+  time: '2024-06-20T23:39:31.0000000+00:00'
diff --git a/Resources/Locale/en-US/customization/character-requirements.ftl b/Resources/Locale/en-US/customization/character-requirements.ftl
new file mode 100644
index 0000000000..efa1b7e767
--- /dev/null
+++ b/Resources/Locale/en-US/customization/character-requirements.ftl
@@ -0,0 +1,39 @@
+character-age-requirement = You must {$inverted ->
+    [true] not be
+    *[other] be
+} be within [color=yellow]{$min}[/color] and [color=yellow]{$max}[/color] years old
+character-species-requirement = You must {$inverted ->
+    [true] not be
+    *[other] be
+} a [color=green]{$species}[/color]
+character-trait-requirement = You must {$inverted ->
+    [true] not have
+    *[other] have
+} one of these traits: [color=lightblue]{$traits}[/color]
+character-backpack-type-requirement = You must {$inverted ->
+    [true] not use
+    *[other] use
+} a [color=lightblue]{$type}[/color] as your bag
+character-clothing-preference-requirement = You must {$inverted ->
+    [true] not wear
+    *[other] wear
+} a [color=lightblue]{$type}[/color]
+
+character-job-requirement = You must {$inverted ->
+    [true] not be
+    *[other] be
+} one of these jobs: {$jobs}
+character-department-requirement = You must {$inverted ->
+    [true] not be
+    *[other] be
+} in one of these departments: {$departments}
+
+character-timer-department-insufficient = You require [color=yellow]{TOSTRING($time, "0")}[/color] more minutes of [color={$departmentColor}]{$department}[/color] department playtime
+character-timer-department-too-high = You require [color=yellow]{TOSTRING($time, "0")}[/color] fewer minutes in [color={$departmentColor}]{$department}[/color] department
+character-timer-overall-insufficient = You require [color=yellow]{TOSTRING($time, "0")}[/color] more minutes of playtime
+character-timer-overall-too-high = You require [color=yellow]{TOSTRING($time, "0")}[/color] fewer minutes of playtime
+character-timer-role-insufficient = You require [color=yellow]{TOSTRING($time, "0")}[/color] more minutes with [color={$departmentColor}]{$job}[/color]
+character-timer-role-too-high = You require[color=yellow] {TOSTRING($time, "0")}[/color] fewer minutes with [color={$departmentColor}]{$job}[/color]
+
+character-trait-group-exclusion-requirement = You cannot have one of the following traits if you select this: {$traits}
+character-loadout-group-exclusion-requirement = You cannot have one of the following loadouts if you select this: {$loadouts}
diff --git a/Resources/Locale/en-US/deltav/traits/traits.ftl b/Resources/Locale/en-US/deltav/traits/traits.ftl
index e00cec4707..914a5c9f1b 100644
--- a/Resources/Locale/en-US/deltav/traits/traits.ftl
+++ b/Resources/Locale/en-US/deltav/traits/traits.ftl
@@ -1,13 +1,13 @@
-trait-scottish-accent-name = Scottish Accent
-trait-scottish-accent-desc = Fer tha folk who come frae Hielan clan.
+trait-name-ScottishAccent = Scottish Accent
+trait-description-ScottishAccent = Fer tha folk who come frae Hielan clan.
 
-trait-ultravision-name = Ultraviolet Vision
-trait-ultravision-desc = Whether through custom bionic eyes, random mutation,
+trait-name-UltraVision = Ultraviolet Vision
+trait-description-UltraVision = Whether through custom bionic eyes, random mutation,
                          or being a Harpy, you perceive the world with ultraviolet light.
 
-trait-deuteranopia-name = Deuteranopia
-trait-deuteranopia-desc = Whether through custom bionic eyes, random mutation,
+trait-name-DogVision = Deuteranopia
+trait-description-DogVision = Whether through custom bionic eyes, random mutation,
                           or being a Vulpkanin, you have red–green colour blindness.
 
-trait-uncloneable-name = Uncloneable
-trait-uncloneable-desc = Cannot be cloned
+trait-name-Uncloneable = Uncloneable
+trait-description-Uncloneable = Cannot be cloned
diff --git a/Resources/Locale/en-US/implant/implant.ftl b/Resources/Locale/en-US/implant/implant.ftl
index 22db4460af..2f6ab9e4e2 100644
--- a/Resources/Locale/en-US/implant/implant.ftl
+++ b/Resources/Locale/en-US/implant/implant.ftl
@@ -4,6 +4,7 @@ implanter-component-implanting-target = {$user} is trying to implant you with so
 implanter-component-implant-failed = The {$implant} cannot be given to {$target}!
 implanter-draw-failed-permanent = The {$implant} in {$target} is fused with them and cannot be removed!
 implanter-draw-failed = You tried to remove an implant but found nothing.
+implanter-component-implant-already = {$target} already has the {$implant}!
 
 ## UI
 implanter-draw-text = Draw
diff --git a/Resources/Locale/en-US/loadouts/categories.ftl b/Resources/Locale/en-US/loadouts/categories.ftl
index 207b72d3ad..11dd4dc6f7 100644
--- a/Resources/Locale/en-US/loadouts/categories.ftl
+++ b/Resources/Locale/en-US/loadouts/categories.ftl
@@ -1,5 +1,5 @@
-# Alphabetically ordered
-loadout-category-Accessories = Accessories
+# Alphabetically ordered, except for Uncategorized since it is always first
+
 loadout-category-Eyes = Eyes
 loadout-category-Hands = Hands
 loadout-category-Head = Head
diff --git a/Resources/Locale/en-US/loadouts/loadout-requirements.ftl b/Resources/Locale/en-US/loadouts/loadout-requirements.ftl
deleted file mode 100644
index d72557f1e8..0000000000
--- a/Resources/Locale/en-US/loadouts/loadout-requirements.ftl
+++ /dev/null
@@ -1,13 +0,0 @@
-loadout-age-requirement = You must be within {$min} and {$max} years old
-loadout-species-requirement = You must be one of these species: {$species}
-loadout-trait-requirement = You must have the trait {$trait}
-loadout-backpack-type-requirement = You must use a {$type} as your bag
-loadout-clothing-preference-requirement = You must wear a {$type}
-
-loadout-job-requirement = You must be one of these jobs: {$job}
-loadout-timer-department-insufficient = You require [color=yellow]{TOSTRING($time, "0")}[/color] more minutes of [color={$departmentColor}]{$department}[/color] department playtime
-loadout-timer-department-too-high = You require [color=yellow]{TOSTRING($time, "0")}[/color] fewer minutes in [color={$departmentColor}]{$department}[/color] department
-loadout-timer-overall-insufficient = You require [color=yellow]{TOSTRING($time, "0")}[/color] more minutes of playtime
-loadout-timer-overall-too-high = You require [color=yellow]{TOSTRING($time, "0")}[/color] fewer minutes of playtime
-loadout-timer-role-insufficient = You require [color=yellow]{TOSTRING($time, "0")}[/color] more minutes with [color={$departmentColor}]{$job}[/color]
-loadout-timer-role-too-high = You require[color=yellow] {TOSTRING($time, "0")}[/color] fewer minutes with [color={$departmentColor}]{$job}[/color]
diff --git a/Resources/Locale/en-US/nyanotrasen/abilities/psionic.ftl b/Resources/Locale/en-US/nyanotrasen/abilities/psionic.ftl
index d46a05e9c9..02800953b1 100644
--- a/Resources/Locale/en-US/nyanotrasen/abilities/psionic.ftl
+++ b/Resources/Locale/en-US/nyanotrasen/abilities/psionic.ftl
@@ -70,7 +70,3 @@ action-description-psychokinesis = Bend the fabric of space to instantly move ac
 
 action-name-rf-sensitivity = Toggle RF Sensitivity
 action-desc-rf-sensitivity = Toggle your ability to interpret radio waves on and off.
-
-trait-latent-psychic-desc = Your mind and soul are open to the noosphere, allowing for a limited use of Telepathy.
-                            Thus, you are eligible for potentially receiving psychic powers.
-                            It is possible that you may be hunted by otherworldly forces, so consider keeping your powers a secret.
diff --git a/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl b/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
index cf0957b894..f0ea0a4a72 100644
--- a/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
+++ b/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
@@ -11,9 +11,9 @@ humanoid-profile-editor-sex-female-text = Female
 humanoid-profile-editor-sex-unsexed-text = None
 humanoid-profile-editor-age-label = Age:
 humanoid-profile-editor-skin-color-label = Skin color:
-# Parkstation-HeightSlider
-humanoid-profile-editor-height-label = Height: {$height}x
-humanoid-profile-editor-width-label = Width: {$width}x
+humanoid-profile-editor-height-label = Height: {$height}cm
+humanoid-profile-editor-width-label = Width: {$width}cm
+humanoid-profile-editor-weight-label = Weight: {$weight}kg
 humanoid-profile-editor-species-label = Species:
 humanoid-profile-editor-pronouns-label = Pronouns:
 humanoid-profile-editor-pronouns-male-text = He / Him
@@ -47,20 +47,40 @@ humanoid-profile-editor-department-jobs-label = {$departmentName} jobs
 humanoid-profile-editor-antags-tab = Antags
 humanoid-profile-editor-antag-preference-yes-button = Yes
 humanoid-profile-editor-antag-preference-no-button = No
+
 humanoid-profile-editor-traits-tab = Traits
+humanoid-profile-editor-traits-header = You have {$points ->
+    [1] 1 point
+    *[other] {$points} points
+} and {$maxTraits ->
+    [2147483648] {$traits ->
+        [1] {$traits} trait
+        *[other] {$traits} traits
+    }
+    *[other] {$traits}/{$maxTraits} traits
+}
+humanoid-profile-editor-traits-show-unusable-button = Show Unusable
+humanoid-profile-editor-traits-show-unusable-button-tooltip =
+    When enabled, traits that your current character setup cannot use will be shown highlighted in red.
+    You will still not be able to use the invalid traits unless your character setup changes to fit the requirements.
+    This is most likely useful only if there's a bug hiding traits you actually can use or if you want to see other species' traits or something.
+humanoid-profile-editor-traits-no-traits = No traits found
+
 humanoid-profile-editor-job-priority-high-button = High
 humanoid-profile-editor-job-priority-medium-button = Medium
 humanoid-profile-editor-job-priority-low-button = Low
 humanoid-profile-editor-job-priority-never-button = Never
+
 humanoid-profile-editor-naming-rules-warning = Warning: Offensive or LRP IC names and descriptions will lead to admin intervention on this server. Read our \[Rules\] for more.
+
 humanoid-profile-editor-loadouts-tab = Loadout
-humanoid-profile-editor-loadouts-uncategorized-tab = Uncategorized
-humanoid-profile-editor-loadouts-no-loadouts = No loadouts found
 humanoid-profile-editor-loadouts-points-label = You have {$points}/{$max} points
 humanoid-profile-editor-loadouts-show-unusable-button = Show Unusable
 humanoid-profile-editor-loadouts-show-unusable-button-tooltip =
     When enabled, loadouts that your current character setup cannot use will be shown highlighted in red.
     You will still not be able to use the invalid loadouts unless your character setup changes to fit the requirements.
-    This may be useful if you like switching between multiple jobs and don't want to have to reselect your loadout every time.
+    This may be useful if you like switching between multiple jobs and don't want to have to reselect your loadout every
+humanoid-profile-editor-loadouts-no-loadouts = No loadouts foundtime.
+
 humanoid-profile-editor-markings-tab = Markings
 humanoid-profile-editor-flavortext-tab = Description
diff --git a/Resources/Locale/en-US/simplestation14/Traits/disabilities.ftl b/Resources/Locale/en-US/simplestation14/Traits/disabilities.ftl
index 3d8af06139..8360aaeb9d 100644
--- a/Resources/Locale/en-US/simplestation14/Traits/disabilities.ftl
+++ b/Resources/Locale/en-US/simplestation14/Traits/disabilities.ftl
@@ -1,3 +1,2 @@
-trait-nearsighted-name = Nearsighted
-trait-nearsighted-desc = You require glasses to see properly.
-trait-nearsighted-examined = [color=lightblue]{CAPITALIZE(POSS-ADJ($target))} eyes are pretty unfocused. It doesn't seem like {SUBJECT($target)} can see things that well.[/color]
+trait-name-Nearsighted = Nearsighted
+trait-description-Nearsighted = You require glasses to see properly.
diff --git a/Resources/Locale/en-US/traits/categories.ftl b/Resources/Locale/en-US/traits/categories.ftl
new file mode 100644
index 0000000000..153f8d0170
--- /dev/null
+++ b/Resources/Locale/en-US/traits/categories.ftl
@@ -0,0 +1,9 @@
+# Alphabetically ordered, except for Uncategorized since it is always first
+
+trait-category-Uncategorized = Uncategorized
+trait-category-Auditory = Auditory
+trait-category-Mental = Mental
+trait-category-Physical = Physical
+trait-category-Speech = Speech
+trait-category-Visual = Visual
+trait-category-Psionic = Psionic
diff --git a/Resources/Locale/en-US/traits/traits.ftl b/Resources/Locale/en-US/traits/traits.ftl
index 7a3564edf6..bfda7e48be 100644
--- a/Resources/Locale/en-US/traits/traits.ftl
+++ b/Resources/Locale/en-US/traits/traits.ftl
@@ -1,34 +1,38 @@
-trait-blindness-name = Blindness
-trait-blindness-desc = You are legally blind, and can't see clearly past a few meters in front of you.
+trait-name-Blindness = Blindness
+trait-description-Blindness = You are legally blind, and can't see clearly past a few meters in front of you.
+trait-examined-Blindness = [color=lightblue]{CAPITALIZE(POSS-ADJ($target))} eyes are glassy and unfocused. It doesn't seem like {SUBJECT($target)} can see you well, if at all.[/color]
 
-trait-narcolepsy-name = Narcolepsy
-trait-narcolepsy-desc = You fall asleep randomly
+trait-name-Narcolepsy = Narcolepsy
+trait-description-Narcolepsy = You fall asleep randomly
 
-trait-pacifist-name = Pacifist
-trait-pacifist-desc = You cannot attack or hurt any living beings.
+trait-name-Pacifist = Pacifist
+trait-description-Pacifist = You cannot attack or hurt any living beings.
 
-permanent-blindness-trait-examined = [color=lightblue]{CAPITALIZE(POSS-ADJ($target))} eyes are glassy and unfocused. It doesn't seem like {SUBJECT($target)} can see you well, if at all.[/color]
+trait-name-LightweightDrunk = Lightweight Drunk
+trait-description-LightweightDrunk = Alcohol has a stronger effect on you
 
-trait-lightweight-name = Lightweight Drunk
-trait-lightweight-desc = Alcohol has a stronger effect on you
+trait-name-Muted = Muted
+trait-description-Muted = You can't speak
 
-trait-muted-name = Muted
-trait-muted-desc = You can't speak
+trait-name-Paracusia = Paracusia
+trait-description-Paracusia = You hear sounds that aren't really there
 
-trait-paracusia-name = Paracusia
-trait-paracusia-desc = You hear sounds that aren't really there
+trait-name-PirateAccent = Pirate Accent
+trait-description-PirateAccent = You can't stop speaking like a pirate!
 
-trait-pirate-accent-name = Pirate Accent
-trait-pirate-accent-desc = You can't stop speaking like a pirate!
+trait-name-Accentless = Accentless
+trait-description-Accentless = You don't have the accent that your species would usually have
 
-trait-accentless-name = Accentless
-trait-accentless-desc = You don't have the accent that your species would usually have
+trait-name-FrontalLisp = Frontal Lisp
+trait-description-FrontalLisp = You thpeak with a lithp
 
-trait-frontal-lisp-name = Frontal Lisp
-trait-frontal-lisp-desc = You thpeak with a lithp
+trait-name-SocialAnxiety = Social Anxiety
+trait-description-SocialAnxiety = You are anxious when you speak and stutter.
 
-trait-socialanxiety-name = Social Anxiety
-trait-socialanxiety-desc = You are anxious when you speak and stutter.
+trait-name-Snoring = Snoring
+trait-description-Snoring = You will snore while sleeping.
 
-trait-snoring-name = Snoring
-trait-snoring-desc = You will snore while sleeping.
+trait-name-LatentPsychic = Latent Psychic
+trait-description-LatentPsychic = Your mind and soul are open to the noosphere, allowing for a limited use of Telepathy.
+                                  Thus, you are eligible for potentially receiving psychic powers.
+                                  It is possible that you may be hunted by otherworldly forces, so consider keeping your powers a secret.
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml
index 4338b8cf16..bd1ad12a32 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml
@@ -15,7 +15,7 @@
         - !type:SimpleColoring
           color: "#964b00"
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpy
 
 - type: marking
@@ -32,7 +32,7 @@
         - !type:SimpleColoring
           color: "#964b00"
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: classicharpy
 
 - type: marking
@@ -49,7 +49,7 @@
         - !type:SimpleColoring
           color: "#964b00"
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpyfolded
 
 - type: marking
@@ -66,7 +66,7 @@
         - !type:SimpleColoring
           color: "#964b00"
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_ears.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_ears.rsi
       state: harpy_ears_default
 
 - type: marking
@@ -83,7 +83,7 @@
         - !type:SimpleColoring
           color: "#964b00"
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_tails.rsi
       state: phoenix_tail
 
 - type: marking
@@ -99,7 +99,7 @@
       fallbackTypes:
         - !type:SimpleColoring
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_tails.rsi
       state: rooster_tail
 
 
@@ -116,7 +116,7 @@
       fallbackTypes:
         - !type:SimpleColoring
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_tailsx72.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_tails36x36.rsi
       state: finch_tail
 
 - type: marking
@@ -132,9 +132,9 @@
       fallbackTypes:
         - !type:SimpleColoring
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_tailsx96.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_tails48x48.rsi
       state: peacock_tail_feathers
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_tailsx96.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_tails48x48.rsi
       state: peacock_tail_eyes
 
 - type: marking
@@ -143,9 +143,9 @@
   markingCategory: Arms
   speciesRestriction: [Harpy]
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpy2tone1
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpy2tone2
 
 - type: marking
@@ -154,11 +154,11 @@
   markingCategory: Arms
   speciesRestriction: [Harpy]
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpy3tone1
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpy3tone2
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpy3tone3
 
 - type: marking
@@ -167,9 +167,9 @@
   markingCategory: Arms
   speciesRestriction: [Harpy]
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpyspeckled1
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpyspeckled2
 
 - type: marking
@@ -178,9 +178,9 @@
   markingCategory: Arms
   speciesRestriction: [Harpy]
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpyundertone1
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpyundertone2
 
 - type: marking
@@ -189,9 +189,9 @@
   markingCategory: Arms
   speciesRestriction: [Harpy]
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpywingtip1
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpywingtip2
 
 - type: marking
@@ -208,9 +208,9 @@
         - !type:SimpleColoring
           color: "#964b00"
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_chest.rsi
       state: upper
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_chest.rsi
       state: lower
 
 - type: marking
@@ -227,7 +227,7 @@
         - !type:SimpleColoring
           color: "#964b00"
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_legs.rsi
       state: thighs
 
 - type: marking
@@ -241,7 +241,7 @@
         - !type:SimpleColoring
           color: "#964b00"
   sprites:
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_legs.rsi
       state: feet
-    - sprite: DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi
+    - sprite: Mobs/Customization/Harpy/harpy_legs.rsi
       state: talons
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml
index 748bb56dbd..36c539bcb9 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml
@@ -128,6 +128,12 @@
     templateId: digitigrade
   - type: HarpyVisuals
   - type: UltraVision
+  - type: Tag
+    tags:
+    - CanPilot
+    - FootstepSound
+    - DoorBumpOpener
+    - ShoesRequiredStepTriggerImmune
   - type: LanguageSpeaker
     speaks:
     - GalacticCommon
@@ -135,12 +141,6 @@
     understands:
     - GalacticCommon
     - SolCommon
-  - type: Tag
-    tags:
-    - CanPilot
-    - FootstepSound
-    - DoorBumpOpener
-    - ShoesRequiredStepTriggerImmune
 
 - type: entity
   save: false
@@ -154,6 +154,7 @@
     species: Harpy
   - type: Inventory
     speciesId: harpy
+    templateId: digitigrade
   - type: Sprite
     scale: 0.9, 0.9
     layers:
@@ -174,7 +175,6 @@
       - map: ["enum.HumanoidVisualLayers.RHand"]
       - map: [ "id" ]
       - map: [ "gloves" ]
-      - map: [ "shoes" ]
       - map: [ "ears" ]
       - map: [ "outerClothing" ]
       - map: [ "eyes" ]
diff --git a/Resources/Prototypes/DeltaV/Traits/altvision.yml b/Resources/Prototypes/DeltaV/Traits/altvision.yml
index c361d1b51d..d1980bc23a 100644
--- a/Resources/Prototypes/DeltaV/Traits/altvision.yml
+++ b/Resources/Prototypes/DeltaV/Traits/altvision.yml
@@ -1,13 +1,13 @@
 - type: trait
   id: UltraVision
-  name: trait-ultravision-name
-  description: trait-ultravision-desc
+  category: Visual
+  points: -1
   components:
     - type: UltraVision
 
 - type: trait
   id: DogVision
-  name: trait-deuteranopia-name
-  description: trait-deuteranopia-desc
+  category: Visual
+  points: -1
   components:
     - type: DogVision
diff --git a/Resources/Prototypes/DeltaV/Traits/neutral.yml b/Resources/Prototypes/DeltaV/Traits/neutral.yml
index 79a6771a36..6168d7045a 100644
--- a/Resources/Prototypes/DeltaV/Traits/neutral.yml
+++ b/Resources/Prototypes/DeltaV/Traits/neutral.yml
@@ -1,7 +1,6 @@
 - type: trait
   id: ScottishAccent
-  name: trait-scottish-accent-name
-  description: trait-scottish-accent-desc
-  traitGear: BagpipeInstrument
+  category: Speech
+  points: 0
   components:
-    - type: ScottishAccent
\ No newline at end of file
+    - type: ScottishAccent
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml
index 3cf2e77e8b..2c190c270e 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml
@@ -352,10 +352,6 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/milk.rsi
-  - type: SolutionContainerManager
-    solutions:
-      drink:
-        maxVol: 100
 
 - type: entity
   name: soy milk carton
diff --git a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
index 5f970da184..32269d3888 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
@@ -52,6 +52,7 @@
       path: /Audio/Items/Handcuffs/rope_breakout.ogg
     startBreakoutSound:
       path: /Audio/Items/Handcuffs/rope_takeoff.ogg
+    uncuffMassModifier: 1
   - type: Construction
     graph: makeshifthandcuffs
     node: cuffscable
@@ -93,6 +94,7 @@
       path: /Audio/Items/Handcuffs/rope_breakout.ogg
     startBreakoutSound:
       path: /Audio/Items/Handcuffs/rope_takeoff.ogg
+    uncuffMassModifier: 1
   - type: Sprite
     sprite: Objects/Misc/zipties.rsi
     state: cuff
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml
index e188ee8c65..3bef413dff 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml
@@ -11,10 +11,10 @@
         shape:
           !type:PhysShapeAabb
           bounds: "-0.10,-0.05,0.10,0.05"
-        density: 20
+        density: 0.5
         mask:
           - ItemMask
-        restitution: 0.3  # fite me
+        restitution: 0.7  # Small and bouncy
         friction: 0.2
   - type: Tag
     tags:
@@ -23,6 +23,11 @@
     size: Tiny
   - type: SpaceGarbage
   - type: EmitSoundOnLand
+    sound:
+      path: /Audio/Weapons/Guns/Casings/casing_fall_1.ogg
+      params:
+        volume: -1
+  - type: EmitSoundOnCollide
     sound:
       path: /Audio/Weapons/Guns/Casings/casing_fall_2.ogg
       params:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml
index 1cabf2c583..93621bc3a2 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml
@@ -22,7 +22,7 @@
     - SemiAuto
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/kinetic_accel.ogg
-    reliability: 1
+    fireOnDropChance: 1
   - type: AmmoCounter
   - type: Appearance
   - type: GenericVisualizer
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
index 52235030d8..bf0c51849a 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -18,7 +18,7 @@
     selectedMode: SemiAuto
     availableModes:
     - SemiAuto
-    reliability: 0.15
+    fireOnDropChance: 0.15
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/laser.ogg
   - type: Battery
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
index 21f63f4761..410664e46e 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
@@ -107,7 +107,7 @@
       - FullAuto
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/pistol.ogg
-    reliability: 0.3
+    fireOnDropChance: 0.3
 
 - type: entity
   name: cobra
@@ -134,7 +134,7 @@
         volume: -14
     availableModes:
     - SemiAuto
-    reliability: 0.1
+    fireOnDropChance: 0.1
   - type: ItemSlots
     slots:
       gun_magazine:
@@ -179,7 +179,7 @@
     - SemiAuto
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/mk58.ogg
-    reliability: 0.5
+    fireOnDropChance: 0.5
 
 - type: entity
   id: WeaponPistolMk58Nonlethal
@@ -230,7 +230,7 @@
     - SemiAuto
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/mk58.ogg
-    reliability: 0.6
+    fireOnDropChance: 0.6
   - type: ItemSlots
     slots:
       gun_magazine:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
index a55c5ba835..c5237cdad9 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
@@ -29,7 +29,7 @@
     - SemiAuto
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/revolver.ogg
-    reliability: 0.5
+    fireOnDropChance: 0.5
   - type: UseDelay
     delay: 0.66
   - type: ContainerContainer
@@ -128,7 +128,7 @@
       path: /Audio/Weapons/Guns/Gunshots/revolver.ogg
       params:
         volume: 2.25
-    reliability: 0.3
+    fireOnDropChance: 0.3
 
 - type: entity
   name: Python
@@ -157,7 +157,7 @@
     sprite: Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi
   - type: Gun
     fireRate: 1
-    reliability: 1
+    fireOnDropChance: 1
   - type: ContainerContainer
     containers:
       revolver-ammo: !type:Container
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
index e98a4102d7..c55b2b6b09 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@@ -67,7 +67,7 @@
     fireRate: 5
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/rifle2.ogg
-    reliability: 1
+    fireOnDropChance: 0.5
   - type: ChamberMagazineAmmoProvider
     soundRack:
       path: /Audio/Weapons/Guns/Cock/ltrifle_cock.ogg
@@ -160,7 +160,7 @@
   - type: Gun
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg
-    reliability: 0.2
+    fireOnDropChance: 0.2
   - type: ItemSlots
     slots:
       gun_magazine:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
index 8cc3e01c3d..2dfc833bad 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -72,7 +72,7 @@
     fireRate: 10
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/atreides.ogg
-    reliability: 0.3
+    fireOnDropChance: 0.3
   - type: MagazineVisuals
     magState: mag
     steps: 1
@@ -97,7 +97,7 @@
   - type: Gun
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/c-20r.ogg
-    reliability: 0.3
+    fireOnDropChance: 0.3
   - type: ChamberMagazineAmmoProvider
     autoEject: true
   - type: MagazineVisuals
@@ -128,7 +128,7 @@
         path: /Audio/Weapons/Guns/Gunshots/atreides.ogg
       availableModes:
         - FullAuto
-      reliability: 0.2
+      fireOnDropChance: 0.2
     - type: ItemSlots
       slots:
         gun_magazine:
@@ -176,7 +176,7 @@
       path: /Audio/Weapons/Guns/Gunshots/atreides.ogg
     availableModes:
     - FullAuto
-    reliability: 0.1
+    fireOnDropChance: 0.1
   - type: ItemSlots
     slots:
       gun_magazine:
@@ -229,7 +229,7 @@
     selectedMode: FullAuto
     availableModes:
     - FullAuto
-    reliability: 0.1
+    fireOnDropChance: 0.1
   - type: ItemSlots
     slots:
       gun_magazine:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
index 7b354ce7bb..52b05b6d60 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
@@ -28,7 +28,7 @@
       path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg
     soundEmpty:
       path: /Audio/Weapons/Guns/Empty/empty.ogg
-    reliability: 0.2
+    fireOnDropChance: 0.2
   - type: BallisticAmmoProvider
     whitelist:
       tags:
@@ -76,7 +76,7 @@
       path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg
     soundEmpty:
       path: /Audio/Weapons/Guns/Empty/empty.ogg
-    reliability: 0.3
+    fireOnDropChance: 0.3
   - type: ItemSlots
     slots:
       gun_magazine:
@@ -117,7 +117,7 @@
     heldPrefix: db
   - type: Gun
     fireRate: 2
-    reliability: 0.5
+    fireOnDropChance: 0.5
   - type: BallisticAmmoProvider
     capacity: 2
   - type: Construction
@@ -193,7 +193,7 @@
     heldPrefix: sawn
   - type: Gun
     fireRate: 4
-    reliability: 0.5
+    fireOnDropChance: 0.5
   - type: BallisticAmmoProvider
     capacity: 2
   - type: Construction
@@ -230,7 +230,7 @@
     sprite: Objects/Weapons/Guns/Shotguns/hm_pistol.rsi
   - type: Gun
     fireRate: 4
-    reliability: 1
+    fireOnDropChance: 1
   - type: BallisticAmmoProvider
     capacity: 1
   - type: Construction
@@ -255,7 +255,7 @@
     sprite: Objects/Weapons/Guns/Shotguns/blunderbuss.rsi
   - type: Gun
     fireRate: 2
-    reliability: 1
+    fireOnDropChance: 1
   - type: BallisticAmmoProvider
     capacity: 1
   - type: StaticPrice
@@ -279,7 +279,7 @@
     heldPrefix: improvised
   - type: Gun
     fireRate: 4 #No reason to stifle the firerate since you have to manually reload every time anyways.
-    reliability: 1
+    fireOnDropChance: 1
   - type: BallisticAmmoProvider
     capacity: 1
     proto: null
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
index 32f4f8e930..adb8e323f4 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
@@ -53,7 +53,7 @@
     - SemiAuto
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/sniper.ogg
-    reliability: 1
+    fireOnDropChance: 1
 
 - type: entity
   name: Hristov
@@ -90,7 +90,7 @@
     selectedMode: SemiAuto
     availableModes:
     - SemiAuto
-    reliability: 1
+    fireOnDropChance: 1
   - type: UseDelayOnShoot
   - type: UseDelay
     delay: 8 #it's a musket
@@ -120,7 +120,7 @@
   - type: Gun
     minAngle: 0
     maxAngle: 30 #miss him entirely because the barrel is smoothbore
-    reliability: 1
+    fireOnDropChance: 1
   - type: Item
     size: Small
     storedRotation: 90
diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
index e6561b2ba6..93bbaa55cf 100644
--- a/Resources/Prototypes/GameRules/events.yml
+++ b/Resources/Prototypes/GameRules/events.yml
@@ -434,9 +434,9 @@
   noSpawn: true
   components:
   - type: StationEvent
-    earliestStart: 60 # DeltaV - was 45
-    weight: 3 # DeltaV - was 5
-    minimumPlayers: 10
+    earliestStart: 60
+    weight: 3
+    minimumPlayers: 20
     reoccurrenceDelay: 30
     duration: 1
   - type: LoneOpsSpawnRule
diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/captain.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/captain.yml
index 05f51baf1c..d8849472ff 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Heads/captain.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Heads/captain.yml
@@ -4,7 +4,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Captain
   items:
@@ -16,7 +16,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Captain
   items:
@@ -28,7 +28,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Captain
   items:
@@ -40,7 +40,7 @@
   cost: 3
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Captain
   items:
@@ -52,7 +52,7 @@
   cost: 3
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Captain
   items:
@@ -63,7 +63,7 @@
   category: Jobs
   cost: 2
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Captain
   items:
@@ -74,7 +74,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Captain
   items:
@@ -85,7 +85,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Captain
   items:
@@ -96,7 +96,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Captain
   items:
@@ -107,7 +107,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Captain
   items:
@@ -118,7 +118,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Captain
   items:
@@ -130,7 +130,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Captain
   items:
@@ -141,7 +141,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Captain
   items:
diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/chiefEngineer.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/chiefEngineer.yml
index e184e0a60a..c490559112 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Heads/chiefEngineer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Heads/chiefEngineer.yml
@@ -4,7 +4,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - ChiefEngineer
   items:
@@ -16,7 +16,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - ChiefEngineer
   items:
@@ -27,7 +27,7 @@
   category: Jobs
   cost: 2
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - ChiefEngineer
   items:
@@ -39,7 +39,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - ChiefEngineer
   items:
diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/chiefMedicalOfficer.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/chiefMedicalOfficer.yml
index 32e1a6e43e..c75c871b01 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Heads/chiefMedicalOfficer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Heads/chiefMedicalOfficer.yml
@@ -4,7 +4,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - ChiefMedicalOfficer
   items:
@@ -16,7 +16,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - ChiefMedicalOfficer
   items:
@@ -27,7 +27,7 @@
   category: Jobs
   cost: 2
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - ChiefMedicalOfficer
   items:
@@ -38,7 +38,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - ChiefMedicalOfficer
   items:
@@ -49,7 +49,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - ChiefMedicalOfficer
   items:
@@ -61,7 +61,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - ChiefMedicalOfficer
   items:
diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/headOfPersonnel.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/headOfPersonnel.yml
index f4a583e39a..3d3799c0ad 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Heads/headOfPersonnel.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Heads/headOfPersonnel.yml
@@ -4,7 +4,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfPersonnel
   items:
@@ -16,7 +16,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfPersonnel
   items:
@@ -28,7 +28,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfPersonnel
   items:
@@ -40,7 +40,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfPersonnel
   items:
@@ -52,7 +52,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfPersonnel
   items:
@@ -63,7 +63,7 @@
   category: Jobs
   cost: 2
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfPersonnel
   items:
@@ -74,7 +74,7 @@
   category: Jobs
   cost: 4
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfPersonnel
   items:
@@ -85,7 +85,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfPersonnel
   items:
@@ -97,7 +97,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfPersonnel
   items:
diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/headOfSecurity.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/headOfSecurity.yml
index 60c6bbdb00..4f0d785b14 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Heads/headOfSecurity.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Heads/headOfSecurity.yml
@@ -4,7 +4,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -16,7 +16,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -28,7 +28,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -40,7 +40,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -52,7 +52,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -64,7 +64,7 @@
   cost: 3
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -76,7 +76,7 @@
   cost: 3
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -88,7 +88,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -100,7 +100,7 @@
   cost: 3
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -112,7 +112,7 @@
   cost: 3
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -123,7 +123,7 @@
   category: Jobs
   cost: 2
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -134,7 +134,7 @@
   category: Jobs
   cost: 2
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -145,7 +145,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -156,7 +156,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -168,7 +168,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
   items:
diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/quarterMaster.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/quarterMaster.yml
index 802bc65de5..3359d8f5d7 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Heads/quarterMaster.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Heads/quarterMaster.yml
@@ -5,7 +5,7 @@
 #   cost: 2
 #   exclusive: true
 #   requirements:
-#     - !type:LoadoutJobRequirement
+#     - !type:CharacterJobRequirement
 #       jobs:
 #         - Quartermaster
 #   items:
@@ -17,7 +17,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Quartermaster
   items:
@@ -29,7 +29,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Quartermaster
   items:
@@ -41,7 +41,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Quartermaster
   items:
@@ -52,7 +52,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Quartermaster
   items:
@@ -64,7 +64,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Quartermaster
   items:
diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/researchDirector.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/researchDirector.yml
index cf24ffd852..87cb0db179 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Heads/researchDirector.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Heads/researchDirector.yml
@@ -4,7 +4,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - ResearchDirector
   items:
@@ -16,7 +16,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - ResearchDirector
   items:
@@ -27,7 +27,7 @@
   category: Jobs
   cost: 2
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - ResearchDirector
   items:
@@ -38,7 +38,7 @@
   category: Jobs
   cost: 2
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - ResearchDirector
   items:
@@ -50,7 +50,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - ResearchDirector
   items:
diff --git a/Resources/Prototypes/Loadouts/Jobs/cargo.yml b/Resources/Prototypes/Loadouts/Jobs/cargo.yml
index fe835d6823..8746386201 100644
--- a/Resources/Prototypes/Loadouts/Jobs/cargo.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/cargo.yml
@@ -4,10 +4,10 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - SalvageSpecialist
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobSalvageSpecialist
       min: 36000 # 10 hours
   items:
diff --git a/Resources/Prototypes/Loadouts/Jobs/engineering.yml b/Resources/Prototypes/Loadouts/Jobs/engineering.yml
index 820825e236..01b044299b 100644
--- a/Resources/Prototypes/Loadouts/Jobs/engineering.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/engineering.yml
@@ -4,7 +4,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - StationEngineer
   items:
@@ -16,7 +16,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - StationEngineer
   items:
@@ -28,16 +28,16 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - StationEngineer
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobAtmosphericTechnician
       min: 21600 # 6 hours
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobStationEngineer
       min: 21600 # 6 hours
-    - !type:LoadoutDepartmentTimeRequirement
+    - !type:CharacterDepartmentTimeRequirement
       department: Engineering
       min: 216000 # 60 hours
   items:
@@ -49,41 +49,28 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - StationEngineer
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobAtmosphericTechnician
       min: 21600 # 6 hours
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobStationEngineer
       min: 21600 # 6 hours
-    - !type:LoadoutDepartmentTimeRequirement
+    - !type:CharacterDepartmentTimeRequirement
       department: Engineering
       min: 216000 # 60 hours
   items:
     - ClothingUniformJumpsuitSeniorEngineer
 
-- type: loadout
-  id: LoadoutEngineeringChickenSuit # :)
-  category: Jobs
-  cost: 3
-  exclusive: true
-  requirements:
-    - !type:LoadoutJobRequirement
-      jobs:
-        - AtmosphericTechnician
-  items:
-    - ClothingOuterSuitChicken
-    - ClothingHeadHatChickenhead
-
 - type: loadout
   id: LoadoutEngineeringEyesMeson
   category: Jobs
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - StationEngineer
         - AtmosphericTechnician
@@ -96,7 +83,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - StationEngineer
         - AtmosphericTechnician
@@ -110,7 +97,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - StationEngineer
         - AtmosphericTechnician
@@ -123,7 +110,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - StationEngineer
         - AtmosphericTechnician
@@ -136,7 +123,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - StationEngineer
         - AtmosphericTechnician
@@ -149,7 +136,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - StationEngineer
         - AtmosphericTechnician
@@ -162,7 +149,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - StationEngineer
         - AtmosphericTechnician
diff --git a/Resources/Prototypes/Loadouts/Jobs/medical.yml b/Resources/Prototypes/Loadouts/Jobs/medical.yml
index 429732cf1e..6dcce11d09 100644
--- a/Resources/Prototypes/Loadouts/Jobs/medical.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/medical.yml
@@ -4,7 +4,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Paramedic
@@ -20,7 +20,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Chemist
@@ -33,7 +33,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - ChiefMedicalOfficer
@@ -47,7 +47,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Chemist
@@ -62,7 +62,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Chemist
@@ -77,7 +77,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Chemist
@@ -92,7 +92,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Chemist
@@ -107,7 +107,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Chemist
@@ -122,7 +122,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Chemist
@@ -131,28 +131,13 @@
   items:
     - UniformScrubsColorPink
 
-- type: loadout
-  id: LoadoutMedicalUniformScrubsRainbow
-  category: Jobs
-  cost: 2
-  exclusive: true
-  requirements:
-    - !type:LoadoutJobRequirement
-      jobs:
-        - MedicalDoctor
-        - Chemist
-        - Paramedic
-        - MedicalIntern
-  items:
-    - UniformScrubsColorRainbow
-
 - type: loadout
   id: LoadoutMedicalUniformScrubsCybersun
   category: Jobs
   cost: 3
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Chemist
@@ -166,7 +151,7 @@
   cost: 5
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Chemist
@@ -180,7 +165,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Chemist
   items:
@@ -191,7 +176,7 @@
   category: Jobs
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Chemist
   items:
@@ -203,7 +188,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Paramedic
   items:
@@ -215,7 +200,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Paramedic
   items:
@@ -227,19 +212,19 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Chemist
         - Paramedic
         - ChiefMedicalOfficer
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobChemist
       min: 21600 # 6 hours
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobMedicalDoctor
       min: 21600 # 6 hours
-    - !type:LoadoutDepartmentTimeRequirement
+    - !type:CharacterDepartmentTimeRequirement
       department: Medical
       min: 216000 # 60 hours
   items:
@@ -251,19 +236,19 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Chemist
         - Paramedic
         - ChiefMedicalOfficer
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobChemist
       min: 21600 # 6 hours
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobMedicalDoctor
       min: 21600 # 6 hours
-    - !type:LoadoutDepartmentTimeRequirement
+    - !type:CharacterDepartmentTimeRequirement
       department: Medical
       min: 216000 # 60 hours
   items:
@@ -275,7 +260,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
   items:
@@ -287,19 +272,19 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Chemist
         - Paramedic
         - ChiefMedicalOfficer
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobChemist
       min: 21600 # 6 hours
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobMedicalDoctor
       min: 21600 # 6 hours
-    - !type:LoadoutDepartmentTimeRequirement
+    - !type:CharacterDepartmentTimeRequirement
       department: Medical
       min: 216000 # 60 hours
   items:
@@ -311,7 +296,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Chemist
@@ -326,7 +311,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Chemist
@@ -341,7 +326,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Chemist
@@ -356,7 +341,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Chemist
@@ -371,7 +356,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Chemist
@@ -386,7 +371,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Chemist
@@ -395,28 +380,13 @@
   items:
     - ClothingHeadHatSurgcapPink
 
-- type: loadout
-  id: LoadoutMedicalHeadSurgcapRainbow
-  category: Jobs
-  cost: 2
-  exclusive: true
-  requirements:
-    - !type:LoadoutJobRequirement
-      jobs:
-        - MedicalDoctor
-        - Chemist
-        - Paramedic
-        - MedicalIntern
-  items:
-    - ClothingHeadHatSurgcapRainbow
-
 - type: loadout
   id: LoadoutMedicalHeadSurgcapWhite
   category: Jobs
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Chemist
@@ -431,7 +401,7 @@
   cost: 3
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Chemist
@@ -445,7 +415,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Paramedic
@@ -461,7 +431,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Paramedic
@@ -477,14 +447,15 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
         - Paramedic
         - ChiefMedicalOfficer
         - MedicalIntern
         - Brigmedic
-    - !type:LoadoutTraitRequirement
-      trait: Nearsighted
+    - !type:CharacterTraitRequirement
+      traits:
+        - Nearsighted
   items:
     - ClothingEyesPrescriptionMedHud
diff --git a/Resources/Prototypes/Loadouts/Jobs/science.yml b/Resources/Prototypes/Loadouts/Jobs/science.yml
index c4e1755f8b..b9c815a15b 100644
--- a/Resources/Prototypes/Loadouts/Jobs/science.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/science.yml
@@ -4,10 +4,10 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Scientist
-    - !type:LoadoutDepartmentTimeRequirement
+    - !type:CharacterDepartmentTimeRequirement
       department: Epistemics
       min: 216000 # 60 hours
   items:
@@ -19,10 +19,10 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Scientist
-    - !type:LoadoutDepartmentTimeRequirement
+    - !type:CharacterDepartmentTimeRequirement
       department: Epistemics
       min: 216000 # 60 hours
   items:
@@ -34,7 +34,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Scientist
         - ResearchAssistant
@@ -48,7 +48,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Scientist
         - ResearchAssistant
@@ -62,10 +62,10 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Scientist
-    - !type:LoadoutDepartmentTimeRequirement
+    - !type:CharacterDepartmentTimeRequirement
       department: Epistemics
       min: 216000 # 60 hours
   items:
@@ -77,7 +77,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Scientist
         - ResearchAssistant
@@ -91,7 +91,7 @@
   cost: 3
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Scientist
         - ResearchAssistant
@@ -105,10 +105,38 @@
   cost: 3
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Scientist
         - ResearchAssistant
         - ResearchDirector
   items:
     - ClothingEyesEyepatchHudDiag
+
+## Robes
+- type: loadout
+  id: LoadoutOuterRobeTechPriest
+  category: Outer
+  cost: 2
+  items:
+    - ClothingOuterRobeTechPriest
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Scientist
+        - ResearchAssistant
+        - ResearchDirector
+
+- type: loadout
+  id: LoadoutHeadHoodTechPriest
+  category: Head
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHeadTechPriest
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Scientist
+        - ResearchAssistant
+        - ResearchDirector
diff --git a/Resources/Prototypes/Loadouts/Jobs/security.yml b/Resources/Prototypes/Loadouts/Jobs/security.yml
index 67c75d1f74..e6a6693ec1 100644
--- a/Resources/Prototypes/Loadouts/Jobs/security.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/security.yml
@@ -5,7 +5,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - SecurityOfficer
         - SecurityCadet
@@ -19,7 +19,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - SecurityOfficer
         - SecurityCadet
@@ -33,7 +33,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - SecurityOfficer
         - SecurityCadet
@@ -47,7 +47,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - SecurityOfficer
         - SecurityCadet
@@ -61,19 +61,19 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - SecurityOfficer
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobWarden
       min: 21600 # 6 hours
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobDetective
       min: 7200 # 2 hours
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobSecurityOfficer
       min: 21600 # 6 hours
-    - !type:LoadoutDepartmentTimeRequirement
+    - !type:CharacterDepartmentTimeRequirement
       department: Security
       min: 216000 # 60 hours
   items:
@@ -85,19 +85,19 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - SecurityOfficer
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobWarden
       min: 21600 # 6 hours
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobDetective
       min: 7200 # 2 hours
-    - !type:LoadoutPlaytimeRequirement
+    - !type:CharacterPlaytimeRequirement
       tracker: JobSecurityOfficer
       min: 21600 # 6 hours
-    - !type:LoadoutDepartmentTimeRequirement
+    - !type:CharacterDepartmentTimeRequirement
       department: Security
       min: 216000 # 60 hours
   items:
@@ -109,7 +109,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Warden
   items:
@@ -121,7 +121,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Warden
   items:
@@ -133,7 +133,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Warden
   items:
@@ -145,7 +145,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Warden
   items:
@@ -157,7 +157,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -169,7 +169,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - HeadOfSecurity
   items:
@@ -181,7 +181,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Detective
         - SecurityOfficer
@@ -196,7 +196,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Detective
         - SecurityOfficer
@@ -211,7 +211,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Warden
         - HeadOfSecurity
@@ -224,7 +224,7 @@
   category: Jobs
   cost: 1
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Detective
         - SecurityOfficer
@@ -234,41 +234,6 @@
   items:
     - ClothingShoesBootsJack
 
-## Items
-- type: loadout
-  id: LoadoutItemsSpareHandgunMagazine
-  category: Jobs
-  cost: 7
-  requirements:
-    - !type:LoadoutJobRequirement
-      jobs:
-        - SecurityOfficer
-        - Warden
-        - HeadOfSecurity
-        - Brigmedic
-    - !type:LoadoutPlaytimeRequirement
-      tracker: JobSecurityOfficer
-      min: 21600 # 6 hours
-  items:
-    - MagazinePistol
-
-- type: loadout
-  id: LoadoutItemsSpareHandgunMagazineRubber
-  category: Jobs
-  cost: 6
-  requirements:
-    - !type:LoadoutJobRequirement
-      jobs:
-        - SecurityOfficer
-        - Warden
-        - HeadOfSecurity
-        - Brigmedic
-    - !type:LoadoutPlaytimeRequirement
-      tracker: JobSecurityOfficer
-      min: 7200 # 2 hours
-  items:
-    - MagazinePistolRubber
-
 ## Eyes
 - type: loadout
   id: LoadoutSecurityEyesHudSecurity
@@ -276,7 +241,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - SecurityOfficer
         - Warden
@@ -291,7 +256,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - SecurityOfficer
         - Warden
@@ -306,14 +271,15 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - SecurityOfficer
         - Warden
         - HeadOfSecurity
         - Brigmedic
-    - !type:LoadoutTraitRequirement
-      trait: Nearsighted
+    - !type:CharacterTraitRequirement
+      traits:
+        - Nearsighted
   items:
     - ClothingEyesPrescriptionHudSecurity
 
@@ -324,7 +290,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - SecurityOfficer
         - Warden
@@ -338,7 +304,7 @@
   category: Jobs
   cost: 3
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - SecurityOfficer
         - Warden
@@ -354,7 +320,7 @@
   cost: 1
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Detective
         - SecurityOfficer
@@ -365,22 +331,21 @@
     - ClothingBeltSecurityWebbingFilled
 
 ## Species
-- type: loadout
-  id: LoadoutSecurityEquipmentTruncheon
-  category: Jobs
-  cost: 8 ## TODO: Make this replace the secoff handgun, and thus also make it cheaper
-  requirements:
-    - !type:LoadoutJobRequirement
-      jobs:
-        - SecurityOfficer
-        - Warden
-        - HeadOfSecurity
-        - Brigmedic
-    - !type:LoadoutPlaytimeRequirement
-      tracker: JobSecurityOfficer
-      min: 36000 # 10 hours
-    - !type:LoadoutSpeciesRequirement
-      species:
-        - Oni
-  items:
-    - Truncheon
+#- type: loadout ##Uncomment this and reassess points when we can make it replace the secoff duty pistol
+#  id: LoadoutSecurityEquipmentTruncheon
+#  category: Jobs
+#  cost: 8 ## TODO: Make this replace the secoff handgun, and thus also make it cheaper
+#  requirements:
+#    - !type:CharacterJobRequirement
+#      jobs:
+#        - SecurityOfficer
+#        - Warden
+#        - HeadOfSecurity
+#        - Brigmedic
+#    - !type:CharacterPlaytimeRequirement
+#      tracker: JobSecurityOfficer
+#      min: 36000 # 10 hours
+#    - !type:CharacterSpeciesRequirement
+#      species: Oni
+#  items:
+#    - Truncheon
diff --git a/Resources/Prototypes/Loadouts/Jobs/service.yml b/Resources/Prototypes/Loadouts/Jobs/service.yml
index 1eecebec53..ed6107db9e 100644
--- a/Resources/Prototypes/Loadouts/Jobs/service.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/service.yml
@@ -5,7 +5,7 @@
   cost: 3
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Clown
   items:
@@ -19,7 +19,7 @@
   cost: 3
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Clown
   items:
@@ -34,7 +34,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Bartender
   items:
@@ -47,7 +47,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
      jobs:
         - Botanist
   items:
@@ -60,7 +60,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
      jobs:
         - Lawyer
   items:
@@ -72,7 +72,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Lawyer
   items:
@@ -84,7 +84,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Lawyer
   items:
@@ -96,7 +96,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Lawyer
   items:
@@ -108,7 +108,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Lawyer
   items:
@@ -120,7 +120,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Lawyer
   items:
@@ -132,7 +132,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Lawyer
   items:
@@ -144,7 +144,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Lawyer
   items:
@@ -156,7 +156,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Reporter
   items:
@@ -169,7 +169,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Reporter
   items:
@@ -181,7 +181,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Reporter
   items:
@@ -193,7 +193,7 @@
   category: Jobs
   cost: 8
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Musician
   items:
diff --git a/Resources/Prototypes/Loadouts/categories.yml b/Resources/Prototypes/Loadouts/categories.yml
index f1e8c34294..3edb3c6a4d 100644
--- a/Resources/Prototypes/Loadouts/categories.yml
+++ b/Resources/Prototypes/Loadouts/categories.yml
@@ -1,6 +1,4 @@
-# Alphabetically ordered
-- type: loadoutCategory
-  id: Accessories
+# Alphabetically ordered, except for Uncategorized since it is always first
 
 - type: loadoutCategory
   id: Eyes
@@ -17,9 +15,6 @@
 - type: loadoutCategory
   id: Jobs
 
-- type: loadoutCategory
-  id: Mask
-
 - type: loadoutCategory
   id: Neck
 
diff --git a/Resources/Prototypes/Loadouts/hands.yml b/Resources/Prototypes/Loadouts/hands.yml
index 782810f47e..3604678d38 100644
--- a/Resources/Prototypes/Loadouts/hands.yml
+++ b/Resources/Prototypes/Loadouts/hands.yml
@@ -84,11 +84,11 @@
   cost: 4
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Passenger
   items:
-    - ClothingHandsGlovesColorYellow
+    - ClothingHandsGlovesColorYellowBudget
 
 - type: loadout
   id: LoadoutHandsGlovesLeather
diff --git a/Resources/Prototypes/Loadouts/head.yml b/Resources/Prototypes/Loadouts/head.yml
index 7f63ccccf0..25cb4dadf1 100644
--- a/Resources/Prototypes/Loadouts/head.yml
+++ b/Resources/Prototypes/Loadouts/head.yml
@@ -271,20 +271,3 @@
   exclusive: true
   items:
     - ClothingHeadBandBrown
-
-## Hoods
-- type: loadout
-  id: LoadoutHeadHoodBrown
-  category: Head
-  cost: 1
-  exclusive: true
-  items:
-    - ClothingHeadHoodBrown
-
-- type: loadout
-  id: LoadoutHeadHoodTechPriest
-  category: Head
-  cost: 1
-  exclusive: true
-  items:
-    - ClothingHeadTechPriest
diff --git a/Resources/Prototypes/Loadouts/items.yml b/Resources/Prototypes/Loadouts/items.yml
index 752f9adf3f..072061d2e2 100644
--- a/Resources/Prototypes/Loadouts/items.yml
+++ b/Resources/Prototypes/Loadouts/items.yml
@@ -69,49 +69,6 @@
   items:
     - Matchbox
 
-## Plushies
-- type: loadout
-  id: LoadoutItemPlushieSharkBlue
-  category: Items
-  cost: 2
-  items:
-    - PlushieSharkBlue
-
-- type: loadout
-  id: LoadoutItemPlushieSharkPink
-  category: Items
-  cost: 2
-  items:
-    - PlushieSharkPink
-
-- type: loadout
-  id: LoadoutItemPlushieSharkGrey
-  category: Items
-  cost: 2
-  items:
-    - PlushieSharkGrey
-
-- type: loadout
-  id: LoadoutItemPlushieCarp
-  category: Items
-  cost: 2
-  items:
-    - PlushieCarp
-
-- type: loadout
-  id: LoadoutItemPlushieLizard
-  category: Items
-  cost: 2
-  items:
-    - PlushieLizard
-
-- type: loadout
-  id: LoadoutItemPlushieMoth
-  category: Items
-  cost: 2
-  items:
-    - PlushieMoth
-
 ## Instruments
 - type: loadout
   id: LoadoutItemMicrophoneInstrument
@@ -222,7 +179,7 @@
 - type: loadout
   id: LoadoutItemsEmergencyCrowbar
   category: Items
-  cost: 1
+  cost: 3
   items:
     - CrowbarRed
 
diff --git a/Resources/Prototypes/Loadouts/neck.yml b/Resources/Prototypes/Loadouts/neck.yml
index c6207dfdde..eb933de29e 100644
--- a/Resources/Prototypes/Loadouts/neck.yml
+++ b/Resources/Prototypes/Loadouts/neck.yml
@@ -102,75 +102,3 @@
   exclusive: true
   items:
     - ClothingNeckTransPin
-
-- type: loadout
-  id: LoadoutItemsPrideCloakTrans
-  category: Neck
-  cost: 2
-  exclusive: true
-  items:
-    - ClothingNeckCloakTrans
-
-- type: loadout
-  id: LoadoutItemsPrideCloakAro
-  category: Neck
-  cost: 2
-  exclusive: true
-  items:
-    - ClothingNeckCloakAro
-
-- type: loadout
-  id: LoadoutItemsPrideCloakAce
-  category: Neck
-  cost: 2
-  exclusive: true
-  items:
-    - ClothingNeckCloakAce
-
-- type: loadout
-  id: LoadoutItemsPrideCloakBi
-  category: Neck
-  cost: 2
-  exclusive: true
-  items:
-    - ClothingNeckCloakBi
-
-- type: loadout
-  id: LoadoutItemsPrideCloakIntersex
-  category: Neck
-  cost: 2
-  exclusive: true
-  items:
-    - ClothingNeckCloakIntersex
-
-- type: loadout
-  id: LoadoutItemsPrideCloakEnby
-  category: Neck
-  cost: 2
-  exclusive: true
-  items:
-    - ClothingNeckCloakEnby
-
-- type: loadout
-  id: LoadoutItemsPrideCloakPan
-  category: Neck
-  cost: 2
-  exclusive: true
-  items:
-    - ClothingNeckCloakPan
-
-- type: loadout
-  id: LoadoutItemsPrideCloakGay
-  category: Neck
-  cost: 2
-  exclusive: true
-  items:
-    - ClothingNeckCloakGay
-
-- type: loadout
-  id: LoadoutItemsPrideCloakLesbian
-  category: Neck
-  cost: 2
-  exclusive: true
-  items:
-    - ClothingNeckCloakLesbian
diff --git a/Resources/Prototypes/Loadouts/outerClothing.yml b/Resources/Prototypes/Loadouts/outerClothing.yml
index 83d1fb30d4..a5932214ce 100644
--- a/Resources/Prototypes/Loadouts/outerClothing.yml
+++ b/Resources/Prototypes/Loadouts/outerClothing.yml
@@ -1,10 +1,3 @@
-- type: loadout
-  id: LoadoutOuterGhostSheet
-  category: Outer
-  cost: 2
-  items:
-    - ClothingOuterGhostSheet
-
 - type: loadout
   id: LoadoutOuterCoatBomberjacket
   category: Outer
@@ -61,21 +54,6 @@
   items:
     - ClothingOuterVestValet
 
-## Robes
-- type: loadout
-  id: LoadoutOuterRobeBrown
-  category: Outer
-  cost: 2
-  items:
-    - ClothingOuterRobeBrown
-
-- type: loadout
-  id: LoadoutOuterRobeTechPriest
-  category: Outer
-  cost: 2
-  items:
-    - ClothingOuterRobeTechPriest
-
 ## Letterman Jackets
 - type: loadout
   id: LoadoutOuterCoatLettermanBlue
diff --git a/Resources/Prototypes/Loadouts/shoes.yml b/Resources/Prototypes/Loadouts/shoes.yml
index 240568eff3..3c2e21e631 100644
--- a/Resources/Prototypes/Loadouts/shoes.yml
+++ b/Resources/Prototypes/Loadouts/shoes.yml
@@ -140,10 +140,14 @@
 - type: loadout
   id: LoadoutShoesSlippersDuck
   category: Shoes
-  cost: 1
+  cost: 2
   exclusive: true
   items:
     - ClothingShoeSlippersDuck
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Clown
 
 - type: loadout
   id: LoadoutShoesLeather
diff --git a/Resources/Prototypes/Loadouts/species.yml b/Resources/Prototypes/Loadouts/species.yml
index e31daca194..1d2fb58dc0 100644
--- a/Resources/Prototypes/Loadouts/species.yml
+++ b/Resources/Prototypes/Loadouts/species.yml
@@ -3,10 +3,10 @@
   category: Species
   cost: 0
   requirements:
-    - !type:LoadoutSpeciesRequirement
-      species:
-        - SlimePerson
-        - Vox
+    - !type:CharacterSpeciesRequirement
+      species: SlimePerson
+    - !type:CharacterSpeciesRequirement
+      species: Vox
   items:
     - EmergencyNitrogenTankFilled
 
@@ -15,10 +15,10 @@
   category: Species
   cost: 1
   requirements:
-    - !type:LoadoutSpeciesRequirement
-      species:
-        - SlimePerson
-        - Vox
+    - !type:CharacterSpeciesRequirement
+      species: SlimePerson
+    - !type:CharacterSpeciesRequirement
+      species: Vox
   items:
     - ExtendedEmergencyNitrogenTankFilled
 
@@ -27,9 +27,9 @@
   category: Species
   cost: 3
   requirements:
-    - !type:LoadoutSpeciesRequirement
-      species:
-        - SlimePerson
-        - Vox
+    - !type:CharacterSpeciesRequirement
+      species: SlimePerson
+    - !type:CharacterSpeciesRequirement
+      species: Vox
   items:
     - DoubleEmergencyNitrogenTankFilled
diff --git a/Resources/Prototypes/Loadouts/uniform.yml b/Resources/Prototypes/Loadouts/uniform.yml
index 26e50802fe..be293a0e38 100644
--- a/Resources/Prototypes/Loadouts/uniform.yml
+++ b/Resources/Prototypes/Loadouts/uniform.yml
@@ -4,7 +4,7 @@
   cost: 2
   exclusive: true
   requirements:
-    - !type:LoadoutJobRequirement
+    - !type:CharacterJobRequirement
       jobs:
         - Passenger
   items:
@@ -19,6 +19,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorBlack
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorBlack
@@ -27,6 +31,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorBlack
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorBlue
@@ -35,6 +43,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorBlue
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorBlue
@@ -43,6 +55,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorBlue
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorGreen
@@ -51,6 +67,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorGreen
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorGreen
@@ -59,6 +79,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorGreen
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorOrange
@@ -67,6 +91,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorOrange
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorOrange
@@ -75,6 +103,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorOrange
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorPink
@@ -83,6 +115,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorPink
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorPink
@@ -91,6 +127,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorPink
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorRed
@@ -99,6 +139,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorRed
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorRed
@@ -107,6 +151,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorRed
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorWhite
@@ -115,6 +163,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorWhite
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorWhite
@@ -123,6 +175,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorWhite
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorYellow
@@ -131,6 +187,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorYellow
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorYellow
@@ -139,6 +199,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorYellow
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorDarkBlue
@@ -147,6 +211,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorDarkBlue
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorDarkBlue
@@ -155,6 +223,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorDarkBlue
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorTeal
@@ -163,6 +235,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorTeal
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorTeal
@@ -171,6 +247,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorTeal
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorPurple
@@ -179,6 +259,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorPurple
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorPurple
@@ -187,6 +271,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorPurple
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorDarkGreen
@@ -195,6 +283,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorDarkGreen
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorDarkGreen
@@ -203,6 +295,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorDarkGreen
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorLightBrown
@@ -211,6 +307,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorLightBrown
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorLightBrown
@@ -219,6 +319,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorLightBrown
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorBrown
@@ -227,6 +331,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorBrown
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorBrown
@@ -235,6 +343,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorBrown
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorMaroon
@@ -243,6 +355,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorMaroon
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorMaroon
@@ -251,14 +367,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorMaroon
-
-- type: loadout
-  id: LoadoutUniformJumpsuitColorRainbow
-  category: Uniform
-  cost: 2
-  exclusive: true
-  items:
-    - ClothingUniformColorRainbow
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 ## Kendo
 - type: loadout
@@ -318,23 +430,6 @@
   items:
     - ClothingKimonoGreen
 
-## School Uniforms
-- type: loadout
-  id: LoadoutUniformSchoolgirlDusk
-  category: Uniform
-  cost: 2
-  exclusive: true
-  items:
-    - UniformSchoolgirlDusk
-
-- type: loadout
-  id: LoadoutUniformSchoolgirlBlazerTan
-  category: Uniform
-  cost: 2
-  exclusive: true
-  items:
-    - UniformSchoolgirlBlazerTan
-
 ## Gakuran
 - type: loadout
   id: LoadoutUniformSchoolGakuranBlack
diff --git a/Resources/Prototypes/SimpleStation14/Traits/disabilities.yml b/Resources/Prototypes/SimpleStation14/Traits/disabilities.yml
index 25aa23a5af..b7aa00353c 100644
--- a/Resources/Prototypes/SimpleStation14/Traits/disabilities.yml
+++ b/Resources/Prototypes/SimpleStation14/Traits/disabilities.yml
@@ -1,11 +1,12 @@
 - type: trait
   id: Nearsighted
-  name: trait-nearsighted-name
-  description: You require glasses to see properly.
-  traitGear: ClothingEyesGlasses
+  category: Visual
+  points: 1
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Borg
+        - MedicalBorg
   components:
     - type: Nearsighted
-  whitelist: # Delta V fix to borgs spawning with it.
-    components:
-      - Blindable
-
diff --git a/Resources/Prototypes/Traits/categories.yml b/Resources/Prototypes/Traits/categories.yml
new file mode 100644
index 0000000000..617aa5f2f9
--- /dev/null
+++ b/Resources/Prototypes/Traits/categories.yml
@@ -0,0 +1,22 @@
+# Alphabetically ordered, except for Uncategorized since it is always first
+
+- type: traitCategory
+  id: Uncategorized
+
+- type: traitCategory
+  id: Auditory
+
+- type: traitCategory
+  id: Mental
+
+- type: traitCategory
+  id: Physical
+
+- type: traitCategory
+  id: Speech
+
+- type: traitCategory
+  id: Visual
+
+- type: traitCategory
+  id: Psionic
diff --git a/Resources/Prototypes/Traits/disabilities.yml b/Resources/Prototypes/Traits/disabilities.yml
index 2f1a7f92d2..eb96d37e01 100644
--- a/Resources/Prototypes/Traits/disabilities.yml
+++ b/Resources/Prototypes/Traits/disabilities.yml
@@ -1,18 +1,26 @@
 - type: trait
   id: Blindness
-  name: trait-blindness-name
-  description: trait-blindness-desc
-  traitGear: WhiteCane
-  whitelist:
-    components:
-      - Blindable
+  category: Visual
+  points: 2
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Borg
+        - MedicalBorg
   components:
     - type: PermanentBlindness
 
 - type: trait
   id: Narcolepsy
-  name: trait-narcolepsy-name
-  description: trait-narcolepsy-desc
+  category: Mental
+  points: 1
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Borg
+        - MedicalBorg
   components:
     - type: Narcolepsy
       timeBetweenIncidents: 300, 600
@@ -20,15 +28,15 @@
 
 - type: trait
   id: Pacifist
-  name: trait-pacifist-name
-  description: trait-pacifist-desc
+  category: Mental
+  points: 3
   components:
     - type: Pacified
 
 - type: trait
   id: Paracusia
-  name: trait-paracusia-name
-  description: trait-paracusia-desc
+  category: Auditory
+  points: 1
   components:
     - type: Paracusia
       minTimeBetweenIncidents: 0.1
@@ -39,31 +47,50 @@
 
 - type: trait
   id: Muted
-  name: trait-muted-name
-  description: trait-muted-desc
-  blacklist:
-    components:
-      - BorgChassis
+  category: Speech
+  points: 1
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Borg
+        - MedicalBorg
   components:
     - type: Muted
 
 - type: trait
   id: Uncloneable
-  name: trait-uncloneable-name
-  description: trait-uncloneable-desc
+  category: Physical
+  points: 2
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Borg
+        - MedicalBorg
   components:
     - type: Uncloneable
 
 - type: trait
   id: FrontalLisp
-  name: trait-frontal-lisp-name
-  description: trait-frontal-lisp-desc
+  category: Speech
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Borg
+        - MedicalBorg
   components:
     - type: FrontalLisp
 
 - type: trait
   id: Snoring
-  name: trait-snoring-name
-  description: trait-snoring-desc
+  category: Auditory
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Borg
+        - MedicalBorg
   components:
     - type: Snoring
diff --git a/Resources/Prototypes/Traits/inconveniences.yml b/Resources/Prototypes/Traits/inconveniences.yml
index 657781d1b5..dcf53d9ab7 100644
--- a/Resources/Prototypes/Traits/inconveniences.yml
+++ b/Resources/Prototypes/Traits/inconveniences.yml
@@ -1,15 +1,25 @@
 - type: trait
   id: LightweightDrunk
-  name: trait-lightweight-name
-  description: trait-lightweight-desc
+  category: Physical
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Borg
+        - MedicalBorg
   components:
     - type: LightweightDrunk
       boozeStrengthMultiplier: 2
 
 - type: trait
   id: SocialAnxiety
-  name: trait-socialanxiety-name
-  description: trait-socialanxiety-desc
+  category: Mental
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Borg
+        - MedicalBorg
   components:
     - type: StutteringAccent
       matchRandomProb: 0.1
diff --git a/Resources/Prototypes/Traits/neutral.yml b/Resources/Prototypes/Traits/neutral.yml
index 9e7f765507..3a3dc943cd 100644
--- a/Resources/Prototypes/Traits/neutral.yml
+++ b/Resources/Prototypes/Traits/neutral.yml
@@ -1,18 +1,23 @@
 - type: trait
   id: PirateAccent
-  name: trait-pirate-accent-name
-  description: trait-pirate-accent-desc
+  category: Speech
   components:
     - type: PirateAccent
 
 - type: trait
   id: Accentless
-  name: trait-accentless-name
-  description: trait-accentless-desc
+  category: Speech
+  points: -1
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Borg
+        - MedicalBorg
   components:
-  - type: Accentless
-    removes:
-    - type: LizardAccent
-    - type: MothAccent
-    - type: ReplacementAccent
-      accent: dwarf
+    - type: Accentless
+      removes:
+      - type: LizardAccent
+      - type: MothAccent
+      - type: ReplacementAccent
+        accent: dwarf
diff --git a/Resources/Prototypes/Nyanotrasen/Traits/psionics.yml b/Resources/Prototypes/Traits/psionics.yml
similarity index 54%
rename from Resources/Prototypes/Nyanotrasen/Traits/psionics.yml
rename to Resources/Prototypes/Traits/psionics.yml
index 5fef342770..01c8a5750e 100644
--- a/Resources/Prototypes/Nyanotrasen/Traits/psionics.yml
+++ b/Resources/Prototypes/Traits/psionics.yml
@@ -1,6 +1,6 @@
 - type: trait
   id: LatentPsychic
-  name: Latent Psychic
-  description: trait-latent-psychic-desc
+  category: Psionic
+  points: -1
   components:
     - type: PotentialPsionic
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi/lower.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_chest.rsi/lower.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi/lower.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_chest.rsi/lower.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi/meta.json b/Resources/Textures/Mobs/Customization/Harpy/harpy_chest.rsi/meta.json
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi/meta.json
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_chest.rsi/meta.json
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi/upper.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_chest.rsi/upper.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_chest.rsi/upper.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_chest.rsi/upper.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_ears.rsi/harpy_ears_default.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_ears.rsi/harpy_ears_default.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_ears.rsi/harpy_ears_default.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_ears.rsi/harpy_ears_default.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_ears.rsi/meta.json b/Resources/Textures/Mobs/Customization/Harpy/harpy_ears.rsi/meta.json
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_ears.rsi/meta.json
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_ears.rsi/meta.json
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/feet.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_legs.rsi/feet.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/feet.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_legs.rsi/feet.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/meta.json b/Resources/Textures/Mobs/Customization/Harpy/harpy_legs.rsi/meta.json
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/meta.json
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_legs.rsi/meta.json
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/talons.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_legs.rsi/talons.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/talons.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_legs.rsi/talons.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/thighs.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_legs.rsi/thighs.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_legs.rsi/thighs.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_legs.rsi/thighs.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/phoenix_tail.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/phoenix_tail.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/phoenix_tail.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/phoenix_tail.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/rooster_tail.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/rooster_tail.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tails.rsi/rooster_tail.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/rooster_tail.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tailsx72.rsi/finch_tail.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails36x36.rsi/finch_tail.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tailsx72.rsi/finch_tail.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_tails36x36.rsi/finch_tail.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tailsx72.rsi/meta.json b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails36x36.rsi/meta.json
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tailsx72.rsi/meta.json
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_tails36x36.rsi/meta.json
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/meta.json b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/meta.json
new file mode 100644
index 0000000000..2961db3707
--- /dev/null
+++ b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Peacock by stillxicarus (Discord)",
+    "size": {
+        "x": 48,
+        "y": 48
+    },
+    "states": [
+        {
+            "name": "peacock_tail_feathers",
+            "directions": 4
+        },
+        {
+            "name": "peacock_tail_eyes",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/peacock_tail_eyes.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/peacock_tail_eyes.png
new file mode 100644
index 0000000000..71af693afd
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/peacock_tail_eyes.png differ
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/peacock_tail_feathers.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/peacock_tail_feathers.png
new file mode 100644
index 0000000000..d56b093d6c
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/peacock_tail_feathers.png differ
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wingcover.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wingcover.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wingcover.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wingcover.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/classicharpy.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/classicharpy.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/classicharpy.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/classicharpy.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone1.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone1.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone1.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone1.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone2.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone2.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone2.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone2.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone1.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone1.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone1.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone1.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone2.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone2.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone2.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone2.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone3.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone3.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone3.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone3.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyfolded.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyfolded.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyfolded.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyfolded.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled1.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled1.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled1.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled1.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled2.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled2.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled2.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled2.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone1.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone1.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone1.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone1.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone2.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone2.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone2.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone2.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip1.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip1.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip1.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip1.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip2.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip2.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip2.png
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip2.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/meta.json b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/meta.json
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_wings.rsi/meta.json
rename to Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/meta.json