From 83e9a8821c9f58ca14b234b4e4582505a261b884 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Thu, 13 Jun 2024 19:15:49 -0400
Subject: [PATCH 01/25] Start port

---
 .../Humanoid/HumanoidAppearanceSystem.cs      |   10 +
 .../Preferences/UI/HumanoidProfileEditor.xaml |    7 +
 .../UI/HumanoidProfileEditor.xaml.cs          |   55 +
 .../Tests/Preferences/ServerDbSqliteTests.cs  |    1 +
 .../20230711102742_Height.Designer.cs         | 1368 +++++++++++++++++
 .../Postgres/20230711102742_Height.cs         |   29 +
 .../PostgresServerDbContextModelSnapshot.cs   |    4 +
 .../Sqlite/20230711102028_Height.Designer.cs  | 1300 ++++++++++++++++
 .../Sqlite/20230711102028_Height.cs           |   29 +
 .../SqliteServerDbContextModelSnapshot.cs     |    4 +
 Content.Server.Database/Model.cs              |    1 +
 Content.Server/Database/ServerDbBase.cs       |    2 +
 .../Systems/HumanoidAppearanceSystem.cs       |    1 +
 .../Humanoid/HumanoidAppearanceComponent.cs   |    4 +
 .../Humanoid/Prototypes/SpeciesPrototype.cs   |   36 +
 .../SharedHumanoidAppearanceSystem.cs         |    2 +
 .../Preferences/HumanoidCharacterProfile.cs   |   27 +-
 .../ui/humanoid-profile-editor.ftl            |    2 +
 .../Entities/Mobs/Species/dwarf.yml           |    4 -
 Resources/Prototypes/Species/dwarf.yml        |    5 +
 20 files changed, 2884 insertions(+), 7 deletions(-)
 create mode 100644 Content.Server.Database/Migrations/Postgres/20230711102742_Height.Designer.cs
 create mode 100644 Content.Server.Database/Migrations/Postgres/20230711102742_Height.cs
 create mode 100644 Content.Server.Database/Migrations/Sqlite/20230711102028_Height.Designer.cs
 create mode 100644 Content.Server.Database/Migrations/Sqlite/20230711102028_Height.cs

diff --git a/Content.Client/Humanoid/HumanoidAppearanceSystem.cs b/Content.Client/Humanoid/HumanoidAppearanceSystem.cs
index 5bae35da5ba..f0b30601176 100644
--- a/Content.Client/Humanoid/HumanoidAppearanceSystem.cs
+++ b/Content.Client/Humanoid/HumanoidAppearanceSystem.cs
@@ -1,8 +1,10 @@
+using System.Numerics;
 using Content.Shared.Humanoid;
 using Content.Shared.Humanoid.Markings;
 using Content.Shared.Humanoid.Prototypes;
 using Content.Shared.Preferences;
 using Robust.Client.GameObjects;
+using Robust.Client.Console;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
@@ -12,6 +14,8 @@ public sealed class HumanoidAppearanceSystem : SharedHumanoidAppearanceSystem
 {
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly MarkingManager _markingManager = default!;
+    [Dependency] private readonly IEntityManager _entityManager = default!;
+    [Dependency] private readonly IClientConsoleHost _consoleHost = default!;
 
     public override void Initialize()
     {
@@ -30,6 +34,11 @@ private void UpdateSprite(HumanoidAppearanceComponent component, SpriteComponent
         UpdateLayers(component, sprite);
         ApplyMarkingSet(component, sprite);
 
+        var speciesPrototype = _prototypeManager.Index<SpeciesPrototype>(component.Species);
+        var height = Math.Clamp(MathF.Round(component.Height, 1), speciesPrototype.MinHeight, speciesPrototype.MaxHeight); // should NOT be locked, at all
+
+        sprite.Scale = new Vector2(speciesPrototype.ScaleHeight ? height : 1f, height);
+
         sprite[sprite.LayerMapReserveBlank(HumanoidVisualLayers.Eyes)].Color = component.EyeColor;
     }
 
@@ -194,6 +203,7 @@ 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;
 
         UpdateSprite(humanoid, Comp<SpriteComponent>(uid));
     }
diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
index 9a70d678310..b5894d83fcc 100644
--- a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
+++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
@@ -108,6 +108,13 @@
                                     <Label Text="{Loc 'humanoid-profile-editor-spawn-priority-label'}" />
                                     <Control HorizontalExpand="True"/>
                                     <OptionButton Name="CSpawnPriorityButton" HorizontalAlignment="Right" />
+                                </BoxContainer>
+								<!-- Height -->
+                                <BoxContainer HorizontalExpand="True">
+                                    <Label Text="{Loc 'humanoid-profile-editor-height-label'}" />
+                                    <Label Name="CHeightLabel" Text="1" />
+                                    <Button Name="CHeightReset" Text="{Loc 'humanoid-profile-editor-reset-height-button'}"/>
+                                    <LineEdit HorizontalAlignment="Right" HorizontalExpand="True" Name="CHeight" MinSize="40 0" Text="1.0" />
                                 </BoxContainer>
                             </BoxContainer>
                             <!-- Skin -->
diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
index 8b88fc1e9b0..2d90868d78e 100644
--- a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
@@ -1,3 +1,4 @@
+using System.Globalization;
 using System.Linq;
 using System.Numerics;
 using System.Text;
@@ -79,6 +80,7 @@ public sealed partial class HumanoidProfileEditor : Control
         private SingleMarkingPicker _hairPicker => CHairStylePicker;
         private SingleMarkingPicker _facialHairPicker => CFacialHairPicker;
         private EyeColorPicker _eyesPicker => CEyeColorPicker;
+        private LineEdit _heightPicker => CHeight;
 
         private TabContainer _tabContainer => CTabContainer;
         private BoxContainer _jobList => CJobList;
@@ -115,6 +117,8 @@ public sealed partial class HumanoidProfileEditor : Control
 
         public event Action<HumanoidCharacterProfile, int>? OnProfileChanged;
 
+        private float _defaultHeight = 1f;
+
         public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IPrototypeManager prototypeManager,
             IEntityManager entityManager, IConfigurationManager configurationManager)
         {
@@ -205,6 +209,35 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
 
             #endregion Species
 
+            #region Height
+
+
+            _heightPicker.OnTextChanged += args =>
+            {
+                if (Profile is null || !float.TryParse(args.Text, out var newHeight))
+                    return;
+
+                var prototype = _prototypeManager.Index<SpeciesPrototype>(Profile.Species);
+
+                if (newHeight < prototype.MinHeight)
+                    newHeight = prototype.MinHeight;
+
+                if (newHeight > prototype.MaxHeight)
+                    newHeight = prototype.MaxHeight;
+
+                CHeightLabel.Text = MathF.Round(newHeight, 1).ToString("G");
+                SetProfileHeight(MathF.Round(newHeight, 1));
+            };
+
+            CHeightReset.OnPressed += _ =>
+            {
+                _heightPicker.Text = _defaultHeight.ToString(CultureInfo.InvariantCulture);
+                CHeightLabel.Text = _defaultHeight.ToString(CultureInfo.InvariantCulture);
+                SetProfileHeight(_defaultHeight);
+            };
+
+            #endregion Height
+
             #region Skin
 
 
@@ -911,6 +944,12 @@ private void SetSpawnPriority(SpawnPriorityPreference newSpawnPriority)
             IsDirty = true;
         }
 
+        private void SetProfileHeight(float height)
+        {
+            Profile = Profile?.WithHeight(height);
+            IsDirty = true;
+        }
+
         public void Save()
         {
             IsDirty = false;
@@ -1115,6 +1154,21 @@ private void UpdateSpawnPriorityControls()
             _spawnPriorityButton.SelectId((int) Profile.SpawnPriority);
         }
 
+        private void UpdateHeightControls()
+        {
+            if (Profile == null)
+            {
+                return;
+            }
+
+            var species = _speciesList.Find(x => x.ID == Profile.Species);
+            if (species != null)
+                _defaultHeight = species.DefaultHeight;
+
+            _heightPicker.Text = Profile.Height.ToString();
+            CHeightLabel.Text = Profile.Height.ToString();
+        }
+
         private void UpdateHairPickers()
         {
             if (Profile == null)
@@ -1270,6 +1324,7 @@ public void UpdateControls()
             UpdateHairPickers();
             UpdateCMarkingsHair();
             UpdateCMarkingsFacialHair();
+            UpdateHeightControls();
 
             _preferenceUnavailableButton.SelectId((int) Profile.PreferenceUnavailable);
         }
diff --git a/Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs b/Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs
index 2845e451470..01c1cc864e0 100644
--- a/Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs
+++ b/Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs
@@ -41,6 +41,7 @@ private static HumanoidCharacterProfile CharlieCharlieson()
                 "Charlie Charlieson",
                 "The biggest boy around.",
                 "Human",
+                1,
                 21,
                 Sex.Male,
                 Gender.Epicene,
diff --git a/Content.Server.Database/Migrations/Postgres/20230711102742_Height.Designer.cs b/Content.Server.Database/Migrations/Postgres/20230711102742_Height.Designer.cs
new file mode 100644
index 00000000000..c932ec93a64
--- /dev/null
+++ b/Content.Server.Database/Migrations/Postgres/20230711102742_Height.Designer.cs
@@ -0,0 +1,1368 @@
+// <auto-generated />
+using System;
+using System.Net;
+using System.Text.Json;
+using Content.Server.Database;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Postgres
+{
+    [DbContext(typeof(PostgresServerDbContext))]
+    [Migration("20230711102742_Height")]
+    partial class Height
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.4")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<int?>("AdminRankId")
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("text")
+                        .HasColumnName("title");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_admin");
+
+                    b.HasIndex("AdminRankId")
+                        .HasDatabaseName("IX_admin_admin_rank_id");
+
+                    b.ToTable("admin", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_flag_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("AdminId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("admin_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("flag");
+
+                    b.Property<bool>("Negative")
+                        .HasColumnType("boolean")
+                        .HasColumnName("negative");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_flag");
+
+                    b.HasIndex("AdminId")
+                        .HasDatabaseName("IX_admin_flag_admin_id");
+
+                    b.HasIndex("Flag", "AdminId")
+                        .IsUnique();
+
+                    b.ToTable("admin_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_log_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date");
+
+                    b.Property<short>("Impact")
+                        .HasColumnType("smallint")
+                        .HasColumnName("impact");
+
+                    b.Property<JsonDocument>("Json")
+                        .IsRequired()
+                        .HasColumnType("jsonb")
+                        .HasColumnName("json");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("message");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer")
+                        .HasColumnName("type");
+
+                    b.HasKey("Id", "RoundId")
+                        .HasName("PK_admin_log");
+
+                    b.HasIndex("Date");
+
+                    b.HasIndex("Message")
+                        .HasAnnotation("Npgsql:TsVectorConfig", "english");
+
+                    NpgsqlIndexBuilderExtensions.HasMethod(b.HasIndex("Message"), "GIN");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_log_round_id");
+
+                    b.HasIndex("Type")
+                        .HasDatabaseName("IX_admin_log_type");
+
+                    b.ToTable("admin_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogEntity", b =>
+                {
+                    b.Property<int>("Uid")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("uid");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Uid"));
+
+                    b.Property<int?>("AdminLogId")
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_log_id");
+
+                    b.Property<int?>("AdminLogRoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_log_round_id");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.HasKey("Uid")
+                        .HasName("PK_admin_log_entity");
+
+                    b.HasIndex("AdminLogId", "AdminLogRoundId")
+                        .HasDatabaseName("IX_admin_log_entity_admin_log_id_admin_log_round_id");
+
+                    b.ToTable("admin_log_entity", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<int>("LogId")
+                        .HasColumnType("integer")
+                        .HasColumnName("log_id");
+
+                    b.Property<int>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.HasKey("PlayerUserId", "LogId", "RoundId")
+                        .HasName("PK_admin_log_player");
+
+                    b.HasIndex("LogId", "RoundId");
+
+                    b.ToTable("admin_log_player", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_notes_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime>("LastEditedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("character varying(4096)")
+                        .HasColumnName("message");
+
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("ShownToPlayer")
+                        .HasColumnType("boolean")
+                        .HasColumnName("shown_to_player");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_notes");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_notes_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_notes_round_id");
+
+                    b.ToTable("admin_notes", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank");
+
+                    b.ToTable("admin_rank", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_flag_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("AdminRankId")
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("flag");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank_flag");
+
+                    b.HasIndex("AdminRankId");
+
+                    b.HasIndex("Flag", "AdminRankId")
+                        .IsUnique();
+
+                    b.ToTable("admin_rank_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("antag_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("AntagName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("antag_name");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_antag");
+
+                    b.HasIndex("ProfileId", "AntagName")
+                        .IsUnique();
+
+                    b.ToTable("antag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AssignedUserId", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("assigned_user_id_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_assigned_user_id");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.HasIndex("UserName")
+                        .IsUnique();
+
+                    b.ToTable("assigned_user_id", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("connection_log_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<IPAddress>("Address")
+                        .IsRequired()
+                        .HasColumnType("inet")
+                        .HasColumnName("address");
+
+                    b.Property<byte?>("Denied")
+                        .HasColumnType("smallint")
+                        .HasColumnName("denied");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("bytea")
+                        .HasColumnName("hwid");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("time");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_connection_log");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("connection_log", null, t =>
+                        {
+                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("job_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("JobName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("job_name");
+
+                    b.Property<int>("Priority")
+                        .HasColumnType("integer")
+                        .HasColumnName("priority");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_job");
+
+                    b.HasIndex("ProfileId");
+
+                    b.HasIndex("ProfileId", "JobName")
+                        .IsUnique();
+
+                    b.HasIndex(new[] { "ProfileId" }, "IX_job_one_high_priority")
+                        .IsUnique()
+                        .HasFilter("priority = 3");
+
+                    b.ToTable("job", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.PlayTime", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("play_time_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("PlayerId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_id");
+
+                    b.Property<TimeSpan>("TimeSpent")
+                        .HasColumnType("interval")
+                        .HasColumnName("time_spent");
+
+                    b.Property<string>("Tracker")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("tracker");
+
+                    b.HasKey("Id")
+                        .HasName("PK_play_time");
+
+                    b.HasIndex("PlayerId", "Tracker")
+                        .IsUnique();
+
+                    b.ToTable("play_time", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("player_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("FirstSeenTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("first_seen_time");
+
+                    b.Property<DateTime?>("LastReadRules")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_read_rules");
+
+                    b.Property<IPAddress>("LastSeenAddress")
+                        .IsRequired()
+                        .HasColumnType("inet")
+                        .HasColumnName("last_seen_address");
+
+                    b.Property<byte[]>("LastSeenHWId")
+                        .HasColumnType("bytea")
+                        .HasColumnName("last_seen_hwid");
+
+                    b.Property<DateTime>("LastSeenTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_seen_time");
+
+                    b.Property<string>("LastSeenUserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("last_seen_user_name");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_player");
+
+                    b.HasAlternateKey("UserId")
+                        .HasName("ak_player_user_id");
+
+                    b.HasIndex("LastSeenUserName");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("player", null, t =>
+                        {
+                            t.HasCheckConstraint("LastSeenAddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= last_seen_address");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("preference_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("AdminOOCColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("admin_ooc_color");
+
+                    b.Property<int>("SelectedCharacterSlot")
+                        .HasColumnType("integer")
+                        .HasColumnName("selected_character_slot");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_preference");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("preference", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("Age")
+                        .HasColumnType("integer")
+                        .HasColumnName("age");
+
+                    b.Property<string>("Backpack")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("backpack");
+
+                    b.Property<string>("CharacterName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("char_name");
+
+                    b.Property<string>("Clothing")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("clothing");
+
+                    b.Property<string>("EyeColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("eye_color");
+
+                    b.Property<string>("FacialHairColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("facial_hair_color");
+
+                    b.Property<string>("FacialHairName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("facial_hair_name");
+
+                    b.Property<string>("FlavorText")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("flavor_text");
+
+                    b.Property<string>("Gender")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("gender");
+
+                    b.Property<string>("HairColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("hair_color");
+
+                    b.Property<string>("HairName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("hair_name");
+
+                    b.Property<float>("Height")
+                        .HasColumnType("real")
+                        .HasColumnName("height");
+
+                    b.Property<JsonDocument>("Markings")
+                        .HasColumnType("jsonb")
+                        .HasColumnName("markings");
+
+                    b.Property<int>("PreferenceId")
+                        .HasColumnType("integer")
+                        .HasColumnName("preference_id");
+
+                    b.Property<int>("PreferenceUnavailable")
+                        .HasColumnType("integer")
+                        .HasColumnName("pref_unavailable");
+
+                    b.Property<string>("Sex")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("sex");
+
+                    b.Property<string>("SkinColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("skin_color");
+
+                    b.Property<int>("Slot")
+                        .HasColumnType("integer")
+                        .HasColumnName("slot");
+
+                    b.Property<string>("Species")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("species");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile");
+
+                    b.HasIndex("PreferenceId")
+                        .HasDatabaseName("IX_profile_preference_id");
+
+                    b.HasIndex("Slot", "PreferenceId")
+                        .IsUnique();
+
+                    b.ToTable("profile", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ServerId")
+                        .HasColumnType("integer")
+                        .HasColumnName("server_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_round");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_round_server_id");
+
+                    b.ToTable("round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server");
+
+                    b.ToTable("server", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_ban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<ValueTuple<IPAddress, int>?>("Address")
+                        .HasColumnType("inet")
+                        .HasColumnName("address");
+
+                    b.Property<bool>("AutoDelete")
+                        .HasColumnType("boolean")
+                        .HasColumnName("auto_delete");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<int>("ExemptFlags")
+                        .HasColumnType("integer")
+                        .HasColumnName("exempt_flags");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("bytea")
+                        .HasColumnName("hwid");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("reason");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("server_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
+
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanExemption", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<int>("Flags")
+                        .HasColumnType("integer")
+                        .HasColumnName("flags");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_server_ban_exemption");
+
+                    b.ToTable("server_ban_exemption", null, t =>
+                        {
+                            t.HasCheckConstraint("FlagsNotZero", "flags != 0");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_ban_hit_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.Property<int>("ConnectionId")
+                        .HasColumnType("integer")
+                        .HasColumnName("connection_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban_hit");
+
+                    b.HasIndex("BanId")
+                        .HasDatabaseName("IX_server_ban_hit_ban_id");
+
+                    b.HasIndex("ConnectionId")
+                        .HasDatabaseName("IX_server_ban_hit_connection_id");
+
+                    b.ToTable("server_ban_hit", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_role_ban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<ValueTuple<IPAddress, int>?>("Address")
+                        .HasColumnType("inet")
+                        .HasColumnName("address");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("bytea")
+                        .HasColumnName("hwid");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("reason");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("role_id");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("server_role_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
+
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("role_unban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_role_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("unban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("trait_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("TraitName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("trait_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_trait");
+
+                    b.HasIndex("ProfileId", "TraitName")
+                        .IsUnique();
+
+                    b.ToTable("trait", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.UploadedResourceLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("uploaded_resource_log_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<byte[]>("Data")
+                        .IsRequired()
+                        .HasColumnType("bytea")
+                        .HasColumnName("data");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_uploaded_resource_log");
+
+                    b.ToTable("uploaded_resource_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Whitelist", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_whitelist");
+
+                    b.ToTable("whitelist", (string)null);
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.Property<int>("PlayersId")
+                        .HasColumnType("integer")
+                        .HasColumnName("players_id");
+
+                    b.Property<int>("RoundsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("rounds_id");
+
+                    b.HasKey("PlayersId", "RoundsId")
+                        .HasName("PK_player_round");
+
+                    b.HasIndex("RoundsId")
+                        .HasDatabaseName("IX_player_round_rounds_id");
+
+                    b.ToTable("player_round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "AdminRank")
+                        .WithMany("Admins")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_admin_rank_admin_rank_id");
+
+                    b.Navigation("AdminRank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Admin", "Admin")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_flag_admin_admin_id");
+
+                    b.Navigation("Admin");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("RoundId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_round_round_id");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogEntity", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminLog", null)
+                        .WithMany("Entities")
+                        .HasForeignKey("AdminLogId", "AdminLogRoundId")
+                        .HasConstraintName("FK_admin_log_entity_admin_log_admin_log_id_admin_log_round_id");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.AdminLog", "Log")
+                        .WithMany("Players")
+                        .HasForeignKey("LogId", "RoundId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_admin_log_log_id_round_id");
+
+                    b.Navigation("Log");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminNotesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_notes_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminNotesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .HasConstraintName("FK_admin_notes_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminNotesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_notes_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminNotesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_notes_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_notes_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "Rank")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_rank_flag_admin_rank_admin_rank_id");
+
+                    b.Navigation("Rank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Antags")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_antag_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Jobs")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_job_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.HasOne("Content.Server.Database.Preference", "Preference")
+                        .WithMany("Profiles")
+                        .HasForeignKey("PreferenceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_preference_preference_id");
+
+                    b.Navigation("Preference");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("Rounds")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_round_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithMany("BanHits")
+                        .HasForeignKey("BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_server_ban_ban_id");
+
+                    b.HasOne("Content.Server.Database.ConnectionLog", "Connection")
+                        .WithMany("BanHits")
+                        .HasForeignKey("ConnectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_connection_log_connection_id");
+
+                    b.Navigation("Ban");
+
+                    b.Navigation("Connection");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerRoleBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerRoleUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_role_unban_server_role_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_unban_server_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Traits")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_trait_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", null)
+                        .WithMany()
+                        .HasForeignKey("PlayersId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_player_players_id");
+
+                    b.HasOne("Content.Server.Database.Round", null)
+                        .WithMany()
+                        .HasForeignKey("RoundsId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_round_rounds_id");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Navigation("Entities");
+
+                    b.Navigation("Players");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Navigation("Admins");
+
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Navigation("BanHits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Navigation("AdminLogs");
+
+                    b.Navigation("AdminNotesCreated");
+
+                    b.Navigation("AdminNotesDeleted");
+
+                    b.Navigation("AdminNotesLastEdited");
+
+                    b.Navigation("AdminNotesReceived");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Navigation("Profiles");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Navigation("Antags");
+
+                    b.Navigation("Jobs");
+
+                    b.Navigation("Traits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Navigation("AdminLogs");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Navigation("Rounds");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Navigation("BanHits");
+
+                    b.Navigation("Unban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Navigation("Unban");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Postgres/20230711102742_Height.cs b/Content.Server.Database/Migrations/Postgres/20230711102742_Height.cs
new file mode 100644
index 00000000000..8647022a5c4
--- /dev/null
+++ b/Content.Server.Database/Migrations/Postgres/20230711102742_Height.cs
@@ -0,0 +1,29 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Postgres
+{
+    /// <inheritdoc />
+    public partial class Height : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<float>(
+                name: "height",
+                table: "profile",
+                type: "REAL",
+                nullable: false,
+                defaultValue: 1f);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "height",
+                table: "profile");
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs b/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
index 79e478006b0..98cd1b3b044 100644
--- a/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
+++ b/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
@@ -811,6 +811,10 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .IsRequired()
                         .HasColumnType("text")
                         .HasColumnName("hair_name");
+						
+					b.Property<float>("Height")
+                        .HasColumnType("real")
+                        .HasColumnName("height");
 
                     b.Property<JsonDocument>("Markings")
                         .HasColumnType("jsonb")
diff --git a/Content.Server.Database/Migrations/Sqlite/20230711102028_Height.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20230711102028_Height.Designer.cs
new file mode 100644
index 00000000000..32e0d4e83c3
--- /dev/null
+++ b/Content.Server.Database/Migrations/Sqlite/20230711102028_Height.Designer.cs
@@ -0,0 +1,1300 @@
+// <auto-generated />
+using System;
+using Content.Server.Database;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Sqlite
+{
+    [DbContext(typeof(SqliteServerDbContext))]
+    [Migration("20230711102028_Height")]
+    partial class Height
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "7.0.4");
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<int?>("AdminRankId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("title");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_admin");
+
+                    b.HasIndex("AdminRankId")
+                        .HasDatabaseName("IX_admin_admin_rank_id");
+
+                    b.ToTable("admin", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_flag_id");
+
+                    b.Property<Guid>("AdminId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("admin_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("flag");
+
+                    b.Property<bool>("Negative")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("negative");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_flag");
+
+                    b.HasIndex("AdminId")
+                        .HasDatabaseName("IX_admin_flag_admin_id");
+
+                    b.HasIndex("Flag", "AdminId")
+                        .IsUnique();
+
+                    b.ToTable("admin_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_log_id");
+
+                    b.Property<int>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("date");
+
+                    b.Property<sbyte>("Impact")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("impact");
+
+                    b.Property<string>("Json")
+                        .IsRequired()
+                        .HasColumnType("jsonb")
+                        .HasColumnName("json");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("type");
+
+                    b.HasKey("Id", "RoundId")
+                        .HasName("PK_admin_log");
+
+                    b.HasIndex("Date");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_log_round_id");
+
+                    b.HasIndex("Type")
+                        .HasDatabaseName("IX_admin_log_type");
+
+                    b.ToTable("admin_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogEntity", b =>
+                {
+                    b.Property<int>("Uid")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("uid");
+
+                    b.Property<int?>("AdminLogId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_log_id");
+
+                    b.Property<int?>("AdminLogRoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_log_round_id");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("name");
+
+                    b.HasKey("Uid")
+                        .HasName("PK_admin_log_entity");
+
+                    b.HasIndex("AdminLogId", "AdminLogRoundId")
+                        .HasDatabaseName("IX_admin_log_entity_admin_log_id_admin_log_round_id");
+
+                    b.ToTable("admin_log_entity", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<int>("LogId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("log_id");
+
+                    b.Property<int>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.HasKey("PlayerUserId", "LogId", "RoundId")
+                        .HasName("PK_admin_log_player");
+
+                    b.HasIndex("LogId", "RoundId");
+
+                    b.ToTable("admin_log_player", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_notes_id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime>("LastEditedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("ShownToPlayer")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("shown_to_player");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_notes");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_notes_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_notes_round_id");
+
+                    b.ToTable("admin_notes", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank");
+
+                    b.ToTable("admin_rank", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_flag_id");
+
+                    b.Property<int>("AdminRankId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("flag");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank_flag");
+
+                    b.HasIndex("AdminRankId");
+
+                    b.HasIndex("Flag", "AdminRankId")
+                        .IsUnique();
+
+                    b.ToTable("admin_rank_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("antag_id");
+
+                    b.Property<string>("AntagName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("antag_name");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_antag");
+
+                    b.HasIndex("ProfileId", "AntagName")
+                        .IsUnique();
+
+                    b.ToTable("antag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AssignedUserId", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("assigned_user_id_id");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_assigned_user_id");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.HasIndex("UserName")
+                        .IsUnique();
+
+                    b.ToTable("assigned_user_id", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("connection_log_id");
+
+                    b.Property<string>("Address")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<byte?>("Denied")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("denied");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("BLOB")
+                        .HasColumnName("hwid");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("time");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_connection_log");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("connection_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("job_id");
+
+                    b.Property<string>("JobName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("job_name");
+
+                    b.Property<int>("Priority")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("priority");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_job");
+
+                    b.HasIndex("ProfileId");
+
+                    b.HasIndex("ProfileId", "JobName")
+                        .IsUnique();
+
+                    b.HasIndex(new[] { "ProfileId" }, "IX_job_one_high_priority")
+                        .IsUnique()
+                        .HasFilter("priority = 3");
+
+                    b.ToTable("job", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.PlayTime", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("play_time_id");
+
+                    b.Property<Guid>("PlayerId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_id");
+
+                    b.Property<TimeSpan>("TimeSpent")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("time_spent");
+
+                    b.Property<string>("Tracker")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("tracker");
+
+                    b.HasKey("Id")
+                        .HasName("PK_play_time");
+
+                    b.HasIndex("PlayerId", "Tracker")
+                        .IsUnique();
+
+                    b.ToTable("play_time", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("player_id");
+
+                    b.Property<DateTime>("FirstSeenTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("first_seen_time");
+
+                    b.Property<DateTime?>("LastReadRules")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_read_rules");
+
+                    b.Property<string>("LastSeenAddress")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_seen_address");
+
+                    b.Property<byte[]>("LastSeenHWId")
+                        .HasColumnType("BLOB")
+                        .HasColumnName("last_seen_hwid");
+
+                    b.Property<DateTime>("LastSeenTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_seen_time");
+
+                    b.Property<string>("LastSeenUserName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_seen_user_name");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_player");
+
+                    b.HasAlternateKey("UserId")
+                        .HasName("ak_player_user_id");
+
+                    b.HasIndex("LastSeenUserName");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("player", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("preference_id");
+
+                    b.Property<string>("AdminOOCColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("admin_ooc_color");
+
+                    b.Property<int>("SelectedCharacterSlot")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("selected_character_slot");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_preference");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("preference", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.Property<int>("Age")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("age");
+
+                    b.Property<string>("Backpack")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("backpack");
+
+                    b.Property<string>("CharacterName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("char_name");
+
+                    b.Property<string>("Clothing")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("clothing");
+
+                    b.Property<string>("EyeColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("eye_color");
+
+                    b.Property<string>("FacialHairColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("facial_hair_color");
+
+                    b.Property<string>("FacialHairName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("facial_hair_name");
+
+                    b.Property<string>("FlavorText")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("flavor_text");
+
+                    b.Property<string>("Gender")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("gender");
+
+                    b.Property<string>("HairColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("hair_color");
+
+                    b.Property<string>("HairName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("hair_name");
+
+                    b.Property<float>("Height")
+                        .HasColumnType("REAL")
+                        .HasColumnName("height");
+
+                    b.Property<byte[]>("Markings")
+                        .HasColumnType("jsonb")
+                        .HasColumnName("markings");
+
+                    b.Property<int>("PreferenceId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("preference_id");
+
+                    b.Property<int>("PreferenceUnavailable")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("pref_unavailable");
+
+                    b.Property<string>("Sex")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("sex");
+
+                    b.Property<string>("SkinColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("skin_color");
+
+                    b.Property<int>("Slot")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("slot");
+
+                    b.Property<string>("Species")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("species");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile");
+
+                    b.HasIndex("PreferenceId")
+                        .HasDatabaseName("IX_profile_preference_id");
+
+                    b.HasIndex("Slot", "PreferenceId")
+                        .IsUnique();
+
+                    b.ToTable("profile", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("ServerId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_round");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_round_server_id");
+
+                    b.ToTable("round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_id");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server");
+
+                    b.ToTable("server", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_ban_id");
+
+                    b.Property<string>("Address")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<bool>("AutoDelete")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("auto_delete");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<int>("ExemptFlags")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("exempt_flags");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("BLOB")
+                        .HasColumnName("hwid");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("reason");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("server_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanExemption", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<int>("Flags")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("flags");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_server_ban_exemption");
+
+                    b.ToTable("server_ban_exemption", null, t =>
+                        {
+                            t.HasCheckConstraint("FlagsNotZero", "flags != 0");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_ban_hit_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<int>("ConnectionId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("connection_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban_hit");
+
+                    b.HasIndex("BanId")
+                        .HasDatabaseName("IX_server_ban_hit_ban_id");
+
+                    b.HasIndex("ConnectionId")
+                        .HasDatabaseName("IX_server_ban_hit_connection_id");
+
+                    b.ToTable("server_ban_hit", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_role_ban_id");
+
+                    b.Property<string>("Address")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("BLOB")
+                        .HasColumnName("hwid");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("reason");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("role_id");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("server_role_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("role_unban_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_role_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("unban_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("trait_id");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("TraitName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("trait_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_trait");
+
+                    b.HasIndex("ProfileId", "TraitName")
+                        .IsUnique();
+
+                    b.ToTable("trait", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.UploadedResourceLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("uploaded_resource_log_id");
+
+                    b.Property<byte[]>("Data")
+                        .IsRequired()
+                        .HasColumnType("BLOB")
+                        .HasColumnName("data");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("date");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("path");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_uploaded_resource_log");
+
+                    b.ToTable("uploaded_resource_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Whitelist", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_whitelist");
+
+                    b.ToTable("whitelist", (string)null);
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.Property<int>("PlayersId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("players_id");
+
+                    b.Property<int>("RoundsId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("rounds_id");
+
+                    b.HasKey("PlayersId", "RoundsId")
+                        .HasName("PK_player_round");
+
+                    b.HasIndex("RoundsId")
+                        .HasDatabaseName("IX_player_round_rounds_id");
+
+                    b.ToTable("player_round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "AdminRank")
+                        .WithMany("Admins")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_admin_rank_admin_rank_id");
+
+                    b.Navigation("AdminRank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Admin", "Admin")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_flag_admin_admin_id");
+
+                    b.Navigation("Admin");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("RoundId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_round_round_id");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogEntity", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminLog", null)
+                        .WithMany("Entities")
+                        .HasForeignKey("AdminLogId", "AdminLogRoundId")
+                        .HasConstraintName("FK_admin_log_entity_admin_log_admin_log_id_admin_log_round_id");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.AdminLog", "Log")
+                        .WithMany("Players")
+                        .HasForeignKey("LogId", "RoundId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_admin_log_log_id_round_id");
+
+                    b.Navigation("Log");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminNotesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_notes_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminNotesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .HasConstraintName("FK_admin_notes_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminNotesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_notes_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminNotesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_notes_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_notes_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "Rank")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_rank_flag_admin_rank_admin_rank_id");
+
+                    b.Navigation("Rank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Antags")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_antag_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Jobs")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_job_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.HasOne("Content.Server.Database.Preference", "Preference")
+                        .WithMany("Profiles")
+                        .HasForeignKey("PreferenceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_preference_preference_id");
+
+                    b.Navigation("Preference");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("Rounds")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_round_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithMany("BanHits")
+                        .HasForeignKey("BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_server_ban_ban_id");
+
+                    b.HasOne("Content.Server.Database.ConnectionLog", "Connection")
+                        .WithMany("BanHits")
+                        .HasForeignKey("ConnectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_connection_log_connection_id");
+
+                    b.Navigation("Ban");
+
+                    b.Navigation("Connection");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerRoleBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerRoleUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_role_unban_server_role_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_unban_server_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Traits")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_trait_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", null)
+                        .WithMany()
+                        .HasForeignKey("PlayersId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_player_players_id");
+
+                    b.HasOne("Content.Server.Database.Round", null)
+                        .WithMany()
+                        .HasForeignKey("RoundsId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_round_rounds_id");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Navigation("Entities");
+
+                    b.Navigation("Players");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Navigation("Admins");
+
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Navigation("BanHits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Navigation("AdminLogs");
+
+                    b.Navigation("AdminNotesCreated");
+
+                    b.Navigation("AdminNotesDeleted");
+
+                    b.Navigation("AdminNotesLastEdited");
+
+                    b.Navigation("AdminNotesReceived");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Navigation("Profiles");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Navigation("Antags");
+
+                    b.Navigation("Jobs");
+
+                    b.Navigation("Traits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Navigation("AdminLogs");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Navigation("Rounds");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Navigation("BanHits");
+
+                    b.Navigation("Unban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Navigation("Unban");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Sqlite/20230711102028_Height.cs b/Content.Server.Database/Migrations/Sqlite/20230711102028_Height.cs
new file mode 100644
index 00000000000..39d748446b4
--- /dev/null
+++ b/Content.Server.Database/Migrations/Sqlite/20230711102028_Height.cs
@@ -0,0 +1,29 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Sqlite
+{
+    /// <inheritdoc />
+    public partial class Height : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<float>(
+                name: "height",
+                table: "profile",
+                type: "REAL",
+                nullable: false,
+                defaultValue: 1f);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "height",
+                table: "profile");
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs b/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
index 89ca243fae6..cb7c688c4bf 100644
--- a/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
+++ b/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
@@ -762,6 +762,10 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .IsRequired()
                         .HasColumnType("TEXT")
                         .HasColumnName("hair_name");
+						
+                    b.Property<float>("Height")
+                        .HasColumnType("REAL")
+                        .HasColumnName("height");
 
                     b.Property<byte[]>("Markings")
                         .HasColumnType("jsonb")
diff --git a/Content.Server.Database/Model.cs b/Content.Server.Database/Model.cs
index eb9581b21e7..6ff3dfd48d6 100644
--- a/Content.Server.Database/Model.cs
+++ b/Content.Server.Database/Model.cs
@@ -338,6 +338,7 @@ public class Profile
         public string Sex { get; set; } = null!;
         public string Gender { get; set; } = null!;
         public string Species { get; set; } = null!;
+        public float Height { get; set; } = 1f;
         [Column(TypeName = "jsonb")] public JsonDocument? Markings { get; set; } = null!;
         public string HairName { get; set; } = null!;
         public string HairColor { get; set; } = null!;
diff --git a/Content.Server/Database/ServerDbBase.cs b/Content.Server/Database/ServerDbBase.cs
index 7c9ffe29e80..eca4b0835e1 100644
--- a/Content.Server/Database/ServerDbBase.cs
+++ b/Content.Server/Database/ServerDbBase.cs
@@ -216,6 +216,7 @@ private static HumanoidCharacterProfile ConvertProfiles(Profile profile)
                 profile.CharacterName,
                 profile.FlavorText,
                 profile.Species,
+                profile.Height,
                 profile.Age,
                 sex,
                 gender,
@@ -257,6 +258,7 @@ private static Profile ConvertProfiles(HumanoidCharacterProfile humanoid, int sl
             profile.Age = humanoid.Age;
             profile.Sex = humanoid.Sex.ToString();
             profile.Gender = humanoid.Gender.ToString();
+            profile.Height = humanoid.Height;
             profile.HairName = appearance.HairStyleId;
             profile.HairColor = appearance.HairColor.ToHex();
             profile.FacialHairName = appearance.FacialHairStyleId;
diff --git a/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs b/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
index a0e9143eda9..8076ce00c8b 100644
--- a/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
+++ b/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
@@ -54,6 +54,7 @@ public void CloneAppearance(EntityUid source, EntityUid target, HumanoidAppearan
         targetHumanoid.SkinColor = sourceHumanoid.SkinColor;
         targetHumanoid.EyeColor = sourceHumanoid.EyeColor;
         targetHumanoid.Age = sourceHumanoid.Age;
+        targetHumanoid.Height = sourceHumanoid.Height;
         SetSex(target, sourceHumanoid.Sex, false, targetHumanoid);
         targetHumanoid.CustomBaseLayers = new(sourceHumanoid.CustomBaseLayers);
         targetHumanoid.MarkingSet = new(sourceHumanoid.MarkingSet);
diff --git a/Content.Shared/Humanoid/HumanoidAppearanceComponent.cs b/Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
index 4785482ada4..642b00f24e5 100644
--- a/Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
+++ b/Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
@@ -90,6 +90,10 @@ public sealed partial class HumanoidAppearanceComponent : Component
     /// </summary>
     [ViewVariables]
     public HumanoidCharacterProfile? LastProfileLoaded;
+    ///     The height of this humanoid.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float Height = 1f;
 }
 
 [DataDefinition]
diff --git a/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs b/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
index 8564ebe8e16..20fe17b033e 100644
--- a/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
+++ b/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
@@ -126,6 +126,42 @@ public sealed partial class SpeciesPrototype : IPrototype
     /// </summary>
     [DataField]
     public string GuideBookIcon = "SpeciesInfoDefault";
+
+    /// <summary>
+    /// The minimum height for this species
+    /// </summary>
+    [DataField("minHeight")]
+    public float MinHeight = 0.7f;
+
+    /// <summary>
+    /// The maximum height for this species
+    /// </summary>
+    [DataField("maxHeight")]
+    public float MaxHeight = 1.5f;
+
+    /// <summary>
+    /// The default height for this species
+    /// </summary>
+    [DataField("defaultHeight")]
+    public float DefaultHeight = 1f;
+
+    /// <summary>
+    /// The default width for this species
+    /// </summary>
+    [DataField("defaultWidth")]
+    public float DefaultWidth = 1f;
+
+    /// <summary>
+    /// Whether to scale horizontally or not
+    /// </summary>
+    [DataField("scaleWidth")]
+    public bool ScaleWidth = true;
+
+    /// <summary>
+    /// Whether to scale vertically or not
+    /// </summary>
+    [DataField("scaleHeight")]
+    public bool ScaleHeight = true;
 }
 
 public enum SpeciesNaming : byte
diff --git a/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs b/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
index 4974e283dd5..5a778755e8f 100644
--- a/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
+++ b/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using Content.Shared.Decals;
+using System.Numerics;
 using Content.Shared.Humanoid.Markings;
 using Content.Shared.Humanoid.Prototypes;
 using Content.Shared.Preferences;
@@ -328,6 +329,7 @@ public virtual void LoadProfile(EntityUid uid, HumanoidCharacterProfile profile,
         }
 
         humanoid.Age = profile.Age;
+		humanoid.Height = profile.Height;
 
         humanoid.LastProfileLoaded = profile; // DeltaV - let paradox anomaly be cloned
 
diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
index ece9a82bb24..fbfd1eb73d4 100644
--- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs
+++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
@@ -35,6 +35,7 @@ private HumanoidCharacterProfile(
             string name,
             string flavortext,
             string species,
+            float height,
             int age,
             Sex sex,
             Gender gender,
@@ -51,6 +52,7 @@ private HumanoidCharacterProfile(
             Name = name;
             FlavorText = flavortext;
             Species = species;
+            Height = height;
             Age = age;
             Sex = sex;
             Gender = gender;
@@ -72,7 +74,7 @@ private HumanoidCharacterProfile(
             List<string> antagPreferences,
             List<string> traitPreferences,
             List<string> loadoutPreferences)
-            : this(other.Name, other.FlavorText, other.Species, other.Age, other.Sex, other.Gender, other.Appearance,
+            : this(other.Name, other.FlavorText, other.Species, other.Height, other.Age, other.Sex, other.Gender, other.Appearance,
                 other.Clothing, other.Backpack, other.SpawnPriority, jobPriorities, other.PreferenceUnavailable,
                 antagPreferences, traitPreferences, loadoutPreferences)
         {
@@ -90,6 +92,7 @@ public HumanoidCharacterProfile(
             string name,
             string flavortext,
             string species,
+            float height,
             int age,
             Sex sex,
             Gender gender,
@@ -102,7 +105,7 @@ public HumanoidCharacterProfile(
             IReadOnlyList<string> antagPreferences,
             IReadOnlyList<string> traitPreferences,
             IReadOnlyList<string> loadoutPreferences)
-            : this(name, flavortext, species, age, sex, gender, appearance, clothing, backpack, spawnPriority,
+            : this(name, flavortext, species, height, age, sex, gender, appearance, clothing, backpack, spawnPriority,
                 new Dictionary<string, JobPriority>(jobPriorities), preferenceUnavailable,
                 new List<string>(antagPreferences), new List<string>(traitPreferences),
                 new List<string>(loadoutPreferences))
@@ -118,6 +121,7 @@ public HumanoidCharacterProfile() : this(
             "John Doe",
             "",
             SharedHumanoidAppearanceSystem.DefaultSpecies,
+            1f,
             18,
             Sex.Male,
             Gender.Male,
@@ -147,6 +151,7 @@ public static HumanoidCharacterProfile DefaultWithSpecies(string species = Share
                 "John Doe",
                 "",
                 species,
+                1f,
                 18,
                 Sex.Male,
                 Gender.Male,
@@ -186,10 +191,12 @@ public static HumanoidCharacterProfile RandomWithSpecies(string species = Shared
 
             var sex = Sex.Unsexed;
             var age = 18;
+            var height = 1f;
             if (prototypeManager.TryIndex<SpeciesPrototype>(species, out var speciesPrototype))
             {
                 sex = random.Pick(speciesPrototype.Sexes);
                 age = random.Next(speciesPrototype.MinAge, speciesPrototype.OldAge); // people don't look and keep making 119 year old characters with zero rp, cap it at middle aged
+                height = random.NextFloat(speciesPrototype.MinHeight, speciesPrototype.MaxHeight);
             }
 
             var gender = Gender.Epicene;
@@ -206,7 +213,7 @@ public static HumanoidCharacterProfile RandomWithSpecies(string species = Shared
 
             var name = GetName(species, gender);
 
-            return new HumanoidCharacterProfile(name, "", species, age, sex, gender,
+            return new HumanoidCharacterProfile(name, "", species, height, age, sex, gender,
                 HumanoidCharacterAppearance.Random(species, sex), ClothingPreference.Jumpsuit,
                 BackpackPreference.Backpack, SpawnPriorityPreference.None,
                 new Dictionary<string, JobPriority>
@@ -219,6 +226,9 @@ public static HumanoidCharacterProfile RandomWithSpecies(string species = Shared
         public string FlavorText { get; private set; }
         public string Species { get; private set; }
 
+        [DataField("height")]
+        public float Height { get; private set; }
+
         [DataField("age")]
         public int Age { get; private set; }
 
@@ -271,6 +281,10 @@ public HumanoidCharacterProfile WithSpecies(string species)
             return new(this) { Species = species };
         }
 
+        public HumanoidCharacterProfile WithHeight(float height)
+        {
+            return new(this) { Height = height };
+        }
 
         public HumanoidCharacterProfile WithCharacterAppearance(HumanoidCharacterAppearance appearance)
         {
@@ -396,6 +410,7 @@ public bool MemberwiseEquals(ICharacterProfile maybeOther)
             if (maybeOther is not HumanoidCharacterProfile other ||
                 Name != other.Name ||
                 Age != other.Age ||
+                Height != other.Height ||
                 Sex != other.Sex ||
                 Gender != other.Gender ||
                 PreferenceUnavailable != other.PreferenceUnavailable ||
@@ -495,6 +510,10 @@ public void EnsureValid(IConfigurationManager configManager, IPrototypeManager p
                 flavortext = FormattedMessage.RemoveMarkup(FlavorText);
             }
 
+            var height = Height;
+            if (speciesPrototype != null)
+                height = Math.Clamp(MathF.Round(Height, 1), speciesPrototype.MinHeight, speciesPrototype.MaxHeight);
+
             var appearance = HumanoidCharacterAppearance.EnsureValid(Appearance, Species, Sex);
 
             var prefsUnavailableMode = PreferenceUnavailable switch
@@ -565,6 +584,7 @@ public void EnsureValid(IConfigurationManager configManager, IPrototypeManager p
             Name = name;
             FlavorText = flavortext;
             Age = age;
+            Height = height;
             Sex = sex;
             Gender = gender;
             Appearance = appearance;
@@ -625,6 +645,7 @@ public override int GetHashCode()
                     Backpack
                 ),
                 SpawnPriority,
+                Height,
                 PreferenceUnavailable,
                 _jobPriorities,
                 _antagPreferences,
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 b929da96554..3ec6c899d07 100644
--- a/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
+++ b/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
@@ -1,4 +1,5 @@
 humanoid-profile-editor-randomize-everything-button = Randomize everything
+humanoid-profile-editor-reset-height-button = Reset Height
 humanoid-profile-editor-name-label = Name:
 humanoid-profile-editor-name-random-button = Randomize
 humanoid-profile-editor-appearance-tab = Appearance
@@ -11,6 +12,7 @@ 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:
+humanoid-profile-editor-height-label = Height:
 humanoid-profile-editor-species-label = Species:
 humanoid-profile-editor-pronouns-label = Pronouns:
 humanoid-profile-editor-pronouns-male-text = He / Him
diff --git a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
index 7afc5cddd70..c5395360187 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
@@ -21,7 +21,6 @@
   - type: Sprite
     noRot: true
     drawdepth: Mobs
-    scale: 1, 0.8
   - type: Body
     prototype: Dwarf
     requiredLegs: 2
@@ -64,6 +63,3 @@
   parent: BaseSpeciesDummy
   id: MobDwarfDummy
   noSpawn: true
-  components:
-  - type: Sprite
-    scale: 1, 0.8
diff --git a/Resources/Prototypes/Species/dwarf.yml b/Resources/Prototypes/Species/dwarf.yml
index 86743ca2d66..4b68406790f 100644
--- a/Resources/Prototypes/Species/dwarf.yml
+++ b/Resources/Prototypes/Species/dwarf.yml
@@ -7,3 +7,8 @@
   markingLimits: MobHumanMarkingLimits
   dollPrototype: MobDwarfDummy
   skinColoration: HumanToned
+  defaultHeight: 0.8
+  minHeight: 0.6
+  maxHeight: 0.8
+  scaleHeight: false
+  scaleWidth: true

From 15b9a75521dd05a53a976f36a4c0059b6a4f5aea Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Thu, 13 Jun 2024 19:19:13 -0400
Subject: [PATCH 02/25] next

---
 .../Humanoid/HumanoidAppearanceSystem.cs      |  9 ++--
 .../Preferences/UI/HumanoidProfileEditor.xaml |  7 ++-
 .../UI/HumanoidProfileEditor.xaml.cs          | 53 ++++++++++---------
 ...r.cs => 20240127102028_Height.Designer.cs} |  0
 ...742_Height.cs => 20240127102028_Height.cs} |  0
 ...r.cs => 20240127102028_Height.Designer.cs} |  0
 ...028_Height.cs => 20240127102028_Height.cs} |  0
 Content.Server.Database/Model.cs              |  2 +-
 Content.Server/Database/ServerDbBase.cs       |  4 +-
 .../Systems/HumanoidAppearanceSystem.cs       |  2 +-
 .../Humanoid/HumanoidAppearanceComponent.cs   |  2 +-
 .../Humanoid/Prototypes/SpeciesPrototype.cs   | 21 ++------
 .../SharedHumanoidAppearanceSystem.cs         |  3 +-
 .../Preferences/HumanoidCharacterProfile.cs   | 26 +++++----
 .../ui/humanoid-profile-editor.ftl            |  4 +-
 Resources/Prototypes/Species/dwarf.yml        |  4 +-
 16 files changed, 67 insertions(+), 70 deletions(-)
 rename Content.Server.Database/Migrations/Postgres/{20230711102742_Height.Designer.cs => 20240127102028_Height.Designer.cs} (100%)
 rename Content.Server.Database/Migrations/Postgres/{20230711102742_Height.cs => 20240127102028_Height.cs} (100%)
 rename Content.Server.Database/Migrations/Sqlite/{20230711102028_Height.Designer.cs => 20240127102028_Height.Designer.cs} (100%)
 rename Content.Server.Database/Migrations/Sqlite/{20230711102028_Height.cs => 20240127102028_Height.cs} (100%)

diff --git a/Content.Client/Humanoid/HumanoidAppearanceSystem.cs b/Content.Client/Humanoid/HumanoidAppearanceSystem.cs
index f0b30601176..f4bd9d579d3 100644
--- a/Content.Client/Humanoid/HumanoidAppearanceSystem.cs
+++ b/Content.Client/Humanoid/HumanoidAppearanceSystem.cs
@@ -34,10 +34,11 @@ private void UpdateSprite(HumanoidAppearanceComponent component, SpriteComponent
         UpdateLayers(component, sprite);
         ApplyMarkingSet(component, sprite);
 
-        var speciesPrototype = _prototypeManager.Index<SpeciesPrototype>(component.Species);
-        var height = Math.Clamp(MathF.Round(component.Height, 1), speciesPrototype.MinHeight, speciesPrototype.MaxHeight); // should NOT be locked, at all
-
-        sprite.Scale = new Vector2(speciesPrototype.ScaleHeight ? height : 1f, height);
+        // Parkstation-HeightSlider Start
+        var speciesPrototype = _prototypeManager.Index(component.Species);
+        var height = Math.Clamp(component.Height, speciesPrototype.MinHeight, speciesPrototype.MaxHeight);
+        sprite.Scale = new Vector2(height, height);
+        // Parkstation-HeightSlider End
 
         sprite[sprite.LayerMapReserveBlank(HumanoidVisualLayers.Eyes)].Color = component.EyeColor;
     }
diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
index b5894d83fcc..b86067122b4 100644
--- a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
+++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
@@ -111,10 +111,9 @@
                                 </BoxContainer>
 								<!-- Height -->
                                 <BoxContainer HorizontalExpand="True">
-                                    <Label Text="{Loc 'humanoid-profile-editor-height-label'}" />
-                                    <Label Name="CHeightLabel" Text="1" />
-                                    <Button Name="CHeightReset" Text="{Loc 'humanoid-profile-editor-reset-height-button'}"/>
-                                    <LineEdit HorizontalAlignment="Right" HorizontalExpand="True" Name="CHeight" MinSize="40 0" Text="1.0" />
+                                    <Label Name="CHeightLabel" MinWidth="100" />
+                                    <Slider Name="CHeightSlider" MinValue="0.5" Value="1" MaxValue="1.5" HorizontalExpand="True" Margin="5 0 5 0" />
+                                    <Button Name="CHeightReset" Text="{Loc 'humanoid-profile-editor-reset-height-button'}" />
                                 </BoxContainer>
                             </BoxContainer>
                             <!-- Skin -->
diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
index 2d90868d78e..701b7a42028 100644
--- a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
@@ -3,6 +3,7 @@
 using System.Numerics;
 using System.Text;
 using Content.Client.Guidebook;
+using System.Text.RegularExpressions;
 using Content.Client.Humanoid;
 using Content.Client.Lobby.UI;
 using Content.Client.Message;
@@ -80,7 +81,7 @@ public sealed partial class HumanoidProfileEditor : Control
         private SingleMarkingPicker _hairPicker => CHairStylePicker;
         private SingleMarkingPicker _facialHairPicker => CFacialHairPicker;
         private EyeColorPicker _eyesPicker => CEyeColorPicker;
-        private LineEdit _heightPicker => CHeight;
+        private Slider _heightSlider => CHeightSlider; // Parkstation-HeightSlider
 
         private TabContainer _tabContainer => CTabContainer;
         private BoxContainer _jobList => CJobList;
@@ -117,8 +118,6 @@ public sealed partial class HumanoidProfileEditor : Control
 
         public event Action<HumanoidCharacterProfile, int>? OnProfileChanged;
 
-        private float _defaultHeight = 1f;
-
         public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IPrototypeManager prototypeManager,
             IEntityManager entityManager, IConfigurationManager configurationManager)
         {
@@ -209,34 +208,37 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
 
             #endregion Species
 
+            // Parkstation-HeightSlider Start
             #region Height
 
+            var prototype = _speciesList.Find(x => x.ID == Profile?.Species) ?? _speciesList.First();
+
+            _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));
 
-            _heightPicker.OnTextChanged += args =>
+            _heightSlider.OnValueChanged += args =>
             {
-                if (Profile is null || !float.TryParse(args.Text, out var newHeight))
+                if (Profile is null)
                     return;
 
-                var prototype = _prototypeManager.Index<SpeciesPrototype>(Profile.Species);
-
-                if (newHeight < prototype.MinHeight)
-                    newHeight = prototype.MinHeight;
+                prototype = _speciesList.Find(x => x.ID == Profile.Species) ?? _speciesList.First(); // Just in case
 
-                if (newHeight > prototype.MaxHeight)
-                    newHeight = prototype.MaxHeight;
-
-                CHeightLabel.Text = MathF.Round(newHeight, 1).ToString("G");
-                SetProfileHeight(MathF.Round(newHeight, 1));
+                var value = Math.Clamp(args.Value, prototype.MinHeight, prototype.MaxHeight);
+                var stringValue = Regex.Replace(value.ToString(CultureInfo.InvariantCulture), @"\.([0-9][0-9]).*", ".$1"); // Hide the extra decimals
+                CHeightLabel.Text = Loc.GetString("humanoid-profile-editor-height-label", ("height", stringValue));
+                SetProfileHeight(value);
             };
 
             CHeightReset.OnPressed += _ =>
             {
-                _heightPicker.Text = _defaultHeight.ToString(CultureInfo.InvariantCulture);
-                CHeightLabel.Text = _defaultHeight.ToString(CultureInfo.InvariantCulture);
-                SetProfileHeight(_defaultHeight);
+                _heightSlider.Value = prototype.DefaultHeight;
+                SetProfileHeight(prototype.DefaultHeight);
             };
 
             #endregion Height
+            // Parkstation-HeightSlider End
 
             #region Skin
 
@@ -944,11 +946,13 @@ private void SetSpawnPriority(SpawnPriorityPreference newSpawnPriority)
             IsDirty = true;
         }
 
+        // Parkstation-HeightSlider Start
         private void SetProfileHeight(float height)
         {
             Profile = Profile?.WithHeight(height);
             IsDirty = true;
         }
+        // Parkstation-HeightSlider End
 
         public void Save()
         {
@@ -1154,20 +1158,21 @@ private void UpdateSpawnPriorityControls()
             _spawnPriorityButton.SelectId((int) Profile.SpawnPriority);
         }
 
+        // Parkstation-HeightSlider Start
         private void UpdateHeightControls()
         {
             if (Profile == null)
-            {
                 return;
-            }
 
-            var species = _speciesList.Find(x => x.ID == Profile.Species);
-            if (species != null)
-                _defaultHeight = species.DefaultHeight;
+            var species = _speciesList.Find(x => x.ID == Profile.Species) ?? _speciesList.First();
 
-            _heightPicker.Text = Profile.Height.ToString();
-            CHeightLabel.Text = Profile.Height.ToString();
+            _heightSlider.MinValue = species.MinHeight;
+            _heightSlider.Value = Profile.Height;
+            _heightSlider.MaxValue = species.MaxHeight;
+            var stringValue = Regex.Replace(Profile.Height.ToString(CultureInfo.InvariantCulture), @"\.([0-9][0-9]).*", ".$1"); // Hide the extra decimals
+            CHeightLabel.Text = Loc.GetString("humanoid-profile-editor-height-label", ("height", stringValue));
         }
+        // Parkstation-HeightSlider End
 
         private void UpdateHairPickers()
         {
diff --git a/Content.Server.Database/Migrations/Postgres/20230711102742_Height.Designer.cs b/Content.Server.Database/Migrations/Postgres/20240127102028_Height.Designer.cs
similarity index 100%
rename from Content.Server.Database/Migrations/Postgres/20230711102742_Height.Designer.cs
rename to Content.Server.Database/Migrations/Postgres/20240127102028_Height.Designer.cs
diff --git a/Content.Server.Database/Migrations/Postgres/20230711102742_Height.cs b/Content.Server.Database/Migrations/Postgres/20240127102028_Height.cs
similarity index 100%
rename from Content.Server.Database/Migrations/Postgres/20230711102742_Height.cs
rename to Content.Server.Database/Migrations/Postgres/20240127102028_Height.cs
diff --git a/Content.Server.Database/Migrations/Sqlite/20230711102028_Height.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20240127102028_Height.Designer.cs
similarity index 100%
rename from Content.Server.Database/Migrations/Sqlite/20230711102028_Height.Designer.cs
rename to Content.Server.Database/Migrations/Sqlite/20240127102028_Height.Designer.cs
diff --git a/Content.Server.Database/Migrations/Sqlite/20230711102028_Height.cs b/Content.Server.Database/Migrations/Sqlite/20240127102028_Height.cs
similarity index 100%
rename from Content.Server.Database/Migrations/Sqlite/20230711102028_Height.cs
rename to Content.Server.Database/Migrations/Sqlite/20240127102028_Height.cs
diff --git a/Content.Server.Database/Model.cs b/Content.Server.Database/Model.cs
index 6ff3dfd48d6..7b39b415cb1 100644
--- a/Content.Server.Database/Model.cs
+++ b/Content.Server.Database/Model.cs
@@ -338,7 +338,7 @@ public class Profile
         public string Sex { get; set; } = null!;
         public string Gender { get; set; } = null!;
         public string Species { get; set; } = null!;
-        public float Height { get; set; } = 1f;
+        public float Height { get; set; } = 1f; // Parkstation-HeightSlider
         [Column(TypeName = "jsonb")] public JsonDocument? Markings { get; set; } = null!;
         public string HairName { get; set; } = null!;
         public string HairColor { get; set; } = null!;
diff --git a/Content.Server/Database/ServerDbBase.cs b/Content.Server/Database/ServerDbBase.cs
index eca4b0835e1..57213597340 100644
--- a/Content.Server/Database/ServerDbBase.cs
+++ b/Content.Server/Database/ServerDbBase.cs
@@ -216,7 +216,7 @@ private static HumanoidCharacterProfile ConvertProfiles(Profile profile)
                 profile.CharacterName,
                 profile.FlavorText,
                 profile.Species,
-                profile.Height,
+                profile.Height, // Parkstation-HeightSlider
                 profile.Age,
                 sex,
                 gender,
@@ -258,7 +258,7 @@ private static Profile ConvertProfiles(HumanoidCharacterProfile humanoid, int sl
             profile.Age = humanoid.Age;
             profile.Sex = humanoid.Sex.ToString();
             profile.Gender = humanoid.Gender.ToString();
-            profile.Height = humanoid.Height;
+            profile.Height = humanoid.Height; // Parkstation-HeightSlider
             profile.HairName = appearance.HairStyleId;
             profile.HairColor = appearance.HairColor.ToHex();
             profile.FacialHairName = appearance.FacialHairStyleId;
diff --git a/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs b/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
index 8076ce00c8b..da359927578 100644
--- a/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
+++ b/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
@@ -54,7 +54,7 @@ public void CloneAppearance(EntityUid source, EntityUid target, HumanoidAppearan
         targetHumanoid.SkinColor = sourceHumanoid.SkinColor;
         targetHumanoid.EyeColor = sourceHumanoid.EyeColor;
         targetHumanoid.Age = sourceHumanoid.Age;
-        targetHumanoid.Height = sourceHumanoid.Height;
+        targetHumanoid.Height = sourceHumanoid.Height; // Parkstation-HeightSlider
         SetSex(target, sourceHumanoid.Sex, false, targetHumanoid);
         targetHumanoid.CustomBaseLayers = new(sourceHumanoid.CustomBaseLayers);
         targetHumanoid.MarkingSet = new(sourceHumanoid.MarkingSet);
diff --git a/Content.Shared/Humanoid/HumanoidAppearanceComponent.cs b/Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
index 642b00f24e5..9033b186293 100644
--- a/Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
+++ b/Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
@@ -93,7 +93,7 @@ public sealed partial class HumanoidAppearanceComponent : Component
     ///     The height of this humanoid.
     /// </summary>
     [DataField, AutoNetworkedField]
-    public float Height = 1f;
+    public float Height = 1f; // Parkstation-HeightSlider
 }
 
 [DataDefinition]
diff --git a/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs b/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
index 20fe17b033e..b0f27007c12 100644
--- a/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
+++ b/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
@@ -121,6 +121,8 @@ public sealed partial class SpeciesPrototype : IPrototype
     [DataField]
     public int MaxAge = 120;
 
+
+    // Parkstation-HeightSlider Start
     /// <summary>
     ///     The Style used for the guidebook info link in the character profile editor
     /// </summary>
@@ -144,24 +146,7 @@ public sealed partial class SpeciesPrototype : IPrototype
     /// </summary>
     [DataField("defaultHeight")]
     public float DefaultHeight = 1f;
-
-    /// <summary>
-    /// The default width for this species
-    /// </summary>
-    [DataField("defaultWidth")]
-    public float DefaultWidth = 1f;
-
-    /// <summary>
-    /// Whether to scale horizontally or not
-    /// </summary>
-    [DataField("scaleWidth")]
-    public bool ScaleWidth = true;
-
-    /// <summary>
-    /// Whether to scale vertically or not
-    /// </summary>
-    [DataField("scaleHeight")]
-    public bool ScaleHeight = true;
+    // Parkstation-HeightSlider End
 }
 
 public enum SpeciesNaming : byte
diff --git a/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs b/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
index 5a778755e8f..819c7ea03fa 100644
--- a/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
+++ b/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
@@ -1,6 +1,5 @@
 using System.Linq;
 using Content.Shared.Decals;
-using System.Numerics;
 using Content.Shared.Humanoid.Markings;
 using Content.Shared.Humanoid.Prototypes;
 using Content.Shared.Preferences;
@@ -329,7 +328,7 @@ public virtual void LoadProfile(EntityUid uid, HumanoidCharacterProfile profile,
         }
 
         humanoid.Age = profile.Age;
-		humanoid.Height = profile.Height;
+		humanoid.Height = profile.Height; // Parkstation-HeightSlider
 
         humanoid.LastProfileLoaded = profile; // DeltaV - let paradox anomaly be cloned
 
diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
index fbfd1eb73d4..3701f154d14 100644
--- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs
+++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
@@ -35,7 +35,7 @@ private HumanoidCharacterProfile(
             string name,
             string flavortext,
             string species,
-            float height,
+            float height, // Parkstation-HeightSlider
             int age,
             Sex sex,
             Gender gender,
@@ -52,7 +52,7 @@ private HumanoidCharacterProfile(
             Name = name;
             FlavorText = flavortext;
             Species = species;
-            Height = height;
+            Height = height; // Parkstation-HeightSlider
             Age = age;
             Sex = sex;
             Gender = gender;
@@ -92,7 +92,7 @@ public HumanoidCharacterProfile(
             string name,
             string flavortext,
             string species,
-            float height,
+            float height, // Parkstation-HeightSlider
             int age,
             Sex sex,
             Gender gender,
@@ -121,7 +121,7 @@ public HumanoidCharacterProfile() : this(
             "John Doe",
             "",
             SharedHumanoidAppearanceSystem.DefaultSpecies,
-            1f,
+            1f, // Parkstation-HeightSlider
             18,
             Sex.Male,
             Gender.Male,
@@ -151,7 +151,7 @@ public static HumanoidCharacterProfile DefaultWithSpecies(string species = Share
                 "John Doe",
                 "",
                 species,
-                1f,
+                1f, // Parkstation-HeightSlider
                 18,
                 Sex.Male,
                 Gender.Male,
@@ -191,12 +191,12 @@ public static HumanoidCharacterProfile RandomWithSpecies(string species = Shared
 
             var sex = Sex.Unsexed;
             var age = 18;
-            var height = 1f;
+            var height = 1f; // Parkstation-HeightSlider
             if (prototypeManager.TryIndex<SpeciesPrototype>(species, out var speciesPrototype))
             {
                 sex = random.Pick(speciesPrototype.Sexes);
                 age = random.Next(speciesPrototype.MinAge, speciesPrototype.OldAge); // people don't look and keep making 119 year old characters with zero rp, cap it at middle aged
-                height = random.NextFloat(speciesPrototype.MinHeight, speciesPrototype.MaxHeight);
+                height = random.NextFloat(speciesPrototype.MinHeight, speciesPrototype.MaxHeight); // Parkstation-HeightSlider
             }
 
             var gender = Gender.Epicene;
@@ -227,7 +227,7 @@ public static HumanoidCharacterProfile RandomWithSpecies(string species = Shared
         public string Species { get; private set; }
 
         [DataField("height")]
-        public float Height { get; private set; }
+        public float Height { get; private set; } // Parkstation-HeightSlider
 
         [DataField("age")]
         public int Age { get; private set; }
@@ -281,10 +281,12 @@ public HumanoidCharacterProfile WithSpecies(string species)
             return new(this) { Species = species };
         }
 
+        // Parkstation-HeightSlider Start
         public HumanoidCharacterProfile WithHeight(float height)
         {
             return new(this) { Height = height };
         }
+        // Parkstation-HeightSlider End
 
         public HumanoidCharacterProfile WithCharacterAppearance(HumanoidCharacterAppearance appearance)
         {
@@ -510,9 +512,11 @@ public void EnsureValid(IConfigurationManager configManager, IPrototypeManager p
                 flavortext = FormattedMessage.RemoveMarkup(FlavorText);
             }
 
+            // Parkstation-HeightSlider Start
             var height = Height;
             if (speciesPrototype != null)
-                height = Math.Clamp(MathF.Round(Height, 1), speciesPrototype.MinHeight, speciesPrototype.MaxHeight);
+                height = Math.Clamp(Height, speciesPrototype.MinHeight, speciesPrototype.MaxHeight);
+            // Parkstation-HeightSlider End
 
             var appearance = HumanoidCharacterAppearance.EnsureValid(Appearance, Species, Sex);
 
@@ -584,7 +588,7 @@ public void EnsureValid(IConfigurationManager configManager, IPrototypeManager p
             Name = name;
             FlavorText = flavortext;
             Age = age;
-            Height = height;
+            Height = height; // Parkstation-HeightSlider
             Sex = sex;
             Gender = gender;
             Appearance = appearance;
@@ -645,7 +649,7 @@ public override int GetHashCode()
                     Backpack
                 ),
                 SpawnPriority,
-                Height,
+                Height, // Parkstation-HeightSlider
                 PreferenceUnavailable,
                 _jobPriorities,
                 _antagPreferences,
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 3ec6c899d07..d6af72426cb 100644
--- a/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
+++ b/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
@@ -1,4 +1,5 @@
 humanoid-profile-editor-randomize-everything-button = Randomize everything
+# CosmaticDrift-HeightSlider
 humanoid-profile-editor-reset-height-button = Reset Height
 humanoid-profile-editor-name-label = Name:
 humanoid-profile-editor-name-random-button = Randomize
@@ -12,7 +13,8 @@ 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:
-humanoid-profile-editor-height-label = Height:
+# CosmaticDrift-HeightSlider
+humanoid-profile-editor-height-label = Height: {$height}x
 humanoid-profile-editor-species-label = Species:
 humanoid-profile-editor-pronouns-label = Pronouns:
 humanoid-profile-editor-pronouns-male-text = He / Him
diff --git a/Resources/Prototypes/Species/dwarf.yml b/Resources/Prototypes/Species/dwarf.yml
index 4b68406790f..dd790055f49 100644
--- a/Resources/Prototypes/Species/dwarf.yml
+++ b/Resources/Prototypes/Species/dwarf.yml
@@ -7,8 +7,10 @@
   markingLimits: MobHumanMarkingLimits
   dollPrototype: MobDwarfDummy
   skinColoration: HumanToned
-  defaultHeight: 0.8
+  # Parkstation-HeightSlider Start
   minHeight: 0.6
+  defaultHeight: 0.8
   maxHeight: 0.8
+  # Parkstation-HeightSlider End
   scaleHeight: false
   scaleWidth: true

From b080e936466722c7b14c56ed950582d7a9fd138c Mon Sep 17 00:00:00 2001
From: DEATHB4DEFEAT <zachcaffee@outlook.com>
Date: Sat, 27 Jan 2024 21:49:46 -0800
Subject: [PATCH 03/25] adjust fixutre size and zoom and changed default scales

---
 .../Humanoid/Prototypes/SpeciesPrototype.cs   |  4 +-
 .../SharedHumanoidAppearanceSystem.cs         |  7 +++-
 .../HeightAdjust/HeightAdjustSystem.cs        | 37 +++++++++++++++++++
 3 files changed, 45 insertions(+), 3 deletions(-)
 create mode 100644 Content.Shared/SimpleStation14/HeightAdjust/HeightAdjustSystem.cs

diff --git a/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs b/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
index b0f27007c12..b1ea16d4e6c 100644
--- a/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
+++ b/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
@@ -133,13 +133,13 @@ public sealed partial class SpeciesPrototype : IPrototype
     /// The minimum height for this species
     /// </summary>
     [DataField("minHeight")]
-    public float MinHeight = 0.7f;
+    public float MinHeight = 0.75f;
 
     /// <summary>
     /// The maximum height for this species
     /// </summary>
     [DataField("maxHeight")]
-    public float MaxHeight = 1.5f;
+    public float MaxHeight = 1.25f;
 
     /// <summary>
     /// The default height for this species
diff --git a/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs b/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
index 819c7ea03fa..149741b617f 100644
--- a/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
+++ b/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
@@ -3,6 +3,7 @@
 using Content.Shared.Humanoid.Markings;
 using Content.Shared.Humanoid.Prototypes;
 using Content.Shared.Preferences;
+using Content.Shared.SimpleStation14.HeightAdjust;
 using Robust.Shared.GameObjects.Components.Localization;
 using Robust.Shared.Network;
 using Robust.Shared.Prototypes;
@@ -23,6 +24,7 @@ public abstract class SharedHumanoidAppearanceSystem : EntitySystem
     [Dependency] private readonly INetManager _netManager = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly MarkingManager _markingManager = default!;
+    [Dependency] private readonly HeightAdjustSystem _heightAdjust = default!;
 
     [ValidatePrototypeId<SpeciesPrototype>]
     public const string DefaultSpecies = "Human";
@@ -328,7 +330,10 @@ public virtual void LoadProfile(EntityUid uid, HumanoidCharacterProfile profile,
         }
 
         humanoid.Age = profile.Age;
-		humanoid.Height = profile.Height; // Parkstation-HeightSlider
+        // Parkstation-HeightSlider Start
+		humanoid.Height = profile.Height;
+        _heightAdjust.SetScale(uid, profile.Height);
+        // Parkstation-HeightSlider End
 
         humanoid.LastProfileLoaded = profile; // DeltaV - let paradox anomaly be cloned
 
diff --git a/Content.Shared/SimpleStation14/HeightAdjust/HeightAdjustSystem.cs b/Content.Shared/SimpleStation14/HeightAdjust/HeightAdjustSystem.cs
new file mode 100644
index 00000000000..fc8eeb84c07
--- /dev/null
+++ b/Content.Shared/SimpleStation14/HeightAdjust/HeightAdjustSystem.cs
@@ -0,0 +1,37 @@
+using Content.Shared.Movement.Components;
+using Content.Shared.Movement.Systems;
+using Robust.Shared.Physics;
+using Robust.Shared.Physics.Systems;
+
+namespace Content.Shared.SimpleStation14.HeightAdjust;
+
+public sealed class HeightAdjustSystem : EntitySystem
+{
+    [Dependency] private readonly SharedPhysicsSystem _physics = default!;
+    [Dependency] private readonly SharedContentEyeSystem _eye = default!;
+
+
+    /// <summary>
+    ///     Changes the density of fixtures and zoom of eyes based on a provided float scale
+    /// </summary>
+    /// <param name="uid">The entity to modify values for</param>
+    /// <param name="scale">The scale to multiply values by</param>
+    /// <returns>True if both operations succeeded</returns>
+    public bool SetScale(EntityUid uid, float scale)
+    {
+        var succeeded = true;
+        if (EntityManager.TryGetComponent<ContentEyeComponent>(uid, out var eye))
+            _eye.SetMaxZoom(uid, eye.MaxZoom * scale);
+        else
+            succeeded = false;
+
+        if (EntityManager.TryGetComponent<FixturesComponent>(uid, out var fixtures))
+            foreach (var fixture in fixtures.Fixtures)
+                // _physics.SetDensity(uid, fixture.Key, fixture.Value, fixture.Value.Density * scale); // If you want to do the same thing without changing size
+                _physics.SetRadius(uid, fixture.Key, fixture.Value, fixture.Value.Shape, fixture.Value.Shape.Radius * scale);
+        else
+            succeeded = false;
+
+        return succeeded;
+    }
+}

From 899ede927fa88f3d210602cabddb6fc3065ec582 Mon Sep 17 00:00:00 2001
From: DEATHB4DEFEAT <zachcaffee@outlook.com>
Date: Sat, 27 Jan 2024 21:59:40 -0800
Subject: [PATCH 04/25] Merge remote-tracking branch
 'Parkstation-new/height-slider' into port-height-sliders

---
 Resources/Prototypes/DeltaV/Species/harpy.yml        | 5 +++++
 Resources/Prototypes/Nyanotrasen/Species/felinid.yml | 3 +++
 Resources/Prototypes/Species/reptilian.yml           | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/Resources/Prototypes/DeltaV/Species/harpy.yml b/Resources/Prototypes/DeltaV/Species/harpy.yml
index bcc4dd22c44..ca743149dbd 100644
--- a/Resources/Prototypes/DeltaV/Species/harpy.yml
+++ b/Resources/Prototypes/DeltaV/Species/harpy.yml
@@ -7,6 +7,11 @@
   markingLimits: MobHarpyMarkingLimits
   dollPrototype: MobHarpyDummy
   skinColoration: HumanToned
+  # Parkstation-HeightSlider Start
+  minHeight: 0.6
+  defaultHeight: 0.8
+  maxHeight: 1.1
+  # Parkstation-HeightSlider End
 
 - type: speciesBaseSprites
   id: MobHarpySprites
diff --git a/Resources/Prototypes/Nyanotrasen/Species/felinid.yml b/Resources/Prototypes/Nyanotrasen/Species/felinid.yml
index 754a4ae906b..3f36baead10 100644
--- a/Resources/Prototypes/Nyanotrasen/Species/felinid.yml
+++ b/Resources/Prototypes/Nyanotrasen/Species/felinid.yml
@@ -7,6 +7,9 @@
   markingLimits: MobFelinidMarkingLimits
   dollPrototype: MobFelinidDummy
   skinColoration: HumanToned
+  minHeight: 0.65
+  defaultHeight: 0.8
+  maxHeight: 1.1
 
 - type: markingPoints
   id: MobFelinidMarkingLimits
diff --git a/Resources/Prototypes/Species/reptilian.yml b/Resources/Prototypes/Species/reptilian.yml
index f5cf1fa6ebf..5d6f34986d3 100644
--- a/Resources/Prototypes/Species/reptilian.yml
+++ b/Resources/Prototypes/Species/reptilian.yml
@@ -11,6 +11,10 @@
   maleFirstNames: names_reptilian_male
   femaleFirstNames: names_reptilian_female
   naming: FirstDashFirst
+  # Parkstation-HeightSlider Start
+  minHeight: 0.7
+  defaultHeight: 0.95
+  # Parkstation-HeightSlider End
 
 - type: speciesBaseSprites
   id: MobReptilianSprites

From 166c2820dbcc42fcd8b5315827bc3270f19c6dd9 Mon Sep 17 00:00:00 2001
From: DEATHB4DEFEAT <zachcaffee@outlook.com>
Date: Sat, 27 Jan 2024 22:20:02 -0800
Subject: [PATCH 05/25] remove datafields that don't exist anymore

---
 Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs | 6 +++---
 Resources/Prototypes/Species/dwarf.yml                 | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs b/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
index b1ea16d4e6c..af749a69216 100644
--- a/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
+++ b/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
@@ -132,19 +132,19 @@ public sealed partial class SpeciesPrototype : IPrototype
     /// <summary>
     /// The minimum height for this species
     /// </summary>
-    [DataField("minHeight")]
+    [DataField]
     public float MinHeight = 0.75f;
 
     /// <summary>
     /// The maximum height for this species
     /// </summary>
-    [DataField("maxHeight")]
+    [DataField]
     public float MaxHeight = 1.25f;
 
     /// <summary>
     /// The default height for this species
     /// </summary>
-    [DataField("defaultHeight")]
+    [DataField]
     public float DefaultHeight = 1f;
     // Parkstation-HeightSlider End
 }
diff --git a/Resources/Prototypes/Species/dwarf.yml b/Resources/Prototypes/Species/dwarf.yml
index dd790055f49..643791ef37b 100644
--- a/Resources/Prototypes/Species/dwarf.yml
+++ b/Resources/Prototypes/Species/dwarf.yml
@@ -12,5 +12,3 @@
   defaultHeight: 0.8
   maxHeight: 0.8
   # Parkstation-HeightSlider End
-  scaleHeight: false
-  scaleWidth: true

From bb6b29ba8478d085a3dd06c5b369e8a473a01787 Mon Sep 17 00:00:00 2001
From: DEATHB4DEFEAT <zachcaffee@outlook.com>
Date: Sun, 4 Feb 2024 17:19:49 -0800
Subject: [PATCH 06/25] use string manipulation instead of Regex what was I
 thinking??

---
 Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
index 701b7a42028..be9995793c2 100644
--- a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
@@ -226,8 +226,7 @@ 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 stringValue = Regex.Replace(value.ToString(CultureInfo.InvariantCulture), @"\.([0-9][0-9]).*", ".$1"); // Hide the extra decimals
-                CHeightLabel.Text = Loc.GetString("humanoid-profile-editor-height-label", ("height", stringValue));
+                CHeightLabel.Text = Loc.GetString("humanoid-profile-editor-height-label", ("height", Profile.Height.ToString().Remove(4)));
                 SetProfileHeight(value);
             };
 
@@ -1169,8 +1168,7 @@ private void UpdateHeightControls()
             _heightSlider.MinValue = species.MinHeight;
             _heightSlider.Value = Profile.Height;
             _heightSlider.MaxValue = species.MaxHeight;
-            var stringValue = Regex.Replace(Profile.Height.ToString(CultureInfo.InvariantCulture), @"\.([0-9][0-9]).*", ".$1"); // Hide the extra decimals
-            CHeightLabel.Text = Loc.GetString("humanoid-profile-editor-height-label", ("height", stringValue));
+            CHeightLabel.Text = Loc.GetString("humanoid-profile-editor-height-label", ("height", Profile.Height.ToString().Remove(4)));
         }
         // Parkstation-HeightSlider End
 

From 8264ea7f1db17b961ae904260c3f4b95484a07c2 Mon Sep 17 00:00:00 2001
From: DEATHB4DEFEAT <zachcaffee@outlook.com>
Date: Sun, 4 Feb 2024 18:37:32 -0800
Subject: [PATCH 07/25] fix height label and default species heights

---
 .../Humanoid/HumanoidAppearanceSystem.cs      |  3 ---
 .../UI/HumanoidProfileEditor.xaml.cs          |  7 ++++--
 .../SharedHumanoidAppearanceSystem.cs         | 25 ++++++++++++++++---
 .../Preferences/HumanoidCharacterProfile.cs   |  1 +
 .../HeightAdjust/HeightAdjustSystem.cs        | 15 +++++++++--
 .../Entities/Mobs/Species/felinid.yml         |  1 +
 .../humanoidProfiles/felinid.yml              |  5 ++++
 7 files changed, 46 insertions(+), 11 deletions(-)
 create mode 100644 Resources/Prototypes/SimpleStation14/humanoidProfiles/felinid.yml

diff --git a/Content.Client/Humanoid/HumanoidAppearanceSystem.cs b/Content.Client/Humanoid/HumanoidAppearanceSystem.cs
index f4bd9d579d3..a9be029ab8e 100644
--- a/Content.Client/Humanoid/HumanoidAppearanceSystem.cs
+++ b/Content.Client/Humanoid/HumanoidAppearanceSystem.cs
@@ -4,7 +4,6 @@
 using Content.Shared.Humanoid.Prototypes;
 using Content.Shared.Preferences;
 using Robust.Client.GameObjects;
-using Robust.Client.Console;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
@@ -14,8 +13,6 @@ public sealed class HumanoidAppearanceSystem : SharedHumanoidAppearanceSystem
 {
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly MarkingManager _markingManager = default!;
-    [Dependency] private readonly IEntityManager _entityManager = default!;
-    [Dependency] private readonly IClientConsoleHost _consoleHost = default!;
 
     public override void Initialize()
     {
diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
index be9995793c2..3c024dbae1b 100644
--- a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
@@ -226,7 +226,8 @@ 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);
-                CHeightLabel.Text = Loc.GetString("humanoid-profile-editor-height-label", ("height", Profile.Height.ToString().Remove(4)));
+                var height = value.ToString(CultureInfo.InvariantCulture);
+                CHeightLabel.Text = Loc.GetString("humanoid-profile-editor-height-label", ("height", height.Length > 4 ? height[..4] : height));
                 SetProfileHeight(value);
             };
 
@@ -1168,7 +1169,9 @@ private void UpdateHeightControls()
             _heightSlider.MinValue = species.MinHeight;
             _heightSlider.Value = Profile.Height;
             _heightSlider.MaxValue = species.MaxHeight;
-            CHeightLabel.Text = Loc.GetString("humanoid-profile-editor-height-label", ("height", Profile.Height.ToString().Remove(4)));
+
+            var height = Profile.Height.ToString(CultureInfo.InvariantCulture);
+            CHeightLabel.Text = Loc.GetString("humanoid-profile-editor-height-label", ("height", height.Length > 4 ? height[..4] : height));
         }
         // Parkstation-HeightSlider End
 
diff --git a/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs b/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
index 149741b617f..8009f02bfda 100644
--- a/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
+++ b/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
@@ -250,6 +250,26 @@ public void SetSex(EntityUid uid, Sex sex, bool sync = true, HumanoidAppearanceC
         }
     }
 
+    // Parkstation-HeightSlider Start
+    /// <summary>
+    ///     Set a humanoid mob's sex. This will not change their gender.
+    /// </summary>
+    /// <param name="uid">The humanoid mob's UID.</param>
+    /// <param name="height">The height to set the mob to.</param>
+    /// <param name="sync">Whether to immediately synchronize this to the humanoid mob, or not.</param>
+    /// <param name="humanoid">Humanoid component of the entity</param>
+    public void SetHeight(EntityUid uid, float height, bool sync = true, HumanoidAppearanceComponent? humanoid = null)
+    {
+        if (!Resolve(uid, ref humanoid) || Math.Abs(humanoid.Height - height) < 0.01f)
+            return;
+
+        humanoid.Height = height;
+
+        if (sync)
+            Dirty(humanoid);
+    }
+    // Parkstation-HeightSlider End
+
     /// <summary>
     ///     Loads a humanoid character profile directly onto this humanoid mob.
     /// </summary>
@@ -330,10 +350,7 @@ public virtual void LoadProfile(EntityUid uid, HumanoidCharacterProfile profile,
         }
 
         humanoid.Age = profile.Age;
-        // Parkstation-HeightSlider Start
-		humanoid.Height = profile.Height;
-        _heightAdjust.SetScale(uid, profile.Height);
-        // Parkstation-HeightSlider End
+        _heightAdjust.SetScale(uid, profile.Height); // Parkstation-HeightSlider
 
         humanoid.LastProfileLoaded = profile; // DeltaV - let paradox anomaly be cloned
 
diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
index 3701f154d14..ea985152b3b 100644
--- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs
+++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
@@ -224,6 +224,7 @@ public static HumanoidCharacterProfile RandomWithSpecies(string species = Shared
 
         public string Name { get; private set; }
         public string FlavorText { get; private set; }
+        [DataField("species")] // Parkstation-HeightSlider // :)
         public string Species { get; private set; }
 
         [DataField("height")]
diff --git a/Content.Shared/SimpleStation14/HeightAdjust/HeightAdjustSystem.cs b/Content.Shared/SimpleStation14/HeightAdjust/HeightAdjustSystem.cs
index fc8eeb84c07..b34367eee3b 100644
--- a/Content.Shared/SimpleStation14/HeightAdjust/HeightAdjustSystem.cs
+++ b/Content.Shared/SimpleStation14/HeightAdjust/HeightAdjustSystem.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Humanoid;
 using Content.Shared.Movement.Components;
 using Content.Shared.Movement.Systems;
 using Robust.Shared.Physics;
@@ -9,6 +10,7 @@ public sealed class HeightAdjustSystem : EntitySystem
 {
     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
     [Dependency] private readonly SharedContentEyeSystem _eye = default!;
+    [Dependency] private readonly SharedHumanoidAppearanceSystem _appearance = default!;
 
 
     /// <summary>
@@ -16,7 +18,7 @@ public sealed class HeightAdjustSystem : EntitySystem
     /// </summary>
     /// <param name="uid">The entity to modify values for</param>
     /// <param name="scale">The scale to multiply values by</param>
-    /// <returns>True if both operations succeeded</returns>
+    /// <returns>True if all operations succeeded</returns>
     public bool SetScale(EntityUid uid, float scale)
     {
         var succeeded = true;
@@ -26,9 +28,18 @@ public bool SetScale(EntityUid uid, float scale)
             succeeded = false;
 
         if (EntityManager.TryGetComponent<FixturesComponent>(uid, out var fixtures))
+        {
             foreach (var fixture in fixtures.Fixtures)
-                // _physics.SetDensity(uid, fixture.Key, fixture.Value, fixture.Value.Density * scale); // If you want to do the same thing without changing size
+            {
+                // _physics.SetDensity(uid, fixture.Key, fixture.Value, fixture.Value.Density * scale); // This does the same thing as below, just without modifying the fixture size
                 _physics.SetRadius(uid, fixture.Key, fixture.Value, fixture.Value.Shape, fixture.Value.Shape.Radius * scale);
+            }
+        }
+        else
+            succeeded = false;
+
+        if (EntityManager.HasComponent<HumanoidAppearanceComponent>(uid))
+            _appearance.SetHeight(uid, scale);
         else
             succeeded = false;
 
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml
index 2184926b95a..5bc02461eed 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml
@@ -9,6 +9,7 @@
     scale: 0.8, 0.8
   - type: HumanoidAppearance
     species: Felinid
+    initial: Felinid
   - type: Fixtures
     fixtures: # TODO: This needs a second fixture just for mob collisions.
       fix1:
diff --git a/Resources/Prototypes/SimpleStation14/humanoidProfiles/felinid.yml b/Resources/Prototypes/SimpleStation14/humanoidProfiles/felinid.yml
new file mode 100644
index 00000000000..e846b15f339
--- /dev/null
+++ b/Resources/Prototypes/SimpleStation14/humanoidProfiles/felinid.yml
@@ -0,0 +1,5 @@
+- type: humanoidProfile
+  id: Felinid
+  profile:
+    species: Felinid
+    height: 0.8

From b2fbfae4f00ca9e9c433ae67541785e583c268c6 Mon Sep 17 00:00:00 2001
From: DEATHB4DEFEAT <zachcaffee@outlook.com>
Date: Sat, 10 Feb 2024 12:49:25 -0800
Subject: [PATCH 08/25] review changes

---
 Content.Client/Humanoid/HumanoidAppearanceSystem.cs       | 1 +
 Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Content.Client/Humanoid/HumanoidAppearanceSystem.cs b/Content.Client/Humanoid/HumanoidAppearanceSystem.cs
index a9be029ab8e..21110ee9232 100644
--- a/Content.Client/Humanoid/HumanoidAppearanceSystem.cs
+++ b/Content.Client/Humanoid/HumanoidAppearanceSystem.cs
@@ -35,6 +35,7 @@ private void UpdateSprite(HumanoidAppearanceComponent component, SpriteComponent
         var speciesPrototype = _prototypeManager.Index(component.Species);
         var height = Math.Clamp(component.Height, speciesPrototype.MinHeight, speciesPrototype.MaxHeight);
         sprite.Scale = new Vector2(height, height);
+        component.Height = height;
         // Parkstation-HeightSlider End
 
         sprite[sprite.LayerMapReserveBlank(HumanoidVisualLayers.Eyes)].Color = component.EyeColor;
diff --git a/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs b/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
index 8009f02bfda..c4cfe6e2cf0 100644
--- a/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
+++ b/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
@@ -252,7 +252,7 @@ public void SetSex(EntityUid uid, Sex sex, bool sync = true, HumanoidAppearanceC
 
     // Parkstation-HeightSlider Start
     /// <summary>
-    ///     Set a humanoid mob's sex. This will not change their gender.
+    ///     Set the height (and width) of a humanoid mob.
     /// </summary>
     /// <param name="uid">The humanoid mob's UID.</param>
     /// <param name="height">The height to set the mob to.</param>
@@ -260,10 +260,11 @@ public void SetSex(EntityUid uid, Sex sex, bool sync = true, HumanoidAppearanceC
     /// <param name="humanoid">Humanoid component of the entity</param>
     public void SetHeight(EntityUid uid, float height, bool sync = true, HumanoidAppearanceComponent? humanoid = null)
     {
-        if (!Resolve(uid, ref humanoid) || Math.Abs(humanoid.Height - height) < 0.01f)
+        if (!Resolve(uid, ref humanoid) || MathHelper.CloseTo(humanoid.Height, height, 0.001f))
             return;
 
-        humanoid.Height = height;
+        var species = _prototypeManager.Index(humanoid.Species);
+        humanoid.Height = Math.Clamp(height, species.MinHeight, species.MaxHeight);
 
         if (sync)
             Dirty(humanoid);

From 7c68d37ca122c116960e18265a71dceb6765055e Mon Sep 17 00:00:00 2001
From: DEATHB4DEFEAT <zachcaffee@outlook.com>
Date: Sat, 10 Feb 2024 13:35:55 -0800
Subject: [PATCH 09/25] width

---
 .../Humanoid/HumanoidAppearanceSystem.cs      |  9 +++-
 .../Preferences/UI/HumanoidProfileEditor.xaml | 10 +++-
 .../UI/HumanoidProfileEditor.xaml.cs          | 49 +++++++++++++++++++
 .../Tests/Preferences/ServerDbSqliteTests.cs  |  3 +-
 .../20240127102028_Height.Designer.cs         |  8 ++-
 .../Postgres/20240127102028_Height.cs         | 13 ++++-
 .../PostgresServerDbContextModelSnapshot.cs   | 10 +++-
 .../Sqlite/20240127102028_Height.Designer.cs  |  8 ++-
 .../Sqlite/20240127102028_Height.cs           | 13 ++++-
 .../SqliteServerDbContextModelSnapshot.cs     |  8 ++-
 Content.Server.Database/Model.cs              |  1 +
 Content.Server/Database/ServerDbBase.cs       |  2 +
 .../Systems/HumanoidAppearanceSystem.cs       |  1 +
 .../Humanoid/HumanoidAppearanceComponent.cs   | 10 +++-
 .../Humanoid/Prototypes/SpeciesPrototype.cs   | 29 ++++++++---
 .../SharedHumanoidAppearanceSystem.cs         | 21 +++++++-
 .../Preferences/HumanoidCharacterProfile.cs   | 35 ++++++++++---
 .../HeightAdjust/HeightAdjustSystem.cs        |  3 ++
 .../ui/humanoid-profile-editor.ftl            |  5 +-
 Resources/Prototypes/DeltaV/Species/harpy.yml |  3 ++
 .../Nyanotrasen/Species/felinid.yml           |  3 ++
 .../humanoidProfiles/felinid.yml              |  1 +
 Resources/Prototypes/Species/dwarf.yml        |  3 ++
 Resources/Prototypes/Species/reptilian.yml    |  4 ++
 24 files changed, 220 insertions(+), 32 deletions(-)

diff --git a/Content.Client/Humanoid/HumanoidAppearanceSystem.cs b/Content.Client/Humanoid/HumanoidAppearanceSystem.cs
index 21110ee9232..6e4a19b554f 100644
--- a/Content.Client/Humanoid/HumanoidAppearanceSystem.cs
+++ b/Content.Client/Humanoid/HumanoidAppearanceSystem.cs
@@ -33,9 +33,13 @@ private void UpdateSprite(HumanoidAppearanceComponent component, SpriteComponent
 
         // Parkstation-HeightSlider Start
         var speciesPrototype = _prototypeManager.Index(component.Species);
+
         var height = Math.Clamp(component.Height, speciesPrototype.MinHeight, speciesPrototype.MaxHeight);
-        sprite.Scale = new Vector2(height, height);
+        var width = Math.Clamp(component.Width, speciesPrototype.MinWidth, speciesPrototype.MaxWidth);
         component.Height = height;
+        component.Width = width;
+
+        sprite.Scale = new Vector2(width, height);
         // Parkstation-HeightSlider End
 
         sprite[sprite.LayerMapReserveBlank(HumanoidVisualLayers.Eyes)].Color = component.EyeColor;
@@ -202,7 +206,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;
+        humanoid.Height = profile.Height; // Parkstation-HeightSlider
+        humanoid.Width = profile.Width; // Parkstation-HeightSlider
 
         UpdateSprite(humanoid, Comp<SpriteComponent>(uid));
     }
diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
index b86067122b4..2242720dace 100644
--- a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
+++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
@@ -111,9 +111,15 @@
                                 </BoxContainer>
 								<!-- Height -->
                                 <BoxContainer HorizontalExpand="True">
-                                    <Label Name="CHeightLabel" MinWidth="100" />
+                                    <Label Name="CHeightLabel" MinWidth="110" />
                                     <Slider Name="CHeightSlider" MinValue="0.5" Value="1" MaxValue="1.5" HorizontalExpand="True" Margin="5 0 5 0" />
-                                    <Button Name="CHeightReset" Text="{Loc 'humanoid-profile-editor-reset-height-button'}" />
+                                    <Button Name="CHeightReset" Text="{Loc 'ui-options-bind-reset'}" />
+                                </BoxContainer>
+                                <!-- Width -->
+                                <BoxContainer HorizontalExpand="True">
+                                    <Label Name="CWidthLabel" MinWidth="110" />
+                                    <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>
                             </BoxContainer>
                             <!-- Skin -->
diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
index 3c024dbae1b..33b8614c5e5 100644
--- a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
@@ -82,6 +82,7 @@ public sealed partial class HumanoidProfileEditor : Control
         private SingleMarkingPicker _facialHairPicker => CFacialHairPicker;
         private EyeColorPicker _eyesPicker => CEyeColorPicker;
         private Slider _heightSlider => CHeightSlider; // Parkstation-HeightSlider
+        private Slider _widthSlider => CWidthSlider; // Parkstation-HeightSlider
 
         private TabContainer _tabContainer => CTabContainer;
         private BoxContainer _jobList => CJobList;
@@ -213,6 +214,7 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
 
             var prototype = _speciesList.Find(x => x.ID == Profile?.Species) ?? _speciesList.First();
 
+
             _heightSlider.MinValue = prototype.MinHeight;
             _heightSlider.MaxValue = prototype.MaxHeight;
             _heightSlider.Value = Profile?.Height ?? prototype.DefaultHeight;
@@ -237,6 +239,31 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
                 SetProfileHeight(prototype.DefaultHeight);
             };
 
+
+            _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));
+
+            _widthSlider.OnValueChanged += args =>
+            {
+                if (Profile is null)
+                    return;
+
+                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));
+                SetProfileWidth(value);
+            };
+
+            CWidthReset.OnPressed += _ =>
+            {
+                _widthSlider.Value = prototype.DefaultWidth;
+                SetProfileWidth(prototype.DefaultWidth);
+            };
+
             #endregion Height
             // Parkstation-HeightSlider End
 
@@ -952,6 +979,12 @@ private void SetProfileHeight(float height)
             Profile = Profile?.WithHeight(height);
             IsDirty = true;
         }
+
+        private void SetProfileWidth(float width)
+        {
+            Profile = Profile?.WithWidth(width);
+            IsDirty = true;
+        }
         // Parkstation-HeightSlider End
 
         public void Save()
@@ -1173,6 +1206,21 @@ private void UpdateHeightControls()
             var height = Profile.Height.ToString(CultureInfo.InvariantCulture);
             CHeightLabel.Text = Loc.GetString("humanoid-profile-editor-height-label", ("height", height.Length > 4 ? height[..4] : height));
         }
+
+        private void UpdateWidthControls()
+        {
+            if (Profile == null)
+                return;
+
+            var species = _speciesList.Find(x => x.ID == Profile.Species) ?? _speciesList.First();
+
+            _widthSlider.MinValue = species.MinWidth;
+            _widthSlider.Value = Profile.Width;
+            _widthSlider.MaxValue = species.MaxWidth;
+
+            var width = Profile.Width.ToString(CultureInfo.InvariantCulture);
+            CWidthLabel.Text = Loc.GetString("humanoid-profile-editor-width-label", ("width", width.Length > 4 ? width[..4] : width));
+        }
         // Parkstation-HeightSlider End
 
         private void UpdateHairPickers()
@@ -1331,6 +1379,7 @@ public void UpdateControls()
             UpdateCMarkingsHair();
             UpdateCMarkingsFacialHair();
             UpdateHeightControls();
+            UpdateWidthControls();
 
             _preferenceUnavailableButton.SelectId((int) Profile.PreferenceUnavailable);
         }
diff --git a/Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs b/Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs
index 01c1cc864e0..95662adede4 100644
--- a/Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs
+++ b/Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs
@@ -41,7 +41,8 @@ private static HumanoidCharacterProfile CharlieCharlieson()
                 "Charlie Charlieson",
                 "The biggest boy around.",
                 "Human",
-                1,
+                1, // Parkstation-HeightSlider
+                1, // Parkstation-HeightSlider
                 21,
                 Sex.Male,
                 Gender.Epicene,
diff --git a/Content.Server.Database/Migrations/Postgres/20240127102028_Height.Designer.cs b/Content.Server.Database/Migrations/Postgres/20240127102028_Height.Designer.cs
index c932ec93a64..6720412dc34 100644
--- a/Content.Server.Database/Migrations/Postgres/20240127102028_Height.Designer.cs
+++ b/Content.Server.Database/Migrations/Postgres/20240127102028_Height.Designer.cs
@@ -14,8 +14,8 @@
 namespace Content.Server.Database.Migrations.Postgres
 {
     [DbContext(typeof(PostgresServerDbContext))]
-    [Migration("20230711102742_Height")]
-    partial class Height
+    [Migration("20230711102742_HeightWidth")]
+    partial class HeightWidth
     {
         /// <inheritdoc />
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -638,6 +638,10 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("real")
                         .HasColumnName("height");
 
+                    b.Property<float>("Width")
+                        .HasColumnType("real")
+                        .HasColumnName("width");
+
                     b.Property<JsonDocument>("Markings")
                         .HasColumnType("jsonb")
                         .HasColumnName("markings");
diff --git a/Content.Server.Database/Migrations/Postgres/20240127102028_Height.cs b/Content.Server.Database/Migrations/Postgres/20240127102028_Height.cs
index 8647022a5c4..35f49bc7413 100644
--- a/Content.Server.Database/Migrations/Postgres/20240127102028_Height.cs
+++ b/Content.Server.Database/Migrations/Postgres/20240127102028_Height.cs
@@ -5,7 +5,7 @@
 namespace Content.Server.Database.Migrations.Postgres
 {
     /// <inheritdoc />
-    public partial class Height : Migration
+    public partial class HeightWidth : Migration
     {
         /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)
@@ -16,6 +16,13 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 type: "REAL",
                 nullable: false,
                 defaultValue: 1f);
+
+            migrationBuilder.AddColumn<float>(
+                name: "width",
+                table: "profile",
+                type: "REAL",
+                nullable: false,
+                defaultValue: 1f);
         }
 
         /// <inheritdoc />
@@ -24,6 +31,10 @@ protected override void Down(MigrationBuilder migrationBuilder)
             migrationBuilder.DropColumn(
                 name: "height",
                 table: "profile");
+
+            migrationBuilder.DropColumn(
+                name: "width",
+                table: "profile");
         }
     }
 }
diff --git a/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs b/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
index 98cd1b3b044..f6ae50c269f 100644
--- a/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
+++ b/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
@@ -811,11 +811,17 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .IsRequired()
                         .HasColumnType("text")
                         .HasColumnName("hair_name");
-						
-					b.Property<float>("Height")
+
+					// Parkstation-HeightSlider Start
+                    b.Property<float>("Height")
                         .HasColumnType("real")
                         .HasColumnName("height");
 
+                    b.Property<float>("Width")
+                        .HasColumnType("real")
+                        .HasColumnName("width");
+                    // Parkstation-HeightSlider End
+
                     b.Property<JsonDocument>("Markings")
                         .HasColumnType("jsonb")
                         .HasColumnName("markings");
diff --git a/Content.Server.Database/Migrations/Sqlite/20240127102028_Height.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20240127102028_Height.Designer.cs
index 32e0d4e83c3..dde6b84e3c9 100644
--- a/Content.Server.Database/Migrations/Sqlite/20240127102028_Height.Designer.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20240127102028_Height.Designer.cs
@@ -11,8 +11,8 @@
 namespace Content.Server.Database.Migrations.Sqlite
 {
     [DbContext(typeof(SqliteServerDbContext))]
-    [Migration("20230711102028_Height")]
-    partial class Height
+    [Migration("20230711102028_HeightWidth")]
+    partial class HeightWidth
     {
         /// <inheritdoc />
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -592,6 +592,10 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("REAL")
                         .HasColumnName("height");
 
+                    b.Property<float>("Width")
+                        .HasColumnType("REAL")
+                        .HasColumnName("width");
+
                     b.Property<byte[]>("Markings")
                         .HasColumnType("jsonb")
                         .HasColumnName("markings");
diff --git a/Content.Server.Database/Migrations/Sqlite/20240127102028_Height.cs b/Content.Server.Database/Migrations/Sqlite/20240127102028_Height.cs
index 39d748446b4..f05ad96859d 100644
--- a/Content.Server.Database/Migrations/Sqlite/20240127102028_Height.cs
+++ b/Content.Server.Database/Migrations/Sqlite/20240127102028_Height.cs
@@ -5,7 +5,7 @@
 namespace Content.Server.Database.Migrations.Sqlite
 {
     /// <inheritdoc />
-    public partial class Height : Migration
+    public partial class HeightWidth : Migration
     {
         /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)
@@ -16,6 +16,13 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 type: "REAL",
                 nullable: false,
                 defaultValue: 1f);
+
+            migrationBuilder.AddColumn<float>(
+                name: "width",
+                table: "profile",
+                type: "REAL",
+                nullable: false,
+                defaultValue: 1f);
         }
 
         /// <inheritdoc />
@@ -24,6 +31,10 @@ protected override void Down(MigrationBuilder migrationBuilder)
             migrationBuilder.DropColumn(
                 name: "height",
                 table: "profile");
+
+            migrationBuilder.DropColumn(
+                name: "width",
+                table: "profile");
         }
     }
 }
diff --git a/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs b/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
index cb7c688c4bf..8aa2e579222 100644
--- a/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
+++ b/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
@@ -762,11 +762,17 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .IsRequired()
                         .HasColumnType("TEXT")
                         .HasColumnName("hair_name");
-						
+
+                    // Parkstation-HeightSlider Start
                     b.Property<float>("Height")
                         .HasColumnType("REAL")
                         .HasColumnName("height");
 
+                    b.Property<float>("Width")
+                        .HasColumnType("REAL")
+                        .HasColumnName("width");
+                    // Parkstation-HeightSlider End
+
                     b.Property<byte[]>("Markings")
                         .HasColumnType("jsonb")
                         .HasColumnName("markings");
diff --git a/Content.Server.Database/Model.cs b/Content.Server.Database/Model.cs
index 7b39b415cb1..fed3f11b235 100644
--- a/Content.Server.Database/Model.cs
+++ b/Content.Server.Database/Model.cs
@@ -339,6 +339,7 @@ public class Profile
         public string Gender { get; set; } = null!;
         public string Species { get; set; } = null!;
         public float Height { get; set; } = 1f; // Parkstation-HeightSlider
+        public float Width { get; set; } = 1f; // Parkstation-HeightSlider
         [Column(TypeName = "jsonb")] public JsonDocument? Markings { get; set; } = null!;
         public string HairName { get; set; } = null!;
         public string HairColor { get; set; } = null!;
diff --git a/Content.Server/Database/ServerDbBase.cs b/Content.Server/Database/ServerDbBase.cs
index 57213597340..1306ba26efa 100644
--- a/Content.Server/Database/ServerDbBase.cs
+++ b/Content.Server/Database/ServerDbBase.cs
@@ -217,6 +217,7 @@ private static HumanoidCharacterProfile ConvertProfiles(Profile profile)
                 profile.FlavorText,
                 profile.Species,
                 profile.Height, // Parkstation-HeightSlider
+                profile.Width, // Parkstation-HeightSlider
                 profile.Age,
                 sex,
                 gender,
@@ -259,6 +260,7 @@ private static Profile ConvertProfiles(HumanoidCharacterProfile humanoid, int sl
             profile.Sex = humanoid.Sex.ToString();
             profile.Gender = humanoid.Gender.ToString();
             profile.Height = humanoid.Height; // Parkstation-HeightSlider
+            profile.Width = humanoid.Width; // Parkstation-HeightSlider
             profile.HairName = appearance.HairStyleId;
             profile.HairColor = appearance.HairColor.ToHex();
             profile.FacialHairName = appearance.FacialHairStyleId;
diff --git a/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs b/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
index da359927578..141edc747f1 100644
--- a/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
+++ b/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
@@ -55,6 +55,7 @@ public void CloneAppearance(EntityUid source, EntityUid target, HumanoidAppearan
         targetHumanoid.EyeColor = sourceHumanoid.EyeColor;
         targetHumanoid.Age = sourceHumanoid.Age;
         targetHumanoid.Height = sourceHumanoid.Height; // Parkstation-HeightSlider
+        targetHumanoid.Width = sourceHumanoid.Width; // Parkstation-HeightSlider
         SetSex(target, sourceHumanoid.Sex, false, targetHumanoid);
         targetHumanoid.CustomBaseLayers = new(sourceHumanoid.CustomBaseLayers);
         targetHumanoid.MarkingSet = new(sourceHumanoid.MarkingSet);
diff --git a/Content.Shared/Humanoid/HumanoidAppearanceComponent.cs b/Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
index 9033b186293..09ddfb7d503 100644
--- a/Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
+++ b/Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
@@ -85,6 +85,7 @@ public sealed partial class HumanoidAppearanceComponent : Component
     [ViewVariables(VVAccess.ReadOnly)]
     public Color? CachedFacialHairColor;
 
+    // Parkstation-HeightSlider Start
     /// <summary>
     /// DeltaV - let paradox anomaly be cloned
     /// </summary>
@@ -93,7 +94,14 @@ public sealed partial class HumanoidAppearanceComponent : Component
     ///     The height of this humanoid.
     /// </summary>
     [DataField, AutoNetworkedField]
-    public float Height = 1f; // Parkstation-HeightSlider
+    public float Height = 1f;
+
+    /// <summary>
+    ///     The width of this humanoid.
+    /// </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 af749a69216..6184ba58390 100644
--- a/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
+++ b/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
@@ -121,8 +121,6 @@ public sealed partial class SpeciesPrototype : IPrototype
     [DataField]
     public int MaxAge = 120;
 
-
-    // Parkstation-HeightSlider Start
     /// <summary>
     ///     The Style used for the guidebook info link in the character profile editor
     /// </summary>
@@ -130,23 +128,40 @@ public sealed partial class SpeciesPrototype : IPrototype
     public string GuideBookIcon = "SpeciesInfoDefault";
 
     /// <summary>
-    /// The minimum height for this species
+    ///     The minimum height for this species
     /// </summary>
     [DataField]
     public float MinHeight = 0.75f;
 
     /// <summary>
-    /// The maximum height for this species
+    ///     The default height for this species
+    /// </summary>
+    [DataField]
+    public float DefaultHeight = 1f;
+
+    /// <summary>
+    ///     The maximum height for this species
     /// </summary>
     [DataField]
     public float MaxHeight = 1.25f;
 
     /// <summary>
-    /// The default height for this species
+    ///     The minimum width for this species
     /// </summary>
     [DataField]
-    public float DefaultHeight = 1f;
-    // Parkstation-HeightSlider End
+    public float MinWidth = 0.7f;
+
+    /// <summary>
+    ///     The default width for this species
+    /// </summary>
+    [DataField]
+    public float DefaultWidth = 1f;
+
+    /// <summary>
+    ///     The maximum width for this species
+    /// </summary>
+    [DataField]
+    public float MaxWidth = 1.3f;
 }
 
 public enum SpeciesNaming : byte
diff --git a/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs b/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
index c4cfe6e2cf0..9ddc0ddaa06 100644
--- a/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
+++ b/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
@@ -252,7 +252,7 @@ public void SetSex(EntityUid uid, Sex sex, bool sync = true, HumanoidAppearanceC
 
     // Parkstation-HeightSlider Start
     /// <summary>
-    ///     Set the height (and width) of a humanoid mob.
+    ///     Set the height of a humanoid mob.
     /// </summary>
     /// <param name="uid">The humanoid mob's UID.</param>
     /// <param name="height">The height to set the mob to.</param>
@@ -269,6 +269,25 @@ public void SetHeight(EntityUid uid, float height, bool sync = true, HumanoidApp
         if (sync)
             Dirty(humanoid);
     }
+
+    /// <summary>
+    ///     Set the width of a humanoid mob.
+    /// </summary>
+    /// <param name="uid">The humanoid mob's UID.</param>
+    /// <param name="width">The width to set the mob to.</param>
+    /// <param name="sync">Whether to immediately synchronize this to the humanoid mob, or not.</param>
+    /// <param name="humanoid">Humanoid component of the entity</param>
+    public void SetWidth(EntityUid uid, float width, bool sync = true, HumanoidAppearanceComponent? humanoid = null)
+    {
+        if (!Resolve(uid, ref humanoid) || MathHelper.CloseTo(humanoid.Width, width, 0.001f))
+            return;
+
+        var species = _prototypeManager.Index(humanoid.Species);
+        humanoid.Width = Math.Clamp(width, species.MinWidth, species.MaxWidth);
+
+        if (sync)
+            Dirty(humanoid);
+    }
     // Parkstation-HeightSlider End
 
     /// <summary>
diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
index ea985152b3b..57294bee873 100644
--- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs
+++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
@@ -36,6 +36,7 @@ private HumanoidCharacterProfile(
             string flavortext,
             string species,
             float height, // Parkstation-HeightSlider
+            float width, // Parkstation-HeightSlider
             int age,
             Sex sex,
             Gender gender,
@@ -53,6 +54,7 @@ private HumanoidCharacterProfile(
             FlavorText = flavortext;
             Species = species;
             Height = height; // Parkstation-HeightSlider
+            Width = width; // Parkstation-HeightSlider
             Age = age;
             Sex = sex;
             Gender = gender;
@@ -74,7 +76,7 @@ private HumanoidCharacterProfile(
             List<string> antagPreferences,
             List<string> traitPreferences,
             List<string> loadoutPreferences)
-            : this(other.Name, other.FlavorText, other.Species, other.Height, other.Age, other.Sex, other.Gender, other.Appearance,
+            : this(other.Name, other.FlavorText, other.Species, other.Height, other.Width, other.Age, other.Sex, other.Gender, other.Appearance,
                 other.Clothing, other.Backpack, other.SpawnPriority, jobPriorities, other.PreferenceUnavailable,
                 antagPreferences, traitPreferences, loadoutPreferences)
         {
@@ -93,6 +95,7 @@ public HumanoidCharacterProfile(
             string flavortext,
             string species,
             float height, // Parkstation-HeightSlider
+            float width, // Parkstation-HeightSlider
             int age,
             Sex sex,
             Gender gender,
@@ -105,7 +108,7 @@ public HumanoidCharacterProfile(
             IReadOnlyList<string> antagPreferences,
             IReadOnlyList<string> traitPreferences,
             IReadOnlyList<string> loadoutPreferences)
-            : this(name, flavortext, species, height, age, sex, gender, appearance, clothing, backpack, spawnPriority,
+            : this(name, flavortext, species, height, width, age, sex, gender, appearance, clothing, backpack, spawnPriority,
                 new Dictionary<string, JobPriority>(jobPriorities), preferenceUnavailable,
                 new List<string>(antagPreferences), new List<string>(traitPreferences),
                 new List<string>(loadoutPreferences))
@@ -122,6 +125,7 @@ public HumanoidCharacterProfile() : this(
             "",
             SharedHumanoidAppearanceSystem.DefaultSpecies,
             1f, // Parkstation-HeightSlider
+            1f, // Parkstation-HeightSlider
             18,
             Sex.Male,
             Gender.Male,
@@ -152,6 +156,7 @@ public static HumanoidCharacterProfile DefaultWithSpecies(string species = Share
                 "",
                 species,
                 1f, // Parkstation-HeightSlider
+                1f, // Parkstation-HeightSlider
                 18,
                 Sex.Male,
                 Gender.Male,
@@ -192,11 +197,13 @@ public static HumanoidCharacterProfile RandomWithSpecies(string species = Shared
             var sex = Sex.Unsexed;
             var age = 18;
             var height = 1f; // Parkstation-HeightSlider
+            var width = 1f; // Parkstation-HeightSlider
             if (prototypeManager.TryIndex<SpeciesPrototype>(species, out var speciesPrototype))
             {
                 sex = random.Pick(speciesPrototype.Sexes);
                 age = random.Next(speciesPrototype.MinAge, speciesPrototype.OldAge); // people don't look and keep making 119 year old characters with zero rp, cap it at middle aged
                 height = random.NextFloat(speciesPrototype.MinHeight, speciesPrototype.MaxHeight); // Parkstation-HeightSlider
+                width = random.NextFloat(speciesPrototype.MinWidth, speciesPrototype.MaxWidth); // Parkstation-HeightSlider
             }
 
             var gender = Gender.Epicene;
@@ -213,7 +220,7 @@ public static HumanoidCharacterProfile RandomWithSpecies(string species = Shared
 
             var name = GetName(species, gender);
 
-            return new HumanoidCharacterProfile(name, "", species, height, age, sex, gender,
+            return new HumanoidCharacterProfile(name, "", species, height, width, age, sex, gender,
                 HumanoidCharacterAppearance.Random(species, sex), ClothingPreference.Jumpsuit,
                 BackpackPreference.Backpack, SpawnPriorityPreference.None,
                 new Dictionary<string, JobPriority>
@@ -227,8 +234,13 @@ public static HumanoidCharacterProfile RandomWithSpecies(string species = Shared
         [DataField("species")] // Parkstation-HeightSlider // :)
         public string Species { get; private set; }
 
+        // Parkstation-HeightSlider Start
         [DataField("height")]
-        public float Height { get; private set; } // Parkstation-HeightSlider
+        public float Height { get; private set; }
+
+        [DataField("width")]
+        public float Width { get; private set; }
+        // Parkstation-HeightSlider End
 
         [DataField("age")]
         public int Age { get; private set; }
@@ -287,6 +299,11 @@ public HumanoidCharacterProfile WithHeight(float height)
         {
             return new(this) { Height = height };
         }
+
+        public HumanoidCharacterProfile WithWidth(float width)
+        {
+            return new(this) { Width = width };
+        }
         // Parkstation-HeightSlider End
 
         public HumanoidCharacterProfile WithCharacterAppearance(HumanoidCharacterAppearance appearance)
@@ -414,6 +431,7 @@ public bool MemberwiseEquals(ICharacterProfile maybeOther)
                 Name != other.Name ||
                 Age != other.Age ||
                 Height != other.Height ||
+                Width != other.Width ||
                 Sex != other.Sex ||
                 Gender != other.Gender ||
                 PreferenceUnavailable != other.PreferenceUnavailable ||
@@ -425,7 +443,6 @@ public bool MemberwiseEquals(ICharacterProfile maybeOther)
                 !_traitPreferences.SequenceEqual(other._traitPreferences) ||
                 !_loadoutPreferences.SequenceEqual(other._loadoutPreferences))
                 return false;
-
             return Appearance.MemberwiseEquals(other.Appearance);
         }
 
@@ -517,6 +534,10 @@ public void EnsureValid(IConfigurationManager configManager, IPrototypeManager p
             var height = Height;
             if (speciesPrototype != null)
                 height = Math.Clamp(Height, speciesPrototype.MinHeight, speciesPrototype.MaxHeight);
+
+            var width = Width;
+            if (speciesPrototype != null)
+                width = Math.Clamp(Width, speciesPrototype.MinWidth, speciesPrototype.MaxWidth);
             // Parkstation-HeightSlider End
 
             var appearance = HumanoidCharacterAppearance.EnsureValid(Appearance, Species, Sex);
@@ -590,6 +611,7 @@ public void EnsureValid(IConfigurationManager configManager, IPrototypeManager p
             FlavorText = flavortext;
             Age = age;
             Height = height; // Parkstation-HeightSlider
+            Width = width; // Parkstation-HeightSlider
             Sex = sex;
             Gender = gender;
             Appearance = appearance;
@@ -650,7 +672,8 @@ public override int GetHashCode()
                     Backpack
                 ),
                 SpawnPriority,
-                Height, // Parkstation-HeightSlider
+                Height,
+                Width,
                 PreferenceUnavailable,
                 _jobPriorities,
                 _antagPreferences,
diff --git a/Content.Shared/SimpleStation14/HeightAdjust/HeightAdjustSystem.cs b/Content.Shared/SimpleStation14/HeightAdjust/HeightAdjustSystem.cs
index b34367eee3b..01b31839261 100644
--- a/Content.Shared/SimpleStation14/HeightAdjust/HeightAdjustSystem.cs
+++ b/Content.Shared/SimpleStation14/HeightAdjust/HeightAdjustSystem.cs
@@ -39,7 +39,10 @@ public bool SetScale(EntityUid uid, float scale)
             succeeded = false;
 
         if (EntityManager.HasComponent<HumanoidAppearanceComponent>(uid))
+        {
             _appearance.SetHeight(uid, scale);
+            _appearance.SetWidth(uid, scale);
+        }
         else
             succeeded = false;
 
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 d6af72426cb..cf0957b8942 100644
--- a/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
+++ b/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
@@ -1,6 +1,4 @@
 humanoid-profile-editor-randomize-everything-button = Randomize everything
-# CosmaticDrift-HeightSlider
-humanoid-profile-editor-reset-height-button = Reset Height
 humanoid-profile-editor-name-label = Name:
 humanoid-profile-editor-name-random-button = Randomize
 humanoid-profile-editor-appearance-tab = Appearance
@@ -13,8 +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:
-# CosmaticDrift-HeightSlider
+# Parkstation-HeightSlider
 humanoid-profile-editor-height-label = Height: {$height}x
+humanoid-profile-editor-width-label = Width: {$width}x
 humanoid-profile-editor-species-label = Species:
 humanoid-profile-editor-pronouns-label = Pronouns:
 humanoid-profile-editor-pronouns-male-text = He / Him
diff --git a/Resources/Prototypes/DeltaV/Species/harpy.yml b/Resources/Prototypes/DeltaV/Species/harpy.yml
index ca743149dbd..358ecca1b7a 100644
--- a/Resources/Prototypes/DeltaV/Species/harpy.yml
+++ b/Resources/Prototypes/DeltaV/Species/harpy.yml
@@ -11,6 +11,9 @@
   minHeight: 0.6
   defaultHeight: 0.8
   maxHeight: 1.1
+  minWidth: 0.55
+  defaultWidth: 0.8
+  maxWidth: 1.15
   # Parkstation-HeightSlider End
 
 - type: speciesBaseSprites
diff --git a/Resources/Prototypes/Nyanotrasen/Species/felinid.yml b/Resources/Prototypes/Nyanotrasen/Species/felinid.yml
index 3f36baead10..4751d581746 100644
--- a/Resources/Prototypes/Nyanotrasen/Species/felinid.yml
+++ b/Resources/Prototypes/Nyanotrasen/Species/felinid.yml
@@ -10,6 +10,9 @@
   minHeight: 0.65
   defaultHeight: 0.8
   maxHeight: 1.1
+  minWidth: 0.6
+  defaultWidth: 0.8
+  maxWidth: 1.15
 
 - type: markingPoints
   id: MobFelinidMarkingLimits
diff --git a/Resources/Prototypes/SimpleStation14/humanoidProfiles/felinid.yml b/Resources/Prototypes/SimpleStation14/humanoidProfiles/felinid.yml
index e846b15f339..33e6915a78c 100644
--- a/Resources/Prototypes/SimpleStation14/humanoidProfiles/felinid.yml
+++ b/Resources/Prototypes/SimpleStation14/humanoidProfiles/felinid.yml
@@ -3,3 +3,4 @@
   profile:
     species: Felinid
     height: 0.8
+    width: 0.8
diff --git a/Resources/Prototypes/Species/dwarf.yml b/Resources/Prototypes/Species/dwarf.yml
index 643791ef37b..23363210d84 100644
--- a/Resources/Prototypes/Species/dwarf.yml
+++ b/Resources/Prototypes/Species/dwarf.yml
@@ -11,4 +11,7 @@
   minHeight: 0.6
   defaultHeight: 0.8
   maxHeight: 0.8
+  minWidth: 0.55
+  defaultWidth: 0.8
+  maxWidth: 0.85
   # Parkstation-HeightSlider End
diff --git a/Resources/Prototypes/Species/reptilian.yml b/Resources/Prototypes/Species/reptilian.yml
index 5d6f34986d3..d476ea7b275 100644
--- a/Resources/Prototypes/Species/reptilian.yml
+++ b/Resources/Prototypes/Species/reptilian.yml
@@ -14,6 +14,10 @@
   # Parkstation-HeightSlider Start
   minHeight: 0.7
   defaultHeight: 0.95
+  maxHeight: 1.25
+  minWidth: 0.65
+  defaultWidth: 0.95
+  maxWidth: 1.3
   # Parkstation-HeightSlider End
 
 - type: speciesBaseSprites

From 4df4a5a7798983f74c0e42460d4b197aa5bfc669 Mon Sep 17 00:00:00 2001
From: DEATHB4DEFEAT <zachcaffee@outlook.com>
Date: Sat, 10 Feb 2024 14:12:23 -0800
Subject: [PATCH 10/25] allow scaling by a Vector2 instead of general average
 scale

---
 .../SharedHumanoidAppearanceSystem.cs         | 40 ++++++++++++++-----
 .../HeightAdjust/HeightAdjustSystem.cs        | 36 +++++++++++++++++
 2 files changed, 67 insertions(+), 9 deletions(-)

diff --git a/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs b/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
index 9ddc0ddaa06..c4d7cdde0b4 100644
--- a/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
+++ b/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using System.Numerics;
 using Content.Shared.Decals;
 using Content.Shared.Humanoid.Markings;
 using Content.Shared.Humanoid.Prototypes;
@@ -252,11 +253,11 @@ public void SetSex(EntityUid uid, Sex sex, bool sync = true, HumanoidAppearanceC
 
     // Parkstation-HeightSlider Start
     /// <summary>
-    ///     Set the height of a humanoid mob.
+    ///     Set the height of a humanoid mob
     /// </summary>
-    /// <param name="uid">The humanoid mob's UID.</param>
-    /// <param name="height">The height to set the mob to.</param>
-    /// <param name="sync">Whether to immediately synchronize this to the humanoid mob, or not.</param>
+    /// <param name="uid">The humanoid mob's UID</param>
+    /// <param name="height">The height to set the mob to</param>
+    /// <param name="sync">Whether to immediately synchronize this to the humanoid mob, or not</param>
     /// <param name="humanoid">Humanoid component of the entity</param>
     public void SetHeight(EntityUid uid, float height, bool sync = true, HumanoidAppearanceComponent? humanoid = null)
     {
@@ -271,11 +272,11 @@ public void SetHeight(EntityUid uid, float height, bool sync = true, HumanoidApp
     }
 
     /// <summary>
-    ///     Set the width of a humanoid mob.
+    ///     Set the width of a humanoid mob
     /// </summary>
-    /// <param name="uid">The humanoid mob's UID.</param>
-    /// <param name="width">The width to set the mob to.</param>
-    /// <param name="sync">Whether to immediately synchronize this to the humanoid mob, or not.</param>
+    /// <param name="uid">The humanoid mob's UID</param>
+    /// <param name="width">The width to set the mob to</param>
+    /// <param name="sync">Whether to immediately synchronize this to the humanoid mob, or not</param>
     /// <param name="humanoid">Humanoid component of the entity</param>
     public void SetWidth(EntityUid uid, float width, bool sync = true, HumanoidAppearanceComponent? humanoid = null)
     {
@@ -288,6 +289,26 @@ public void SetWidth(EntityUid uid, float width, bool sync = true, HumanoidAppea
         if (sync)
             Dirty(humanoid);
     }
+
+    /// <summary>
+    ///     Set the scale of a humanoid mob
+    /// </summary>
+    /// <param name="uid">The humanoid mob's UID</param>
+    /// <param name="scale">The scale to set the mob to</param>
+    /// <param name="sync">Whether to immediately synchronize this to the humanoid mob, or not</param>
+    /// <param name="humanoid">Humanoid component of the entity</param>
+    public void SetScale(EntityUid uid, Vector2 scale, bool sync = true, HumanoidAppearanceComponent? humanoid = null)
+    {
+        if (!Resolve(uid, ref humanoid))
+            return;
+
+        var species = _prototypeManager.Index(humanoid.Species);
+        humanoid.Height = Math.Clamp(scale.Y, species.MinHeight, species.MaxHeight);
+        humanoid.Width = Math.Clamp(scale.X, species.MinWidth, species.MaxWidth);
+
+        if (sync)
+            Dirty(humanoid);
+    }
     // Parkstation-HeightSlider End
 
     /// <summary>
@@ -370,7 +391,8 @@ public virtual void LoadProfile(EntityUid uid, HumanoidCharacterProfile profile,
         }
 
         humanoid.Age = profile.Age;
-        _heightAdjust.SetScale(uid, profile.Height); // Parkstation-HeightSlider
+
+        _heightAdjust.SetScale(uid, new Vector2(profile.Width, profile.Height)); // Parkstation-HeightSlider
 
         humanoid.LastProfileLoaded = profile; // DeltaV - let paradox anomaly be cloned
 
diff --git a/Content.Shared/SimpleStation14/HeightAdjust/HeightAdjustSystem.cs b/Content.Shared/SimpleStation14/HeightAdjust/HeightAdjustSystem.cs
index 01b31839261..e7bd75fbfb9 100644
--- a/Content.Shared/SimpleStation14/HeightAdjust/HeightAdjustSystem.cs
+++ b/Content.Shared/SimpleStation14/HeightAdjust/HeightAdjustSystem.cs
@@ -1,3 +1,4 @@
+using System.Numerics;
 using Content.Shared.Humanoid;
 using Content.Shared.Movement.Components;
 using Content.Shared.Movement.Systems;
@@ -48,4 +49,39 @@ public bool SetScale(EntityUid uid, float scale)
 
         return succeeded;
     }
+
+    /// <summary>
+    ///     Changes the density of fixtures and zoom of eyes based on a provided Vector2 scale
+    /// </summary>
+    /// <param name="uid">The entity to modify values for</param>
+    /// <param name="scale">The scale to multiply values by</param>
+    /// <returns>True if all operations succeeded</returns>
+    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))
+            _eye.SetMaxZoom(uid, eye.MaxZoom * avg);
+        else
+            succeeded = false;
+
+        if (EntityManager.TryGetComponent<FixturesComponent>(uid, out var fixtures))
+        {
+            foreach (var fixture in fixtures.Fixtures)
+            {
+                // _physics.SetDensity(uid, fixture.Key, fixture.Value, fixture.Value.Density * avg); // This does the same thing as below, just without modifying the fixture size
+                _physics.SetRadius(uid, fixture.Key, fixture.Value, fixture.Value.Shape, fixture.Value.Shape.Radius * avg);
+            }
+        }
+        else
+            succeeded = false;
+
+        if (EntityManager.HasComponent<HumanoidAppearanceComponent>(uid))
+            _appearance.SetScale(uid, scale);
+        else
+            succeeded = false;
+
+        return succeeded;
+    }
 }

From 73da80874f42f05ce77f579aa92374dc266b926b Mon Sep 17 00:00:00 2001
From: DEATHB4DEFEAT <zachcaffee@outlook.com>
Date: Sun, 11 Feb 2024 18:32:53 -0800
Subject: [PATCH 11/25] update width/height sliders when changing species

---
 Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
index 33b8614c5e5..368971141e2 100644
--- a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
@@ -943,6 +943,8 @@ private void SetSpecies(string newSpecies)
             OnSkinColorOnValueChanged(); // Species may have special color prefs, make sure to update it.
             CMarkings.SetSpecies(newSpecies); // Repopulate the markings tab as well.
             UpdateSexControls(); // update sex for new species
+            UpdateHeightControls(); // Parkstation-HeightSlider - Changing species provides inaccurate sliders
+            UpdateWidthControls(); // Parkstation-HeightSlider - Changing species provides inaccurate sliders
             RebuildSpriteView(); // they might have different inv so we need a new dummy
             UpdateSpeciesGuidebookIcon();
             IsDirty = true;

From 0b02013397ff9fa5979a43081fc7e8882a78c453 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Thu, 13 Jun 2024 19:40:44 -0400
Subject: [PATCH 12/25] Update HumanoidCharacterProfile.cs

---
 .../Preferences/HumanoidCharacterProfile.cs    | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
index 57294bee873..77c329059ad 100644
--- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs
+++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
@@ -671,14 +671,16 @@ public override int GetHashCode()
                     Clothing,
                     Backpack
                 ),
-                SpawnPriority,
-                Height,
-                Width,
-                PreferenceUnavailable,
-                _jobPriorities,
-                _antagPreferences,
-                _traitPreferences,
-                _loadoutPreferences
+                HashCode.Combine(
+                    SpawnPriority,
+                    Height,
+                    Width,
+                    PreferenceUnavailable,
+                    _jobPriorities,
+                    _antagPreferences,
+                    _traitPreferences,
+                    _loadoutPreferences
+                )
             );
         }
     }

From a66562f56d2631748f49cb109754831f73b41ec9 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Thu, 13 Jun 2024 20:35:07 -0400
Subject: [PATCH 13/25] Oh right

---
 .../Nyanotrasen/Entities/Mobs/Species/Oni.yml        | 12 ------------
 Resources/Prototypes/Nyanotrasen/Species/Oni.yml     |  6 ++++++
 .../SimpleStation14/humanoidProfiles/oni.yml         |  6 ++++++
 3 files changed, 12 insertions(+), 12 deletions(-)
 create mode 100644 Resources/Prototypes/SimpleStation14/humanoidProfiles/oni.yml

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml
index 8a0e750abd6..41b2832aef8 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml
@@ -21,18 +21,6 @@
     damageModifierSet: Oni
   - type: Body
     prototype: Human
-  - type: Fixtures
-    fixtures: # TODO: This needs a second fixture just for mob collisions.
-      fix1:
-        shape:
-          !type:PhysShapeCircle
-          radius: 0.42
-        density: 220
-        restitution: 0.0
-        mask:
-        - MobMask
-        layer:
-        - MobLayer
   - type: Stamina
     critThreshold: 115
   - type: LanguageSpeaker
diff --git a/Resources/Prototypes/Nyanotrasen/Species/Oni.yml b/Resources/Prototypes/Nyanotrasen/Species/Oni.yml
index 9cb184b8ef0..ee8be0e5892 100644
--- a/Resources/Prototypes/Nyanotrasen/Species/Oni.yml
+++ b/Resources/Prototypes/Nyanotrasen/Species/Oni.yml
@@ -11,6 +11,12 @@
   femaleFirstNames: names_oni_female
   lastNames: names_oni_location
   naming: LastNoFirst
+  minHeight: 0.9
+  defaultHeight: 1.2
+  maxHeight: 1.3
+  minWidth: 0.85
+  defaultWidth: 1.2
+  maxWidth: 1.35
 
 - type: markingPoints
   id: MobOniMarkingLimits
diff --git a/Resources/Prototypes/SimpleStation14/humanoidProfiles/oni.yml b/Resources/Prototypes/SimpleStation14/humanoidProfiles/oni.yml
new file mode 100644
index 00000000000..1e2d8af1e30
--- /dev/null
+++ b/Resources/Prototypes/SimpleStation14/humanoidProfiles/oni.yml
@@ -0,0 +1,6 @@
+- type: humanoidProfile
+  id: Oni
+  profile:
+    species: Oni
+    height: 1.2
+    width: 1.2

From 225da44b76300762c925ab514ef5e954e4640f2d Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Sun, 16 Jun 2024 13:36:55 -0400
Subject: [PATCH 14/25] Clamp fixtures to prevent door stuck

---
 .../SimpleStation14/HeightAdjust/HeightAdjustSystem.cs      | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Content.Shared/SimpleStation14/HeightAdjust/HeightAdjustSystem.cs b/Content.Shared/SimpleStation14/HeightAdjust/HeightAdjustSystem.cs
index e7bd75fbfb9..3c7b5d4dc34 100644
--- a/Content.Shared/SimpleStation14/HeightAdjust/HeightAdjustSystem.cs
+++ b/Content.Shared/SimpleStation14/HeightAdjust/HeightAdjustSystem.cs
@@ -32,8 +32,9 @@ public bool SetScale(EntityUid uid, float scale)
         {
             foreach (var fixture in fixtures.Fixtures)
             {
+                var scaleClamped = Math.Min(scale, 0.49f); //Prevent radius from going above the diameter of a door
                 // _physics.SetDensity(uid, fixture.Key, fixture.Value, fixture.Value.Density * scale); // This does the same thing as below, just without modifying the fixture size
-                _physics.SetRadius(uid, fixture.Key, fixture.Value, fixture.Value.Shape, fixture.Value.Shape.Radius * scale);
+                _physics.SetRadius(uid, fixture.Key, fixture.Value, fixture.Value.Shape, fixture.Value.Shape.Radius * scaleClamped);
             }
         }
         else
@@ -70,8 +71,9 @@ public bool SetScale(EntityUid uid, Vector2 scale)
         {
             foreach (var fixture in fixtures.Fixtures)
             {
+                var avgClamped = Math.Min(scale, 0.49f); //Prevent radius from going above the diameter of a door
                 // _physics.SetDensity(uid, fixture.Key, fixture.Value, fixture.Value.Density * avg); // This does the same thing as below, just without modifying the fixture size
-                _physics.SetRadius(uid, fixture.Key, fixture.Value, fixture.Value.Shape, fixture.Value.Shape.Radius * avg);
+                _physics.SetRadius(uid, fixture.Key, fixture.Value, fixture.Value.Shape, fixture.Value.Shape.Radius * avgClamped);
             }
         }
         else

From 0acbf82b26813da41f6b875756e7bd736746f6db Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Sun, 16 Jun 2024 13:37:16 -0400
Subject: [PATCH 15/25] Update HeightAdjustSystem.cs

---
 .../SimpleStation14/HeightAdjust/HeightAdjustSystem.cs          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Shared/SimpleStation14/HeightAdjust/HeightAdjustSystem.cs b/Content.Shared/SimpleStation14/HeightAdjust/HeightAdjustSystem.cs
index 3c7b5d4dc34..a60052ec14a 100644
--- a/Content.Shared/SimpleStation14/HeightAdjust/HeightAdjustSystem.cs
+++ b/Content.Shared/SimpleStation14/HeightAdjust/HeightAdjustSystem.cs
@@ -71,7 +71,7 @@ public bool SetScale(EntityUid uid, Vector2 scale)
         {
             foreach (var fixture in fixtures.Fixtures)
             {
-                var avgClamped = Math.Min(scale, 0.49f); //Prevent radius from going above the diameter of a door
+                var avgClamped = Math.Min(avg, 0.49f); //Prevent radius from going above the diameter of a door
                 // _physics.SetDensity(uid, fixture.Key, fixture.Value, fixture.Value.Density * avg); // This does the same thing as below, just without modifying the fixture size
                 _physics.SetRadius(uid, fixture.Key, fixture.Value, fixture.Value.Shape, fixture.Value.Shape.Radius * avgClamped);
             }

From ae6bc7e8fa1c25d371cefc7236f882a0e4216720 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Sun, 16 Jun 2024 13:38:47 -0400
Subject: [PATCH 16/25] Update HeightAdjustSystem.cs

---
 .../SimpleStation14/HeightAdjust/HeightAdjustSystem.cs      | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Content.Shared/SimpleStation14/HeightAdjust/HeightAdjustSystem.cs b/Content.Shared/SimpleStation14/HeightAdjust/HeightAdjustSystem.cs
index a60052ec14a..77737b33e1e 100644
--- a/Content.Shared/SimpleStation14/HeightAdjust/HeightAdjustSystem.cs
+++ b/Content.Shared/SimpleStation14/HeightAdjust/HeightAdjustSystem.cs
@@ -32,9 +32,8 @@ public bool SetScale(EntityUid uid, float scale)
         {
             foreach (var fixture in fixtures.Fixtures)
             {
-                var scaleClamped = Math.Min(scale, 0.49f); //Prevent radius from going above the diameter of a door
                 // _physics.SetDensity(uid, fixture.Key, fixture.Value, fixture.Value.Density * scale); // This does the same thing as below, just without modifying the fixture size
-                _physics.SetRadius(uid, fixture.Key, fixture.Value, fixture.Value.Shape, fixture.Value.Shape.Radius * scaleClamped);
+                _physics.SetRadius(uid, fixture.Key, fixture.Value, fixture.Value.Shape, MathF.Min(fixture.Value.Shape.Radius * scale, 0.49f));
             }
         }
         else
@@ -71,9 +70,8 @@ public bool SetScale(EntityUid uid, Vector2 scale)
         {
             foreach (var fixture in fixtures.Fixtures)
             {
-                var avgClamped = Math.Min(avg, 0.49f); //Prevent radius from going above the diameter of a door
                 // _physics.SetDensity(uid, fixture.Key, fixture.Value, fixture.Value.Density * avg); // This does the same thing as below, just without modifying the fixture size
-                _physics.SetRadius(uid, fixture.Key, fixture.Value, fixture.Value.Shape, fixture.Value.Shape.Radius * avgClamped);
+                _physics.SetRadius(uid, fixture.Key, fixture.Value, fixture.Value.Shape, MathF.Min(fixture.Value.Shape.Radius * avg, 0.49f));
             }
         }
         else

From 259831711dd7669ad09e3c25f0fdfdab3de888af Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Sun, 16 Jun 2024 13:51:22 -0400
Subject: [PATCH 17/25] Moving namespace to EE

---
 .../Humanoid/HumanoidAppearanceSystem.cs      |  2 -
 .../UI/HumanoidProfileEditor.xaml.cs          | 14 ++-----
 .../Tests/Preferences/ServerDbSqliteTests.cs  |  4 +-
 Content.Server/Database/ServerDbBase.cs       |  8 ++--
 .../Systems/HumanoidAppearanceSystem.cs       |  4 +-
 .../HeightAdjust/HeightAdjustSystem.cs        |  2 +-
 .../SharedHumanoidAppearanceSystem.cs         |  2 +-
 .../Preferences/HumanoidCharacterProfile.cs   | 40 ++++++++-----------
 8 files changed, 31 insertions(+), 45 deletions(-)
 rename Content.Shared/{SimpleStation14 => }/HeightAdjust/HeightAdjustSystem.cs (98%)

diff --git a/Content.Client/Humanoid/HumanoidAppearanceSystem.cs b/Content.Client/Humanoid/HumanoidAppearanceSystem.cs
index 6e4a19b554f..22e2170c9fa 100644
--- a/Content.Client/Humanoid/HumanoidAppearanceSystem.cs
+++ b/Content.Client/Humanoid/HumanoidAppearanceSystem.cs
@@ -31,7 +31,6 @@ private void UpdateSprite(HumanoidAppearanceComponent component, SpriteComponent
         UpdateLayers(component, sprite);
         ApplyMarkingSet(component, sprite);
 
-        // Parkstation-HeightSlider Start
         var speciesPrototype = _prototypeManager.Index(component.Species);
 
         var height = Math.Clamp(component.Height, speciesPrototype.MinHeight, speciesPrototype.MaxHeight);
@@ -40,7 +39,6 @@ private void UpdateSprite(HumanoidAppearanceComponent component, SpriteComponent
         component.Width = width;
 
         sprite.Scale = new Vector2(width, height);
-        // Parkstation-HeightSlider End
 
         sprite[sprite.LayerMapReserveBlank(HumanoidVisualLayers.Eyes)].Color = component.EyeColor;
     }
diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
index 368971141e2..537b19479c0 100644
--- a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
@@ -81,8 +81,8 @@ public sealed partial class HumanoidProfileEditor : Control
         private SingleMarkingPicker _hairPicker => CHairStylePicker;
         private SingleMarkingPicker _facialHairPicker => CFacialHairPicker;
         private EyeColorPicker _eyesPicker => CEyeColorPicker;
-        private Slider _heightSlider => CHeightSlider; // Parkstation-HeightSlider
-        private Slider _widthSlider => CWidthSlider; // Parkstation-HeightSlider
+        private Slider _heightSlider => CHeightSlider;
+        private Slider _widthSlider => CWidthSlider;
 
         private TabContainer _tabContainer => CTabContainer;
         private BoxContainer _jobList => CJobList;
@@ -209,7 +209,6 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
 
             #endregion Species
 
-            // Parkstation-HeightSlider Start
             #region Height
 
             var prototype = _speciesList.Find(x => x.ID == Profile?.Species) ?? _speciesList.First();
@@ -265,7 +264,6 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
             };
 
             #endregion Height
-            // Parkstation-HeightSlider End
 
             #region Skin
 
@@ -943,8 +941,8 @@ private void SetSpecies(string newSpecies)
             OnSkinColorOnValueChanged(); // Species may have special color prefs, make sure to update it.
             CMarkings.SetSpecies(newSpecies); // Repopulate the markings tab as well.
             UpdateSexControls(); // update sex for new species
-            UpdateHeightControls(); // Parkstation-HeightSlider - Changing species provides inaccurate sliders
-            UpdateWidthControls(); // Parkstation-HeightSlider - Changing species provides inaccurate sliders
+            UpdateHeightControls();// - Changing species provides inaccurate sliders
+            UpdateWidthControls();// - Changing species provides inaccurate sliders
             RebuildSpriteView(); // they might have different inv so we need a new dummy
             UpdateSpeciesGuidebookIcon();
             IsDirty = true;
@@ -975,7 +973,6 @@ private void SetSpawnPriority(SpawnPriorityPreference newSpawnPriority)
             IsDirty = true;
         }
 
-        // Parkstation-HeightSlider Start
         private void SetProfileHeight(float height)
         {
             Profile = Profile?.WithHeight(height);
@@ -987,7 +984,6 @@ private void SetProfileWidth(float width)
             Profile = Profile?.WithWidth(width);
             IsDirty = true;
         }
-        // Parkstation-HeightSlider End
 
         public void Save()
         {
@@ -1193,7 +1189,6 @@ private void UpdateSpawnPriorityControls()
             _spawnPriorityButton.SelectId((int) Profile.SpawnPriority);
         }
 
-        // Parkstation-HeightSlider Start
         private void UpdateHeightControls()
         {
             if (Profile == null)
@@ -1223,7 +1218,6 @@ private void UpdateWidthControls()
             var width = Profile.Width.ToString(CultureInfo.InvariantCulture);
             CWidthLabel.Text = Loc.GetString("humanoid-profile-editor-width-label", ("width", width.Length > 4 ? width[..4] : width));
         }
-        // Parkstation-HeightSlider End
 
         private void UpdateHairPickers()
         {
diff --git a/Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs b/Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs
index 95662adede4..b4417200242 100644
--- a/Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs
+++ b/Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs
@@ -41,8 +41,8 @@ private static HumanoidCharacterProfile CharlieCharlieson()
                 "Charlie Charlieson",
                 "The biggest boy around.",
                 "Human",
-                1, // Parkstation-HeightSlider
-                1, // Parkstation-HeightSlider
+                1,
+                1,
                 21,
                 Sex.Male,
                 Gender.Epicene,
diff --git a/Content.Server/Database/ServerDbBase.cs b/Content.Server/Database/ServerDbBase.cs
index 1306ba26efa..a550479b30f 100644
--- a/Content.Server/Database/ServerDbBase.cs
+++ b/Content.Server/Database/ServerDbBase.cs
@@ -216,8 +216,8 @@ private static HumanoidCharacterProfile ConvertProfiles(Profile profile)
                 profile.CharacterName,
                 profile.FlavorText,
                 profile.Species,
-                profile.Height, // Parkstation-HeightSlider
-                profile.Width, // Parkstation-HeightSlider
+                profile.Height,
+                profile.Width,
                 profile.Age,
                 sex,
                 gender,
@@ -259,8 +259,8 @@ private static Profile ConvertProfiles(HumanoidCharacterProfile humanoid, int sl
             profile.Age = humanoid.Age;
             profile.Sex = humanoid.Sex.ToString();
             profile.Gender = humanoid.Gender.ToString();
-            profile.Height = humanoid.Height; // Parkstation-HeightSlider
-            profile.Width = humanoid.Width; // Parkstation-HeightSlider
+            profile.Height = humanoid.Height;
+            profile.Width = humanoid.Width;
             profile.HairName = appearance.HairStyleId;
             profile.HairColor = appearance.HairColor.ToHex();
             profile.FacialHairName = appearance.FacialHairStyleId;
diff --git a/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs b/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
index 141edc747f1..326c80617a9 100644
--- a/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
+++ b/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
@@ -54,8 +54,8 @@ public void CloneAppearance(EntityUid source, EntityUid target, HumanoidAppearan
         targetHumanoid.SkinColor = sourceHumanoid.SkinColor;
         targetHumanoid.EyeColor = sourceHumanoid.EyeColor;
         targetHumanoid.Age = sourceHumanoid.Age;
-        targetHumanoid.Height = sourceHumanoid.Height; // Parkstation-HeightSlider
-        targetHumanoid.Width = sourceHumanoid.Width; // Parkstation-HeightSlider
+        targetHumanoid.Height = sourceHumanoid.Height;
+        targetHumanoid.Width = sourceHumanoid.Width;
         SetSex(target, sourceHumanoid.Sex, false, targetHumanoid);
         targetHumanoid.CustomBaseLayers = new(sourceHumanoid.CustomBaseLayers);
         targetHumanoid.MarkingSet = new(sourceHumanoid.MarkingSet);
diff --git a/Content.Shared/SimpleStation14/HeightAdjust/HeightAdjustSystem.cs b/Content.Shared/HeightAdjust/HeightAdjustSystem.cs
similarity index 98%
rename from Content.Shared/SimpleStation14/HeightAdjust/HeightAdjustSystem.cs
rename to Content.Shared/HeightAdjust/HeightAdjustSystem.cs
index 77737b33e1e..affd5259a0b 100644
--- a/Content.Shared/SimpleStation14/HeightAdjust/HeightAdjustSystem.cs
+++ b/Content.Shared/HeightAdjust/HeightAdjustSystem.cs
@@ -5,7 +5,7 @@
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Systems;
 
-namespace Content.Shared.SimpleStation14.HeightAdjust;
+namespace Content.Shared.HeightAdjust;
 
 public sealed class HeightAdjustSystem : EntitySystem
 {
diff --git a/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs b/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
index c4d7cdde0b4..2ac63f066e3 100644
--- a/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
+++ b/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
@@ -4,7 +4,7 @@
 using Content.Shared.Humanoid.Markings;
 using Content.Shared.Humanoid.Prototypes;
 using Content.Shared.Preferences;
-using Content.Shared.SimpleStation14.HeightAdjust;
+using Content.Shared.HeightAdjust;
 using Robust.Shared.GameObjects.Components.Localization;
 using Robust.Shared.Network;
 using Robust.Shared.Prototypes;
diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
index 77c329059ad..3b2d18f15d6 100644
--- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs
+++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
@@ -35,8 +35,8 @@ private HumanoidCharacterProfile(
             string name,
             string flavortext,
             string species,
-            float height, // Parkstation-HeightSlider
-            float width, // Parkstation-HeightSlider
+            float height,
+            float width,
             int age,
             Sex sex,
             Gender gender,
@@ -53,8 +53,8 @@ private HumanoidCharacterProfile(
             Name = name;
             FlavorText = flavortext;
             Species = species;
-            Height = height; // Parkstation-HeightSlider
-            Width = width; // Parkstation-HeightSlider
+            Height = height;
+            Width = width;
             Age = age;
             Sex = sex;
             Gender = gender;
@@ -94,8 +94,8 @@ public HumanoidCharacterProfile(
             string name,
             string flavortext,
             string species,
-            float height, // Parkstation-HeightSlider
-            float width, // Parkstation-HeightSlider
+            float height,
+            float width,
             int age,
             Sex sex,
             Gender gender,
@@ -124,8 +124,8 @@ public HumanoidCharacterProfile() : this(
             "John Doe",
             "",
             SharedHumanoidAppearanceSystem.DefaultSpecies,
-            1f, // Parkstation-HeightSlider
-            1f, // Parkstation-HeightSlider
+            1f,
+            1f,
             18,
             Sex.Male,
             Gender.Male,
@@ -155,8 +155,8 @@ public static HumanoidCharacterProfile DefaultWithSpecies(string species = Share
                 "John Doe",
                 "",
                 species,
-                1f, // Parkstation-HeightSlider
-                1f, // Parkstation-HeightSlider
+                1f,
+                1f,
                 18,
                 Sex.Male,
                 Gender.Male,
@@ -196,14 +196,14 @@ public static HumanoidCharacterProfile RandomWithSpecies(string species = Shared
 
             var sex = Sex.Unsexed;
             var age = 18;
-            var height = 1f; // Parkstation-HeightSlider
-            var width = 1f; // Parkstation-HeightSlider
+            var height = 1f;
+            var width = 1f;
             if (prototypeManager.TryIndex<SpeciesPrototype>(species, out var speciesPrototype))
             {
                 sex = random.Pick(speciesPrototype.Sexes);
                 age = random.Next(speciesPrototype.MinAge, speciesPrototype.OldAge); // people don't look and keep making 119 year old characters with zero rp, cap it at middle aged
-                height = random.NextFloat(speciesPrototype.MinHeight, speciesPrototype.MaxHeight); // Parkstation-HeightSlider
-                width = random.NextFloat(speciesPrototype.MinWidth, speciesPrototype.MaxWidth); // Parkstation-HeightSlider
+                height = random.NextFloat(speciesPrototype.MinHeight, speciesPrototype.MaxHeight);
+                width = random.NextFloat(speciesPrototype.MinWidth, speciesPrototype.MaxWidth);
             }
 
             var gender = Gender.Epicene;
@@ -231,16 +231,14 @@ public static HumanoidCharacterProfile RandomWithSpecies(string species = Shared
 
         public string Name { get; private set; }
         public string FlavorText { get; private set; }
-        [DataField("species")] // Parkstation-HeightSlider // :)
+        [DataField("species")] // :)
         public string Species { get; private set; }
 
-        // Parkstation-HeightSlider Start
         [DataField("height")]
         public float Height { get; private set; }
 
         [DataField("width")]
         public float Width { get; private set; }
-        // Parkstation-HeightSlider End
 
         [DataField("age")]
         public int Age { get; private set; }
@@ -294,7 +292,6 @@ public HumanoidCharacterProfile WithSpecies(string species)
             return new(this) { Species = species };
         }
 
-        // Parkstation-HeightSlider Start
         public HumanoidCharacterProfile WithHeight(float height)
         {
             return new(this) { Height = height };
@@ -304,7 +301,6 @@ public HumanoidCharacterProfile WithWidth(float width)
         {
             return new(this) { Width = width };
         }
-        // Parkstation-HeightSlider End
 
         public HumanoidCharacterProfile WithCharacterAppearance(HumanoidCharacterAppearance appearance)
         {
@@ -530,7 +526,6 @@ public void EnsureValid(IConfigurationManager configManager, IPrototypeManager p
                 flavortext = FormattedMessage.RemoveMarkup(FlavorText);
             }
 
-            // Parkstation-HeightSlider Start
             var height = Height;
             if (speciesPrototype != null)
                 height = Math.Clamp(Height, speciesPrototype.MinHeight, speciesPrototype.MaxHeight);
@@ -538,7 +533,6 @@ public void EnsureValid(IConfigurationManager configManager, IPrototypeManager p
             var width = Width;
             if (speciesPrototype != null)
                 width = Math.Clamp(Width, speciesPrototype.MinWidth, speciesPrototype.MaxWidth);
-            // Parkstation-HeightSlider End
 
             var appearance = HumanoidCharacterAppearance.EnsureValid(Appearance, Species, Sex);
 
@@ -610,8 +604,8 @@ public void EnsureValid(IConfigurationManager configManager, IPrototypeManager p
             Name = name;
             FlavorText = flavortext;
             Age = age;
-            Height = height; // Parkstation-HeightSlider
-            Width = width; // Parkstation-HeightSlider
+            Height = height;
+            Width = width;
             Sex = sex;
             Gender = gender;
             Appearance = appearance;

From 133f8899e6aaba1faa058097dccda4fd1134c334 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Sun, 16 Jun 2024 13:53:59 -0400
Subject: [PATCH 18/25] Magnitude is needed here because negative numbers are
 valid inputs, therefore this is +/- 0.49f as valid inputs

---
 Content.Shared/HeightAdjust/HeightAdjustSystem.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Content.Shared/HeightAdjust/HeightAdjustSystem.cs b/Content.Shared/HeightAdjust/HeightAdjustSystem.cs
index affd5259a0b..ef97272073a 100644
--- a/Content.Shared/HeightAdjust/HeightAdjustSystem.cs
+++ b/Content.Shared/HeightAdjust/HeightAdjustSystem.cs
@@ -33,7 +33,7 @@ public bool SetScale(EntityUid uid, float scale)
             foreach (var fixture in fixtures.Fixtures)
             {
                 // _physics.SetDensity(uid, fixture.Key, fixture.Value, fixture.Value.Density * scale); // This does the same thing as below, just without modifying the fixture size
-                _physics.SetRadius(uid, fixture.Key, fixture.Value, fixture.Value.Shape, MathF.Min(fixture.Value.Shape.Radius * scale, 0.49f));
+                _physics.SetRadius(uid, fixture.Key, fixture.Value, fixture.Value.Shape, MathF.MinMagnitude(fixture.Value.Shape.Radius * scale, 0.49f));
             }
         }
         else
@@ -71,7 +71,7 @@ public bool SetScale(EntityUid uid, Vector2 scale)
             foreach (var fixture in fixtures.Fixtures)
             {
                 // _physics.SetDensity(uid, fixture.Key, fixture.Value, fixture.Value.Density * avg); // This does the same thing as below, just without modifying the fixture size
-                _physics.SetRadius(uid, fixture.Key, fixture.Value, fixture.Value.Shape, MathF.Min(fixture.Value.Shape.Radius * avg, 0.49f));
+                _physics.SetRadius(uid, fixture.Key, fixture.Value, fixture.Value.Shape, MathF.MinMagnitude(fixture.Value.Shape.Radius * avg, 0.49f));
             }
         }
         else

From 5310408754f9bfe2a4006509d41a2905373f347c Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Sun, 16 Jun 2024 13:59:59 -0400
Subject: [PATCH 19/25] Returning Oni their higher mass, now that fixtures are
 clamped

---
 Resources/Prototypes/DeltaV/Species/harpy.yml        |  2 --
 .../Nyanotrasen/Entities/Mobs/Species/Oni.yml        | 12 ++++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/DeltaV/Species/harpy.yml b/Resources/Prototypes/DeltaV/Species/harpy.yml
index 358ecca1b7a..384b327ff24 100644
--- a/Resources/Prototypes/DeltaV/Species/harpy.yml
+++ b/Resources/Prototypes/DeltaV/Species/harpy.yml
@@ -7,14 +7,12 @@
   markingLimits: MobHarpyMarkingLimits
   dollPrototype: MobHarpyDummy
   skinColoration: HumanToned
-  # Parkstation-HeightSlider Start
   minHeight: 0.6
   defaultHeight: 0.8
   maxHeight: 1.1
   minWidth: 0.55
   defaultWidth: 0.8
   maxWidth: 1.15
-  # Parkstation-HeightSlider End
 
 - type: speciesBaseSprites
   id: MobHarpySprites
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml
index 41b2832aef8..ab3f6f3d1c1 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml
@@ -21,6 +21,18 @@
     damageModifierSet: Oni
   - type: Body
     prototype: Human
+  - type: Fixtures
+    fixtures: # TODO: This needs a second fixture just for mob collisions.
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.35
+        density: 220
+        restitution: 0.0
+        mask:
+        - MobMask
+        layer:
+        - MobLayer
   - type: Stamina
     critThreshold: 115
   - type: LanguageSpeaker

From 067321141758e3fa7042b8a8226e97b39c1f2681 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Tue, 18 Jun 2024 21:19:32 -0400
Subject: [PATCH 20/25] Two new CVars and height slider now shows actual height
 in CM

---
 .../UI/HumanoidProfileEditor.xaml.cs          | 24 +++++++++----------
 Content.Shared/CCVar/CCVars.cs                | 10 ++++++++
 .../HeightAdjust/HeightAdjustSystem.cs        | 11 +++++----
 .../Humanoid/Prototypes/SpeciesPrototype.cs   | 12 ++++++++++
 .../ui/humanoid-profile-editor.ftl            |  4 ++--
 5 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
index 537b19479c0..c203995fa4e 100644
--- a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
@@ -1,9 +1,7 @@
-using System.Globalization;
 using System.Linq;
 using System.Numerics;
 using System.Text;
 using Content.Client.Guidebook;
-using System.Text.RegularExpressions;
 using Content.Client.Humanoid;
 using Content.Client.Lobby.UI;
 using Content.Client.Message;
@@ -217,7 +215,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,8 +226,8 @@ 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);
             };
 
@@ -242,7 +241,8 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
             _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,8 +252,8 @@ 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);
             };
 
@@ -1200,8 +1200,8 @@ private void UpdateHeightControls()
             _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()
@@ -1215,8 +1215,8 @@ private void UpdateWidthControls()
             _widthSlider.Value = Profile.Width;
             _widthSlider.MaxValue = species.MaxWidth;
 
-            var width = Profile.Width.ToString(CultureInfo.InvariantCulture);
-            CWidthLabel.Text = Loc.GetString("humanoid-profile-editor-width-label", ("width", width.Length > 4 ? width[..4] : width));
+            var width = MathF.Round(species.AverageWidth * _widthSlider.Value);
+            CWidthLabel.Text = Loc.GetString("humanoid-profile-editor-width-label", ("width", width));
         }
 
         private void UpdateHairPickers()
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index 891c790d52c..3ece4b48de4 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -2106,5 +2106,15 @@ public static readonly CVarDef<float>
         /// </summary>
         public static readonly CVarDef<bool> PsionicRollsEnabled =
             CVarDef.Create("psionics.rolls_enabled", true, CVar.SERVERONLY);
+
+        /*
+         * Miscellaneous
+         */
+
+        public static readonly CVarDef<bool> HeightAdjustModifiesHitbox =
+            CVarDef.Create("heightadjust.modifies_hitbox", true, CVar.SERVERONLY);
+
+        public static readonly CVarDef<bool> HeightAdjustModifiesZoom =
+            CVarDef.Create("heightadjust.modifies_zoom", true, CVar.SERVERONLY);
     }
 }
diff --git a/Content.Shared/HeightAdjust/HeightAdjustSystem.cs b/Content.Shared/HeightAdjust/HeightAdjustSystem.cs
index ef97272073a..f7d917545ac 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,12 @@ 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/Prototypes/SpeciesPrototype.cs b/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
index 6184ba58390..8268d0d7c74 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/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl b/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
index cf0957b8942..d767a3ddf37 100644
--- a/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
+++ b/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
@@ -12,8 +12,8 @@ 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-species-label = Species:
 humanoid-profile-editor-pronouns-label = Pronouns:
 humanoid-profile-editor-pronouns-male-text = He / Him

From 639a17ee0f94bf0532587bef0f599f86aa5749c1 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Tue, 18 Jun 2024 22:38:53 -0400
Subject: [PATCH 21/25] Height sliders now include weight

---
 .../Preferences/UI/HumanoidProfileEditor.xaml |  4 ++
 .../UI/HumanoidProfileEditor.xaml.cs          | 43 ++++++++++++++++++-
 .../ui/humanoid-profile-editor.ftl            |  2 +-
 3 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
index 2242720dace..a6b3266a848 100644
--- a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
+++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
@@ -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">
diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
index c203995fa4e..7cdeee7ccd3 100644
--- a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
@@ -30,6 +30,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;
@@ -229,12 +230,14 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
                 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();
             };
 
 
@@ -255,14 +258,34 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
                 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
@@ -943,6 +966,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;
@@ -1216,7 +1240,23 @@ private void UpdateWidthControls()
             _widthSlider.MaxValue = species.MaxWidth;
 
             var width = MathF.Round(species.AverageWidth * _widthSlider.Value);
-            CWidthLabel.Text = Loc.GetString("humanoid-profile-editor-width-label", ("width", width));
+            CWidthLabel.Text = Loc.GetString("humanoid-profile-editor-width-label", ("width", (int) 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));
+            }
         }
 
         private void UpdateHairPickers()
@@ -1376,6 +1416,7 @@ public void UpdateControls()
             UpdateCMarkingsFacialHair();
             UpdateHeightControls();
             UpdateWidthControls();
+            UpdateWeight();
 
             _preferenceUnavailableButton.SelectId((int) Profile.PreferenceUnavailable);
         }
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 d767a3ddf37..043fd4ca3d8 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}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

From 254521887964222f08e8b056517e1e1316ffbffa Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Tue, 18 Jun 2024 23:49:51 -0400
Subject: [PATCH 22/25] UI now automatically resizes the preview

---
 Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
index 7cdeee7ccd3..87b39892057 100644
--- a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
@@ -1257,6 +1257,7 @@ private void UpdateWeight()
                 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()

From 282b207353233dc9182e39789303ae3ba49e3fb8 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Thu, 20 Jun 2024 18:39:13 -0400
Subject: [PATCH 23/25] Apply suggestions from code review

Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
Signed-off-by: VMSolidus <evilexecutive@gmail.com>
---
 Content.Client/Humanoid/HumanoidAppearanceSystem.cs    | 4 ++--
 Content.Shared/Humanoid/HumanoidAppearanceComponent.cs | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Content.Client/Humanoid/HumanoidAppearanceSystem.cs b/Content.Client/Humanoid/HumanoidAppearanceSystem.cs
index 22e2170c9fa..8087d1833e6 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.Shared/Humanoid/HumanoidAppearanceComponent.cs b/Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
index 09ddfb7d503..1d5e24bddaf 100644
--- a/Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
+++ b/Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
@@ -85,7 +85,6 @@ public sealed partial class HumanoidAppearanceComponent : Component
     [ViewVariables(VVAccess.ReadOnly)]
     public Color? CachedFacialHairColor;
 
-    // Parkstation-HeightSlider Start
     /// <summary>
     /// DeltaV - let paradox anomaly be cloned
     /// </summary>
@@ -101,7 +100,6 @@ public sealed partial class HumanoidAppearanceComponent : Component
     /// </summary>
     [DataField, AutoNetworkedField]
     public float Width = 1f;
-    // Parkstation-HeightSlider End
 }
 
 [DataDefinition]

From 57206e7319bb34975cf7ebfdb3f656b0f0c573e4 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Tue, 25 Jun 2024 16:21:35 -0400
Subject: [PATCH 24/25] Apply suggestions from code review

Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Signed-off-by: VMSolidus <evilexecutive@gmail.com>
---
 .../Preferences/UI/HumanoidProfileEditor.xaml.cs      | 11 ++++++-----
 Content.Server.Database/Model.cs                      |  4 ++--
 Content.Shared/CCVar/CCVars.cs                        |  2 +-
 Content.Shared/HeightAdjust/HeightAdjustSystem.cs     | 10 ----------
 .../Humanoid/HumanoidAppearanceComponent.cs           |  2 ++
 .../Humanoid/SharedHumanoidAppearanceSystem.cs        |  4 +---
 .../Preferences/HumanoidCharacterProfile.cs           |  2 +-
 Resources/Prototypes/Species/dwarf.yml                |  2 --
 Resources/Prototypes/Species/reptilian.yml            |  2 --
 9 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
index 8a6fa9a9e2e..c12af382cba 100644
--- a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
@@ -291,9 +291,6 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
                 CWeightLabel.Text = Loc.GetString("humanoid-profile-editor-weight-label", ("weight", (int) 71));
             }
 
-
-
-
             #endregion Height
 
             #region Skin
@@ -960,8 +957,9 @@ private void SetSpecies(string newSpecies)
             OnSkinColorOnValueChanged(); // Species may have special color prefs, make sure to update it.
             CMarkings.SetSpecies(newSpecies); // Repopulate the markings tab as well.
             UpdateSexControls(); // update sex for new species
-            UpdateHeightControls();// - Changing species provides inaccurate sliders
-            UpdateWidthControls();// - Changing species provides inaccurate sliders
+            // Changing species provides inaccurate sliders without these
+            UpdateHeightControls();
+            UpdateWidthControls();
             UpdateWeight();
             RebuildSpriteView(); // they might have different inv so we need a new dummy
             UpdateSpeciesGuidebookIcon();
@@ -1243,8 +1241,10 @@ 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;
@@ -1253,6 +1253,7 @@ private void UpdateWeight()
                 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();
         }
 
diff --git a/Content.Server.Database/Model.cs b/Content.Server.Database/Model.cs
index fed3f11b235..dfb584b3f4b 100644
--- a/Content.Server.Database/Model.cs
+++ b/Content.Server.Database/Model.cs
@@ -338,8 +338,8 @@ public class Profile
         public string Sex { get; set; } = null!;
         public string Gender { get; set; } = null!;
         public string Species { get; set; } = null!;
-        public float Height { get; set; } = 1f; // Parkstation-HeightSlider
-        public float Width { get; set; } = 1f; // Parkstation-HeightSlider
+        public float Height { get; set; } = 1f;
+        public float Width { get; set; } = 1f;
         [Column(TypeName = "jsonb")] public JsonDocument? Markings { get; set; } = null!;
         public string HairName { get; set; } = null!;
         public string HairColor { get; set; } = null!;
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index 7c16139926b..a7d12f47dc8 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -2134,7 +2134,7 @@ public static readonly CVarDef<float>
             CVarDef.Create("heightadjust.modifies_hitbox", true, CVar.SERVERONLY);
 
         /// <summary>
-        ///     Whether height & width sliders adjust a player's view distance
+        ///     Whether height & width sliders adjust a player's max view distance
         /// </summary>
         public static readonly CVarDef<bool> HeightAdjustModifiesZoom =
             CVarDef.Create("heightadjust.modifies_zoom", true, CVar.SERVERONLY);
diff --git a/Content.Shared/HeightAdjust/HeightAdjustSystem.cs b/Content.Shared/HeightAdjust/HeightAdjustSystem.cs
index f7d917545ac..46b2d9b656f 100644
--- a/Content.Shared/HeightAdjust/HeightAdjustSystem.cs
+++ b/Content.Shared/HeightAdjust/HeightAdjustSystem.cs
@@ -32,13 +32,8 @@ public bool SetScale(EntityUid uid, float scale)
             succeeded = false;
 
         if (_config.GetCVar(CCVars.HeightAdjustModifiesHitbox) && EntityManager.TryGetComponent<FixturesComponent>(uid, out var fixtures))
-        {
             foreach (var fixture in fixtures.Fixtures)
-            {
-                // _physics.SetDensity(uid, fixture.Key, fixture.Value, fixture.Value.Density * scale); // This does the same thing as below, just without modifying the fixture size
                 _physics.SetRadius(uid, fixture.Key, fixture.Value, fixture.Value.Shape, MathF.MinMagnitude(fixture.Value.Shape.Radius * scale, 0.49f));
-            }
-        }
         else
             succeeded = false;
 
@@ -70,13 +65,8 @@ public bool SetScale(EntityUid uid, Vector2 scale)
             succeeded = false;
 
         if (_config.GetCVar(CCVars.HeightAdjustModifiesHitbox) && EntityManager.TryGetComponent<FixturesComponent>(uid, out var fixtures))
-        {
             foreach (var fixture in fixtures.Fixtures)
-            {
-                // _physics.SetDensity(uid, fixture.Key, fixture.Value, fixture.Value.Density * avg); // This does the same thing as below, just without modifying the fixture size
                 _physics.SetRadius(uid, fixture.Key, fixture.Value, fixture.Value.Shape, MathF.MinMagnitude(fixture.Value.Shape.Radius * avg, 0.49f));
-            }
-        }
         else
             succeeded = false;
 
diff --git a/Content.Shared/Humanoid/HumanoidAppearanceComponent.cs b/Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
index 1d5e24bddaf..c9292337d7d 100644
--- a/Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
+++ b/Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
@@ -90,6 +90,8 @@ public sealed partial class HumanoidAppearanceComponent : Component
     /// </summary>
     [ViewVariables]
     public HumanoidCharacterProfile? LastProfileLoaded;
+
+    /// <summary>
     ///     The height of this humanoid.
     /// </summary>
     [DataField, AutoNetworkedField]
diff --git a/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs b/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
index 2ac63f066e3..6062bec8b05 100644
--- a/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
+++ b/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
@@ -251,7 +251,6 @@ public void SetSex(EntityUid uid, Sex sex, bool sync = true, HumanoidAppearanceC
         }
     }
 
-    // Parkstation-HeightSlider Start
     /// <summary>
     ///     Set the height of a humanoid mob
     /// </summary>
@@ -309,7 +308,6 @@ public void SetScale(EntityUid uid, Vector2 scale, bool sync = true, HumanoidApp
         if (sync)
             Dirty(humanoid);
     }
-    // Parkstation-HeightSlider End
 
     /// <summary>
     ///     Loads a humanoid character profile directly onto this humanoid mob.
@@ -392,7 +390,7 @@ public virtual void LoadProfile(EntityUid uid, HumanoidCharacterProfile profile,
 
         humanoid.Age = profile.Age;
 
-        _heightAdjust.SetScale(uid, new Vector2(profile.Width, profile.Height)); // Parkstation-HeightSlider
+        _heightAdjust.SetScale(uid, new Vector2(profile.Width, profile.Height));
 
         humanoid.LastProfileLoaded = profile; // DeltaV - let paradox anomaly be cloned
 
diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
index 0d9078d21b9..601a62da894 100644
--- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs
+++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
@@ -231,7 +231,7 @@ public static HumanoidCharacterProfile RandomWithSpecies(string species = Shared
 
         public string Name { get; private set; }
         public string FlavorText { get; private set; }
-        [DataField("species")] // :)
+        [DataField("species")]
         public string Species { get; private set; }
 
         [DataField("height")]
diff --git a/Resources/Prototypes/Species/dwarf.yml b/Resources/Prototypes/Species/dwarf.yml
index 23363210d84..d32f1e6476a 100644
--- a/Resources/Prototypes/Species/dwarf.yml
+++ b/Resources/Prototypes/Species/dwarf.yml
@@ -7,11 +7,9 @@
   markingLimits: MobHumanMarkingLimits
   dollPrototype: MobDwarfDummy
   skinColoration: HumanToned
-  # Parkstation-HeightSlider Start
   minHeight: 0.6
   defaultHeight: 0.8
   maxHeight: 0.8
   minWidth: 0.55
   defaultWidth: 0.8
   maxWidth: 0.85
-  # Parkstation-HeightSlider End
diff --git a/Resources/Prototypes/Species/reptilian.yml b/Resources/Prototypes/Species/reptilian.yml
index d476ea7b275..752918e2f0c 100644
--- a/Resources/Prototypes/Species/reptilian.yml
+++ b/Resources/Prototypes/Species/reptilian.yml
@@ -11,14 +11,12 @@
   maleFirstNames: names_reptilian_male
   femaleFirstNames: names_reptilian_female
   naming: FirstDashFirst
-  # Parkstation-HeightSlider Start
   minHeight: 0.7
   defaultHeight: 0.95
   maxHeight: 1.25
   minWidth: 0.65
   defaultWidth: 0.95
   maxWidth: 1.3
-  # Parkstation-HeightSlider End
 
 - type: speciesBaseSprites
   id: MobReptilianSprites

From 290d1dbfd054b289923f7dc495ca7b0b99c109d9 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Thu, 27 Jun 2024 03:53:51 -0400
Subject: [PATCH 25/25] Apply suggestions from code review

Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Signed-off-by: VMSolidus <evilexecutive@gmail.com>
---
 Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
index c12af382cba..c797f02a754 100644
--- a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
@@ -220,7 +220,6 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
 
             var prototype = _speciesList.Find(x => x.ID == Profile?.Species) ?? _speciesList.First();
 
-
             _heightSlider.MinValue = prototype.MinHeight;
             _heightSlider.MaxValue = prototype.MaxHeight;
             _heightSlider.Value = Profile?.Height ?? prototype.DefaultHeight;
@@ -287,7 +286,7 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
             }
             else
             {
-                //Whelp, the fixture doesn't exist, guesstimate it instead
+                // Whelp, the fixture doesn't exist, guesstimate it instead
                 CWeightLabel.Text = Loc.GetString("humanoid-profile-editor-weight-label", ("weight", (int) 71));
             }