diff --git a/Content.Client/Humanoid/HumanoidAppearanceSystem.cs b/Content.Client/Humanoid/HumanoidAppearanceSystem.cs
index 402167342b..6eb5dd9ec9 100644
--- a/Content.Client/Humanoid/HumanoidAppearanceSystem.cs
+++ b/Content.Client/Humanoid/HumanoidAppearanceSystem.cs
@@ -194,7 +194,6 @@ public override void LoadProfile(EntityUid uid, HumanoidCharacterProfile? profil
         humanoid.Sex = profile.Sex;
         humanoid.Gender = profile.Gender;
         humanoid.Age = profile.Age;
-        humanoid.Height = profile.Height;
         humanoid.Species = profile.Species;
         humanoid.SkinColor = profile.Appearance.SkinColor;
         humanoid.EyeColor = profile.Appearance.EyeColor;
diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
index e8e619ae6d..e80e0bf7d8 100644
--- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
@@ -327,16 +327,16 @@ public HumanoidProfileEditor(
 
             #region SpawnPriority
 
-            foreach (var value in Enum.GetValues<SpawnPriorityPreference>())
-            {
-                SpawnPriorityButton.AddItem(Loc.GetString($"humanoid-profile-editor-preference-spawn-priority-{value.ToString().ToLower()}"), (int) value);
-            }
-
-            SpawnPriorityButton.OnItemSelected += args =>
-            {
-                SpawnPriorityButton.SelectId(args.Id);
-                SetSpawnPriority((SpawnPriorityPreference) args.Id);
-            };
+            // foreach (var value in Enum.GetValues<SpawnPriorityPreference>())
+            // {
+            //     SpawnPriorityButton.AddItem(Loc.GetString($"humanoid-profile-editor-preference-spawn-priority-{value.ToString().ToLower()}"), (int) value);
+            // }
+            //
+            // SpawnPriorityButton.OnItemSelected += args =>
+            // {
+            //     SpawnPriorityButton.SelectId(args.Id);
+            //     SetSpawnPriority((SpawnPriorityPreference) args.Id);
+            // };
 
             #endregion SpawnPriority
 
@@ -1367,7 +1367,7 @@ private void UpdateSpawnPriorityControls()
                 return;
             }
 
-            SpawnPriorityButton.SelectId((int) Profile.SpawnPriority);
+            // SpawnPriorityButton.SelectId((int) Profile.SpawnPriority);
         }
 
         private void UpdateHairPickers()
diff --git a/Content.Client/Lobby/UI/LobbyGui.xaml b/Content.Client/Lobby/UI/LobbyGui.xaml
index 5fe261a7c9..9df0c3d8f0 100644
--- a/Content.Client/Lobby/UI/LobbyGui.xaml
+++ b/Content.Client/Lobby/UI/LobbyGui.xaml
@@ -146,6 +146,8 @@
                     <Label Name="StationTime" Access="Public" FontColorOverride="{x:Static maths:Color.LightGray}"
                            Margin="3 3 3 3" HorizontalAlignment="Left" />
                     <controls:HSpacer Spacing="5" />
+                    <lobbyUi:LobbyCharacterPreviewPanel Name="CharacterPreview" Access="Public" />
+                    <controls:HSpacer Spacing="5" />
                     <BoxContainer MinHeight="10" />
                     <!-- Gold line -->
                     <controls:HLine Color="{x:Static style:StyleNano.NanoGold}" Thickness="2" Access="Public" />
diff --git a/Content.Client/_FTL/FtlPoints/StarmapConsole.xaml.cs b/Content.Client/_FTL/FtlPoints/StarmapConsole.xaml.cs
index 359112c6c6..96f2bb67e8 100644
--- a/Content.Client/_FTL/FtlPoints/StarmapConsole.xaml.cs
+++ b/Content.Client/_FTL/FtlPoints/StarmapConsole.xaml.cs
@@ -44,6 +44,7 @@ public void UpdateState(StarmapConsoleBoundUserInterfaceState state)
     {
         UpdateStars(state.Stars);
         Stars.Range = state.Range;
+
         var currentStar = state.Stars.Find(star => star.Position == Vector2.Zero);
         CurrentStarName.Text = currentStar.Name;
     }
diff --git a/Content.Client/_FTL/ShipWeapons/GunnerConsoleBoundUserInterface.cs b/Content.Client/_FTL/ShipWeapons/GunnerConsoleBoundUserInterface.cs
index e31352d64c..5897ad3b02 100644
--- a/Content.Client/_FTL/ShipWeapons/GunnerConsoleBoundUserInterface.cs
+++ b/Content.Client/_FTL/ShipWeapons/GunnerConsoleBoundUserInterface.cs
@@ -70,7 +70,7 @@ protected override void UpdateState(BoundUserInterfaceState state)
         if (state is not GunnerConsoleBoundInterfaceState cState)
             return;
 
-        _window?.SetMatrix(_entityManager.GetCoordinates(cState.Coordinates), cState.Angle);
+        _window?.SetMatrix(_entityManager.GetCoordinates(cState.State.Coordinates), cState.State.Angle);
         _window?.UpdateState(cState);
     }
 }
diff --git a/Content.Client/_FTL/ShipWeapons/GunnerConsoleWindow.xaml b/Content.Client/_FTL/ShipWeapons/GunnerConsoleWindow.xaml
index 590f3a10b7..945ead8e5d 100644
--- a/Content.Client/_FTL/ShipWeapons/GunnerConsoleWindow.xaml
+++ b/Content.Client/_FTL/ShipWeapons/GunnerConsoleWindow.xaml
@@ -11,7 +11,7 @@
                         HorizontalAlignment = "Stretch"
                         HorizontalExpand = "True"
                         VerticalExpand = "True">
-            <ui:RadarControl Name="RadarScreen"
+            <ui:ShuttleNavControl Name="RadarScreen"
                              MouseFilter="Stop"
                              Margin="4"
                              HorizontalExpand = "True"
diff --git a/Content.Client/_FTL/ShipWeapons/GunnerConsoleWindow.xaml.cs b/Content.Client/_FTL/ShipWeapons/GunnerConsoleWindow.xaml.cs
index 9c869343f3..d206e4336b 100644
--- a/Content.Client/_FTL/ShipWeapons/GunnerConsoleWindow.xaml.cs
+++ b/Content.Client/_FTL/ShipWeapons/GunnerConsoleWindow.xaml.cs
@@ -47,16 +47,10 @@ public void SetMatrix(EntityCoordinates? coordinates, Angle? angle)
     public void UpdateState(GunnerConsoleBoundInterfaceState scc)
     {
         // update the radar
-        var radarState = new RadarConsoleBoundInterfaceState(
-            scc.MaxRange,
-            scc.Coordinates,
-            scc.Angle,
-            scc.Weapons
-        );
-        RadarScreen.UpdateState(radarState);
+        RadarScreen.UpdateState(scc.State);
 
         // update ammo text
         AmmoCounter.Text = scc.CurrentAmmo <= 0 ? Loc.GetString("gunner-console-no-ammo") : $"{scc.CurrentAmmo}/{scc.MaxAmmo}";
-        MaxRadarRange.Text = $"{scc.MaxRange:0}";
+        // MaxRadarRange.Text = $"{scc.MaxRange:0}";
     }
 }
diff --git a/Content.Server.Database/Migrations/Sqlite/20240709052304_HeightRemoval.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20240709052304_HeightRemoval.Designer.cs
new file mode 100644
index 0000000000..2b0456f5df
--- /dev/null
+++ b/Content.Server.Database/Migrations/Sqlite/20240709052304_HeightRemoval.Designer.cs
@@ -0,0 +1,1838 @@
+// <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("20240709052304_HeightRemoval")]
+    partial class HeightRemoval
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "8.0.0");
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<int?>("AdminRankId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("title");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_admin");
+
+                    b.HasIndex("AdminRankId")
+                        .HasDatabaseName("IX_admin_admin_rank_id");
+
+                    b.ToTable("admin", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_flag_id");
+
+                    b.Property<Guid>("AdminId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("admin_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("flag");
+
+                    b.Property<bool>("Negative")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("negative");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_flag");
+
+                    b.HasIndex("AdminId")
+                        .HasDatabaseName("IX_admin_flag_admin_id");
+
+                    b.HasIndex("Flag", "AdminId")
+                        .IsUnique();
+
+                    b.ToTable("admin_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Id")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_log_id");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("date");
+
+                    b.Property<sbyte>("Impact")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("impact");
+
+                    b.Property<string>("Json")
+                        .IsRequired()
+                        .HasColumnType("jsonb")
+                        .HasColumnName("json");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("type");
+
+                    b.HasKey("RoundId", "Id")
+                        .HasName("PK_admin_log");
+
+                    b.HasIndex("Date");
+
+                    b.HasIndex("Type")
+                        .HasDatabaseName("IX_admin_log_type");
+
+                    b.ToTable("admin_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("LogId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("log_id");
+
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.HasKey("RoundId", "LogId", "PlayerUserId")
+                        .HasName("PK_admin_log_player");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_log_player_player_user_id");
+
+                    b.ToTable("admin_log_player", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_messages_id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<bool>("Dismissed")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("dismissed");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Seen")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("seen");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_messages");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_messages_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_messages_round_id");
+
+                    b.ToTable("admin_messages", null, t =>
+                        {
+                            t.HasCheckConstraint("NotDismissedAndSeen", "NOT dismissed OR seen");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_notes_id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Secret")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("secret");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_notes");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_notes_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_notes_round_id");
+
+                    b.ToTable("admin_notes", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank");
+
+                    b.ToTable("admin_rank", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_flag_id");
+
+                    b.Property<int>("AdminRankId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("flag");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank_flag");
+
+                    b.HasIndex("AdminRankId");
+
+                    b.HasIndex("Flag", "AdminRankId")
+                        .IsUnique();
+
+                    b.ToTable("admin_rank_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_watchlists_id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_watchlists");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_watchlists_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_watchlists_round_id");
+
+                    b.ToTable("admin_watchlists", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("antag_id");
+
+                    b.Property<string>("AntagName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("antag_name");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_antag");
+
+                    b.HasIndex("ProfileId", "AntagName")
+                        .IsUnique();
+
+                    b.ToTable("antag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AssignedUserId", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("assigned_user_id_id");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_assigned_user_id");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.HasIndex("UserName")
+                        .IsUnique();
+
+                    b.ToTable("assigned_user_id", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.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<int>("ServerId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasDefaultValue(0)
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("time");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_connection_log");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_connection_log_server_id");
+
+                    b.HasIndex("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>("CharacterName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("char_name");
+
+                    b.Property<string>("EyeColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("eye_color");
+
+                    b.Property<string>("FacialHairColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("facial_hair_color");
+
+                    b.Property<string>("FacialHairName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("facial_hair_name");
+
+                    b.Property<string>("FlavorText")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("flavor_text");
+
+                    b.Property<string>("Gender")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("gender");
+
+                    b.Property<string>("HairColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("hair_color");
+
+                    b.Property<string>("HairName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("hair_name");
+
+                    b.Property<byte[]>("Markings")
+                        .HasColumnType("jsonb")
+                        .HasColumnName("markings");
+
+                    b.Property<int>("PreferenceId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("preference_id");
+
+                    b.Property<int>("PreferenceUnavailable")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("pref_unavailable");
+
+                    b.Property<string>("Sex")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("sex");
+
+                    b.Property<string>("SkinColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("skin_color");
+
+                    b.Property<int>("Slot")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("slot");
+
+                    b.Property<int>("SpawnPriority")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("spawn_priority");
+
+                    b.Property<string>("Species")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("species");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile");
+
+                    b.HasIndex("PreferenceId")
+                        .HasDatabaseName("IX_profile_preference_id");
+
+                    b.HasIndex("Slot", "PreferenceId")
+                        .IsUnique();
+
+                    b.ToTable("profile", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadout", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_loadout_id");
+
+                    b.Property<string>("LoadoutName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("loadout_name");
+
+                    b.Property<int>("ProfileLoadoutGroupId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_loadout_group_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_loadout");
+
+                    b.HasIndex("ProfileLoadoutGroupId");
+
+                    b.ToTable("profile_loadout", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_loadout_group_id");
+
+                    b.Property<string>("GroupName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("group_name");
+
+                    b.Property<int>("ProfileRoleLoadoutId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_role_loadout_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_loadout_group");
+
+                    b.HasIndex("ProfileRoleLoadoutId");
+
+                    b.ToTable("profile_loadout_group", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_role_loadout_id");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("RoleName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("role_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_role_loadout");
+
+                    b.HasIndex("ProfileId");
+
+                    b.ToTable("profile_role_loadout", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
+                {
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("role_id");
+
+                    b.HasKey("PlayerUserId", "RoleId")
+                        .HasName("PK_role_whitelists");
+
+                    b.ToTable("role_whitelists", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("ServerId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime?>("StartDate")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("start_date");
+
+                    b.HasKey("Id")
+                        .HasName("PK_round");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_round_server_id");
+
+                    b.HasIndex("StartDate");
+
+                    b.ToTable("round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_id");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server");
+
+                    b.ToTable("server", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_ban_id");
+
+                    b.Property<string>("Address")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<bool>("AutoDelete")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("auto_delete");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<int>("ExemptFlags")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("exempt_flags");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("BLOB")
+                        .HasColumnName("hwid");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("reason");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_ban_round_id");
+
+                    b.ToTable("server_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanExemption", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<int>("Flags")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("flags");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_server_ban_exemption");
+
+                    b.ToTable("server_ban_exemption", null, t =>
+                        {
+                            t.HasCheckConstraint("FlagsNotZero", "flags != 0");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_ban_hit_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<int>("ConnectionId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("connection_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban_hit");
+
+                    b.HasIndex("BanId")
+                        .HasDatabaseName("IX_server_ban_hit_ban_id");
+
+                    b.HasIndex("ConnectionId")
+                        .HasDatabaseName("IX_server_ban_hit_connection_id");
+
+                    b.ToTable("server_ban_hit", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_role_ban_id");
+
+                    b.Property<string>("Address")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("BLOB")
+                        .HasColumnName("hwid");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("reason");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("role_id");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_role_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_role_ban_round_id");
+
+                    b.ToTable("server_role_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("role_unban_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_role_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("unban_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("trait_id");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("TraitName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("trait_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_trait");
+
+                    b.HasIndex("ProfileId", "TraitName")
+                        .IsUnique();
+
+                    b.ToTable("trait", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.UploadedResourceLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("uploaded_resource_log_id");
+
+                    b.Property<byte[]>("Data")
+                        .IsRequired()
+                        .HasColumnType("BLOB")
+                        .HasColumnName("data");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("date");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("path");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_uploaded_resource_log");
+
+                    b.ToTable("uploaded_resource_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Whitelist", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_whitelist");
+
+                    b.ToTable("whitelist", (string)null);
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.Property<int>("PlayersId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("players_id");
+
+                    b.Property<int>("RoundsId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("rounds_id");
+
+                    b.HasKey("PlayersId", "RoundsId")
+                        .HasName("PK_player_round");
+
+                    b.HasIndex("RoundsId")
+                        .HasDatabaseName("IX_player_round_rounds_id");
+
+                    b.ToTable("player_round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "AdminRank")
+                        .WithMany("Admins")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_admin_rank_admin_rank_id");
+
+                    b.Navigation("AdminRank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Admin", "Admin")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_flag_admin_admin_id");
+
+                    b.Navigation("Admin");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("RoundId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_round_round_id");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.AdminLog", "Log")
+                        .WithMany("Players")
+                        .HasForeignKey("RoundId", "LogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_admin_log_round_id_log_id");
+
+                    b.Navigation("Log");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminMessagesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminMessagesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminMessagesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminMessagesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_messages_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_messages_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminNotesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminNotesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminNotesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminNotesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_notes_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_notes_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "Rank")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_rank_flag_admin_rank_admin_rank_id");
+
+                    b.Navigation("Rank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminWatchlistsCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminWatchlistsDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminWatchlistsLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminWatchlistsReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_watchlists_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_watchlists_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Antags")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_antag_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("ConnectionLogs")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .IsRequired()
+                        .HasConstraintName("FK_connection_log_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Jobs")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_job_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.HasOne("Content.Server.Database.Preference", "Preference")
+                        .WithMany("Profiles")
+                        .HasForeignKey("PreferenceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_preference_preference_id");
+
+                    b.Navigation("Preference");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadout", b =>
+                {
+                    b.HasOne("Content.Server.Database.ProfileLoadoutGroup", "ProfileLoadoutGroup")
+                        .WithMany("Loadouts")
+                        .HasForeignKey("ProfileLoadoutGroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_loadout_profile_loadout_group_profile_loadout_group_id");
+
+                    b.Navigation("ProfileLoadoutGroup");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.HasOne("Content.Server.Database.ProfileRoleLoadout", "ProfileRoleLoadout")
+                        .WithMany("Groups")
+                        .HasForeignKey("ProfileRoleLoadoutId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_loadout_group_profile_role_loadout_profile_role_loadout_id");
+
+                    b.Navigation("ProfileRoleLoadout");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Loadouts")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_role_loadout_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("JobWhitelists")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_role_whitelists_player_player_user_id");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("Rounds")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_round_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_ban_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithMany("BanHits")
+                        .HasForeignKey("BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_server_ban_ban_id");
+
+                    b.HasOne("Content.Server.Database.ConnectionLog", "Connection")
+                        .WithMany("BanHits")
+                        .HasForeignKey("ConnectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_connection_log_connection_id");
+
+                    b.Navigation("Ban");
+
+                    b.Navigation("Connection");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerRoleBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerRoleBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_role_ban_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerRoleBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerRoleUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_role_unban_server_role_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_unban_server_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Traits")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_trait_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", null)
+                        .WithMany()
+                        .HasForeignKey("PlayersId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_player_players_id");
+
+                    b.HasOne("Content.Server.Database.Round", null)
+                        .WithMany()
+                        .HasForeignKey("RoundsId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_round_rounds_id");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Navigation("Players");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Navigation("Admins");
+
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Navigation("BanHits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Navigation("AdminLogs");
+
+                    b.Navigation("AdminMessagesCreated");
+
+                    b.Navigation("AdminMessagesDeleted");
+
+                    b.Navigation("AdminMessagesLastEdited");
+
+                    b.Navigation("AdminMessagesReceived");
+
+                    b.Navigation("AdminNotesCreated");
+
+                    b.Navigation("AdminNotesDeleted");
+
+                    b.Navigation("AdminNotesLastEdited");
+
+                    b.Navigation("AdminNotesReceived");
+
+                    b.Navigation("AdminServerBansCreated");
+
+                    b.Navigation("AdminServerBansLastEdited");
+
+                    b.Navigation("AdminServerRoleBansCreated");
+
+                    b.Navigation("AdminServerRoleBansLastEdited");
+
+                    b.Navigation("AdminWatchlistsCreated");
+
+                    b.Navigation("AdminWatchlistsDeleted");
+
+                    b.Navigation("AdminWatchlistsLastEdited");
+
+                    b.Navigation("AdminWatchlistsReceived");
+
+                    b.Navigation("JobWhitelists");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Navigation("Profiles");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Navigation("Antags");
+
+                    b.Navigation("Jobs");
+
+                    b.Navigation("Loadouts");
+
+                    b.Navigation("Traits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.Navigation("Loadouts");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.Navigation("Groups");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Navigation("AdminLogs");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Navigation("ConnectionLogs");
+
+                    b.Navigation("Rounds");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Navigation("BanHits");
+
+                    b.Navigation("Unban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Navigation("Unban");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Sqlite/20240709052304_HeightRemoval.cs b/Content.Server.Database/Migrations/Sqlite/20240709052304_HeightRemoval.cs
new file mode 100644
index 0000000000..c8cfd8ca0f
--- /dev/null
+++ b/Content.Server.Database/Migrations/Sqlite/20240709052304_HeightRemoval.cs
@@ -0,0 +1,29 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Sqlite
+{
+    /// <inheritdoc />
+    public partial class HeightRemoval : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "height",
+                table: "profile");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<float>(
+                name: "height",
+                table: "profile",
+                type: "REAL",
+                nullable: false,
+                defaultValue: 1f);
+        }
+    }
+}
diff --git a/Content.Server/Database/ServerDbBase.cs b/Content.Server/Database/ServerDbBase.cs
index 9a8439b8c0..cd03af7087 100644
--- a/Content.Server/Database/ServerDbBase.cs
+++ b/Content.Server/Database/ServerDbBase.cs
@@ -278,7 +278,6 @@ 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 b384d62e58..505ad4f16c 100644
--- a/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
+++ b/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
@@ -41,7 +41,6 @@ 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.Server/_FTL/AutomatedShip/Systems/AutomatedShipSystem.cs b/Content.Server/_FTL/AutomatedShip/Systems/AutomatedShipSystem.cs
index dd5ceb1df2..80a57dacbf 100644
--- a/Content.Server/_FTL/AutomatedShip/Systems/AutomatedShipSystem.cs
+++ b/Content.Server/_FTL/AutomatedShip/Systems/AutomatedShipSystem.cs
@@ -3,6 +3,7 @@
 using Content.Server._FTL.ShipTracker.Events;
 using Content.Server.NPC.Systems;
 using Content.Server.Weapons.Ranged.Systems;
+using Content.Shared.NPC.Systems;
 using Robust.Server.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Random;
diff --git a/Content.Server/_FTL/Economy/EconomySystem.cs b/Content.Server/_FTL/Economy/EconomySystem.cs
index 2420454a20..c47a8acc64 100644
--- a/Content.Server/_FTL/Economy/EconomySystem.cs
+++ b/Content.Server/_FTL/Economy/EconomySystem.cs
@@ -158,7 +158,7 @@ private void UpdateUserInterface(EntityUid uid, IdAtmComponent? component = null
         Log.Debug("id in:" + component.IdSlot.HasItem);
 
         var state = new IdAtmUiState(name ?? "John Doe", bank, cash, component.IdSlot.HasItem, cardComponent?.Locked ?? false);
-        _userInterfaceSystem.TrySetUiState(uid, IdAtmUiKey.Key, state);
+        _userInterfaceSystem.SetUiState(uid, IdAtmUiKey.Key, state);
     }
 
     private void OnMoneyHolderComponentRemove(EntityUid uid, IdAtmComponent component, ComponentRemove args)
diff --git a/Content.Server/_FTL/FTLPoints/Effects/ToPlanetEffect.cs b/Content.Server/_FTL/FTLPoints/Effects/ToPlanetEffect.cs
index 94190fb7ef..16022e1f78 100644
--- a/Content.Server/_FTL/FTLPoints/Effects/ToPlanetEffect.cs
+++ b/Content.Server/_FTL/FTLPoints/Effects/ToPlanetEffect.cs
@@ -63,10 +63,10 @@ public override void Effect(FtlPointEffectArgs args)
         var mixture = new GasMixture(2500)
         {
             Temperature = 293.15f,
-            Moles = moles,
+            // Moles = moles,
         };
 
-        args.EntityManager.System<AtmosphereSystem>().SetMapAtmosphere(args.MapUid, false, mixture, atmos);
+        // args.EntityManager.System<AtmosphereSystem>().SetMapAtmosphere(args.MapUid, false, mixture, atmos);
 
         args.EntityManager.EnsureComponent<MapGridComponent>(args.MapUid);
     }
diff --git a/Content.Server/_FTL/FTLPoints/Systems/FtlPointsSystem.Starmap.cs b/Content.Server/_FTL/FTLPoints/Systems/FtlPointsSystem.Starmap.cs
index bceb1f4b8f..e91a2460af 100644
--- a/Content.Server/_FTL/FTLPoints/Systems/FtlPointsSystem.Starmap.cs
+++ b/Content.Server/_FTL/FTLPoints/Systems/FtlPointsSystem.Starmap.cs
@@ -3,7 +3,6 @@
 using System.Numerics;
 using Content.Server._FTL.FTLPoints.Components;
 using Content.Server.Shuttles.Components;
-using Content.Server.UserInterface;
 using Content.Shared._FTL.FtlPoints;
 using Content.Shared.UserInterface;
 using JetBrains.Annotations;
@@ -25,6 +24,7 @@ private void OnInit(EntityUid uid, StarMapComponent component, ComponentStartup
     }
 
     // ew i know singletons suck but this is the only thing that makes sense
+    // TODO: just do an entityquery for maps and then store the position in the star component
     public bool TryGetStarMap([NotNullWhen(true)] ref StarMapComponent? component)
     {
         if (component != null)
@@ -61,7 +61,7 @@ private void UpdateUserInterface(EntityUid uid, StarmapConsoleComponent? compone
         stars.Insert(0, star.Value with {Position = Vector2.Zero});
         var state = new StarmapConsoleBoundUserInterfaceState(stars, range);
 
-        _userInterface.TrySetUiState(uid, StarmapConsoleUiKey.Key, state);
+        _userInterface.SetUiState(uid, StarmapConsoleUiKey.Key, state);
     }
 
     #region Public API
diff --git a/Content.Server/_FTL/FTLPoints/Systems/FtlPointsSystem.WarpDrive.cs b/Content.Server/_FTL/FTLPoints/Systems/FtlPointsSystem.WarpDrive.cs
index b20221b71b..fb349a901e 100644
--- a/Content.Server/_FTL/FTLPoints/Systems/FtlPointsSystem.WarpDrive.cs
+++ b/Content.Server/_FTL/FTLPoints/Systems/FtlPointsSystem.WarpDrive.cs
@@ -68,7 +68,7 @@ private void DriveUpdate(float frameTime)
             if (!warpingShipComponent.TargetMap.HasValue)
                 continue;
 
-            _shuttleSystem.FTLTravel(grid, shuttleComponent, _mapManager.GetMapEntityId(warpingShipComponent.TargetMap.Value));
+            // _shuttleSystem.FTLTravel(grid, shuttleComponent, _mapManager.GetMapEntityId(warpingShipComponent.TargetMap.Value));
             warpingShipComponent.TargetMap = null;
             component.Charge = 0;
             component.Charging = false;
diff --git a/Content.Server/_FTL/FTLPoints/Systems/FtlPointsSystem.cs b/Content.Server/_FTL/FTLPoints/Systems/FtlPointsSystem.cs
index 9c8460433f..6326cb5db5 100644
--- a/Content.Server/_FTL/FTLPoints/Systems/FtlPointsSystem.cs
+++ b/Content.Server/_FTL/FTLPoints/Systems/FtlPointsSystem.cs
@@ -15,6 +15,7 @@
 using Content.Shared.Random;
 using Content.Shared.Random.Helpers;
 using Content.Shared.Salvage;
+using Content.Shared.Shuttles.Components;
 using Content.Shared.UserInterface;
 using Robust.Server.GameObjects;
 using Robust.Shared;
diff --git a/Content.Server/_FTL/PowerControl/PowerControlSystem.cs b/Content.Server/_FTL/PowerControl/PowerControlSystem.cs
index 0b76c53160..3ebdf50603 100644
--- a/Content.Server/_FTL/PowerControl/PowerControlSystem.cs
+++ b/Content.Server/_FTL/PowerControl/PowerControlSystem.cs
@@ -11,42 +11,5 @@ namespace Content.Server._FTL.PowerControl;
 /// <inheritdoc/>
 public sealed class PowerControlSystem : SharedPowerControlSystem
 {
-    [Dependency] private readonly UserInterfaceSystem _userInterface = default!;
-    [Dependency] private readonly IEntityManager _entityManager = default!;
-    [Dependency] private readonly AreaSystem _areas = default!;
-    [Dependency] private readonly ApcSystem _apc = default!;
 
-    /// <inheritdoc/>
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<PowerControlComponent, AfterActivatableUIOpenEvent>(OnToggleInterface);
-        SubscribeLocalEvent<PowerControlComponent, ToggleApcMessage>(OnApcToggleRequestMessage);
-        base.Initialize();
-    }
-
-    private void OnApcToggleRequestMessage(EntityUid uid, PowerControlComponent component, ToggleApcMessage message)
-    {
-        var apc = _entityManager.GetEntity(message.ApcEntity);
-;
-        _apc.ApcToggleBreaker(apc);
-        UpdateUserInterface(uid, component);
-    }
-
-    private void UpdateUserInterface(EntityUid uid, PowerControlComponent? component = null)
-    {
-        if (!Resolve(uid, ref component))
-            return;
-
-        var xform = Transform(uid);
-        if (xform.GridUid == null)
-            return;
-
-        var state = new PowerControlState(_areas.GetAreasOnGrid(xform.GridUid));
-        _userInterface.TrySetUiState(uid, PowerControlUiKey.Key, state);
-    }
-
-    private void OnToggleInterface(EntityUid uid, PowerControlComponent component, AfterActivatableUIOpenEvent args)
-    {
-        UpdateUserInterface(uid, component);
-    }
 }
diff --git a/Content.Server/_FTL/ShipTracker/Rules/EndOnShipDestruction/EndOnShipDestructionSystem.cs b/Content.Server/_FTL/ShipTracker/Rules/EndOnShipDestruction/EndOnShipDestructionSystem.cs
index 9047276a20..593a4df430 100644
--- a/Content.Server/_FTL/ShipTracker/Rules/EndOnShipDestruction/EndOnShipDestructionSystem.cs
+++ b/Content.Server/_FTL/ShipTracker/Rules/EndOnShipDestruction/EndOnShipDestructionSystem.cs
@@ -1,13 +1,10 @@
-using System.Linq;
-using Content.Server._FTL.FTLPoints;
-using Content.Server._FTL.FTLPoints.Systems;
 using Content.Server._FTL.ShipTracker.Components;
 using Content.Server.GameTicking;
 using Content.Server.GameTicking.Rules;
-using Content.Server.GameTicking.Rules.Components;
 using Content.Server.RoundEnd;
 using Content.Server.Station.Components;
 using Content.Server.Station.Systems;
+using Content.Shared.GameTicking.Components;
 
 namespace Content.Server._FTL.ShipTracker.Rules.EndOnShipDestruction;
 
@@ -22,7 +19,6 @@ public sealed class EndOnShipDestructionSystem : GameRuleSystem<EndOnShipDestruc
     public override void Initialize()
     {
         base.Initialize();
-        SubscribeLocalEvent<RoundEndTextAppendEvent>(OnRoundEndText);
         SubscribeLocalEvent<PlayerSpawningEvent>(OnPlayerSpawningEvent);
     }
 
@@ -58,9 +54,9 @@ private void OnPlayerSpawningEvent(PlayerSpawningEvent ev)
         }
     }
 
-    private void OnRoundEndText(RoundEndTextAppendEvent ev)
+    protected override void AppendRoundEndText(EntityUid uid, EndOnShipDestructionComponent component, GameRuleComponent gameRule, ref RoundEndTextAppendEvent args)
     {
-        ev.AddLine(Loc.GetString("ftl-gamerule-end-text"));
+        args.AddLine(Loc.GetString("ftl-gamerule-end-text"));
     }
 
     protected override void ActiveTick(EntityUid uid, EndOnShipDestructionComponent component, GameRuleComponent gameRule, float frameTime)
diff --git a/Content.Server/_FTL/ShipWeapons/ShipWeaponsSystem.cs b/Content.Server/_FTL/ShipWeapons/ShipWeaponsSystem.cs
index efbcc7f61a..c0595598e5 100644
--- a/Content.Server/_FTL/ShipWeapons/ShipWeaponsSystem.cs
+++ b/Content.Server/_FTL/ShipWeapons/ShipWeaponsSystem.cs
@@ -159,14 +159,13 @@ private void UpdateUserInterface(EntityUid uid, GunnerConsoleComponent? componen
     {
         if (!Resolve(uid, ref component))
             return;
-
-        var consoleTransform = Transform(uid);
-        TryComp<RadarConsoleComponent>(uid, out var radar);
-
         var totalAmmo = 0;
         var remainingAmmo = 0;
 
-        var weapons = new List<DockingInterfaceState>();
+        var consoleTransform = Transform(uid);
+        if (!TryComp<RadarConsoleComponent>(uid, out var radar))
+            return;
+
         // Render every gun as a DockingInterfaceState
         if (TryComp<DeviceLinkSourceComponent>(uid, out var sourceComponent))
         {
@@ -175,9 +174,6 @@ private void UpdateUserInterface(EntityUid uid, GunnerConsoleComponent? componen
             {
                 foreach (var entity in outputs)
                 {
-                    var gunTransform = Transform(entity);
-                    weapons.Add(new DockingInterfaceState { Angle = gunTransform.LocalRotation, Coordinates = _entityManager.GetNetCoordinates(gunTransform.Coordinates), Entity = _entityManager.GetNetEntity(entity), Color = Color.Red });
-
                     // we cant really do ammo count if it has no guns, so...
                     if (!TryComp<GunComponent>(entity, out _))
                         continue;
@@ -195,16 +191,16 @@ private void UpdateUserInterface(EntityUid uid, GunnerConsoleComponent? componen
         var state = new GunnerConsoleBoundInterfaceState(
             remainingAmmo,
             totalAmmo,
-            range,
-            weapons,
-            _entityManager.GetNetCoordinates(consoleTransform.Coordinates),
-            consoleTransform.LocalRotation
+            new NavInterfaceState(range, _entityManager.GetNetCoordinates(consoleTransform.Coordinates), consoleTransform.LocalRotation, new Dictionary<NetEntity, List<DockingPortState>>())
         );
-        _userInterface.TrySetUiState(uid, ShipWeaponTargetingUiKey.Key, state);
+
+        _userInterface.SetUiState(uid, ShipWeaponTargetingUiKey.Key, state);
+
     }
 
     private void OnToggleInterface(EntityUid uid, GunnerConsoleComponent component, AfterActivatableUIOpenEvent args)
     {
+        _userInterface.TryOpenUi(uid, ShipWeaponTargetingUiKey.Key, args.Actor);
         UpdateUserInterface(uid, component);
     }
 }
diff --git a/Content.Shared/_FTL/ShipWeapons/GunnerConsoleBoundInterfaceState.cs b/Content.Shared/_FTL/ShipWeapons/GunnerConsoleBoundInterfaceState.cs
index 9719aaa096..707e493e2a 100644
--- a/Content.Shared/_FTL/ShipWeapons/GunnerConsoleBoundInterfaceState.cs
+++ b/Content.Shared/_FTL/ShipWeapons/GunnerConsoleBoundInterfaceState.cs
@@ -1,26 +1,22 @@
 using Content.Shared.Shuttles.BUIStates;
-using Robust.Shared.Map;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared._FTL.ShipWeapons;
 
 [Serializable, NetSerializable]
-public sealed class GunnerConsoleBoundInterfaceState : RadarConsoleBoundInterfaceState
+public sealed class GunnerConsoleBoundInterfaceState : BoundUserInterfaceState
 {
     public readonly int CurrentAmmo;
     public readonly int MaxAmmo;
-    public readonly List<DockingInterfaceState> Weapons;
+    public NavInterfaceState State;
 
     public GunnerConsoleBoundInterfaceState(
         int currentAmmo,
         int maxAmmo,
-        float maxRange,
-        List<DockingInterfaceState> weapons,
-        NetCoordinates? coordinates,
-        Angle? angle) : base(maxRange, coordinates, angle, new List<DockingInterfaceState>())
+        NavInterfaceState state)
     {
         CurrentAmmo = currentAmmo;
         MaxAmmo = maxAmmo;
-        Weapons = weapons;
+        State = state;
     }
 }
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
index 0128353600..57a0ba4cde 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
@@ -244,19 +244,6 @@
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterHOS
 
-- type: entity
-  parent: ClothingOuterWinterCoatToggleable
-  id: ClothingOuterWinterHoS
-  name: winter coat
-  suffix: HoS
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coathos.rsi
-  - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coathos.rsi
-  - type: ToggleableClothing
-    clothingPrototype: ClothingHeadHatHoodWinterHOS
-
 - type: entity
   parent: ClothingOuterWinterCoatToggleable
   id: ClothingOuterWinterHydro
diff --git a/Resources/Prototypes/_FTL/Catalog/VendingMachines/Advertisements/vendbot.yml b/Resources/Prototypes/_FTL/Catalog/VendingMachines/Advertisements/vendbot.yml
index 329e5c8a72..5a1ed1754f 100644
--- a/Resources/Prototypes/_FTL/Catalog/VendingMachines/Advertisements/vendbot.yml
+++ b/Resources/Prototypes/_FTL/Catalog/VendingMachines/Advertisements/vendbot.yml
@@ -1,5 +1,5 @@
-- type: advertisementsPack
+- type: localizedDataset
   id: VendBotAds
-  advertisements:
-  - advertisement-vendbot-1
-  - advertisement-vendbot-2
\ No newline at end of file
+  values:
+    prefix: advertisement-vendbot-
+    count: 2
diff --git a/Resources/Prototypes/_FTL/Damage/types.yml b/Resources/Prototypes/_FTL/Damage/types.yml
index ba39c268c2..7f25960ff1 100644
--- a/Resources/Prototypes/_FTL/Damage/types.yml
+++ b/Resources/Prototypes/_FTL/Damage/types.yml
@@ -1,4 +1,5 @@
 - type: damageType
   id: VeilIndividualExposure
+  name: damage-type-vie
   armorCoefficientPrice: 1
   armorFlatPrice: 1
diff --git a/Resources/Prototypes/_FTL/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/_FTL/Entities/Mobs/NPCs/silicon.yml
index 189a455e9c..575953c904 100644
--- a/Resources/Prototypes/_FTL/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/_FTL/Entities/Mobs/NPCs/silicon.yml
@@ -30,9 +30,9 @@
     key: enum.VendingMachineUiKey.Key
   - type: UserInterface
     interfaces:
-    - key: enum.VendingMachineUiKey.Key
-      type: VendingMachineBoundUserInterface
+      enum.VendingMachineUiKey.Key:
+        type: VendingMachineBoundUserInterface
   - type: Advertise
     pack: VendBotAds
   - type: VendingMachine
-    pack: VendBotInventory
\ No newline at end of file
+    pack: VendBotInventory
diff --git a/Resources/Prototypes/_FTL/Entities/Objects/Devices/radio.yml b/Resources/Prototypes/_FTL/Entities/Objects/Devices/radio.yml
index ce3e1fcc2c..482b97d8ee 100644
--- a/Resources/Prototypes/_FTL/Entities/Objects/Devices/radio.yml
+++ b/Resources/Prototypes/_FTL/Entities/Objects/Devices/radio.yml
@@ -17,8 +17,8 @@
     key: enum.IntercomUiKey.Key
   - type: UserInterface
     interfaces:
-    - key: enum.IntercomUiKey.Key
-      type: IntercomBoundUserInterface
+      enum.IntercomUiKey.Key:
+        type: IntercomBoundUserInterface
 
 - type: entity
   name: handheld radio
diff --git a/Resources/Prototypes/_FTL/Entities/Objects/Misc/fire.yml b/Resources/Prototypes/_FTL/Entities/Objects/Misc/fire.yml
index ba314a5bbf..b37ff3acd5 100644
--- a/Resources/Prototypes/_FTL/Entities/Objects/Misc/fire.yml
+++ b/Resources/Prototypes/_FTL/Entities/Objects/Misc/fire.yml
@@ -70,7 +70,7 @@
       heatPerSecond: 10.0
       requiresPower: false
     - type: GrowingKudzu
-    - type: SlowContacts
+    - type: SpeedModifierContacts
       walkSpeedModifier: 0.75
       sprintSpeedModifier: 0.5
     - type: EdgeSpreader
diff --git a/Resources/Prototypes/_FTL/Entities/Structures/Doors/Airlocks/base_bayairlocks.yml b/Resources/Prototypes/_FTL/Entities/Structures/Doors/Airlocks/base_bayairlocks.yml
index 4a87e3f504..b306447aef 100644
--- a/Resources/Prototypes/_FTL/Entities/Structures/Doors/Airlocks/base_bayairlocks.yml
+++ b/Resources/Prototypes/_FTL/Entities/Structures/Doors/Airlocks/base_bayairlocks.yml
@@ -19,12 +19,11 @@
         fix1:
           shape:
             !type:PhysShapeAabb
-            bounds: "-0.49,-0.49,0.49,0.49" # don't want this colliding with walls or they won't close
-          density: 100
+            bounds: "-0.5,-0.5,0.5,0.5"
           mask:
-            - FullTileMask
+          - FullTileMask
           layer:
-            - AirlockLayer
+          - AirlockLayer
     - type: LayerChangeOnWeld
       unWeldedLayer: AirlockLayer
       weldedLayer: WallLayer
@@ -81,7 +80,7 @@
     - type: SpawnOnOverload
     - type: UserInterface
       interfaces:
-        - key: enum.WiresUiKey.Key
+        enum.WiresUiKey.Key:
           type: WiresBoundUserInterface
     - type: Airtight
       fixVacuum: true
@@ -179,44 +178,44 @@
   components:
   - type: Sprite
     layers:
-    - state: closed
-      sprite: _FTL/Structures/Doors/Airlocks/Basic/door.rsi
+    - sprite: _FTL/Structures/Doors/Airlocks/Basic/door.rsi
+      state: closed
+    - sprite: _FTL/Structures/Doors/Airlocks/Basic/color.rsi
       map: ["enum.BayDoorAnimatedLayers.Base"]
     - state: closed
-      sprite: _FTL/Structures/Doors/Airlocks/Basic/color.rsi
       map: ["enum.BayDoorAnimatedLayers.Color"]
-    - state: closed
-      sprite: _FTL/Structures/Doors/Airlocks/Basic/fill_glass.rsi
+    - sprite: _FTL/Structures/Doors/Airlocks/Basic/fill_glass.rsi
+      state: closed
       map: ["enum.BayDoorAnimatedLayers.ColorFill"]
-    - state: closed
+    - sprite: _FTL/Structures/Doors/Airlocks/Basic/stripe.rsi
+      state: closed
       map: ["enum.BayDoorAnimatedLayers.Stripe"]
-      sprite: _FTL/Structures/Doors/Airlocks/Basic/stripe.rsi
-    - state: closed
+    - sprite: _FTL/Structures/Doors/Airlocks/Basic/fill_stripe.rsi
+      state: closed
       map: [ "enum.BayDoorAnimatedLayers.StripeFill" ]
-      sprite: _FTL/Structures/Doors/Airlocks/Basic/fill_stripe.rsi
-    - state: closed
+    - sprite: _FTL/Structures/Doors/Airlocks/Basic/lights_bolts.rsi
+      state: closed
       visible: false
       shader: unshaded
       map: [ "enum.BayDoorAncillaryLayers.BoltLights" ]
-      sprite: _FTL/Structures/Doors/Airlocks/Basic/lights_bolts.rsi
-    - state: opening
+    - sprite: _FTL/Structures/Doors/Airlocks/Basic/lights_green.rsi
+      state: opening
       visible: false
       shader: unshaded
       map: [ "enum.BayDoorAncillaryLayers.GreenLights" ]
-      sprite: _FTL/Structures/Doors/Airlocks/Basic/lights_green.rsi
-    - state: deny
+    - sprite: _FTL/Structures/Doors/Airlocks/Basic/lights_deny.rsi
+      state: deny
       visible: false
       shader: unshaded
       map: [ "enum.BayDoorAncillaryLayers.DenyLights" ]
-      sprite: _FTL/Structures/Doors/Airlocks/Basic/lights_deny.rsi
-    - state: closed
+    - sprite: _FTL/Structures/Doors/Airlocks/Basic/sparks_broken.rsi
+      state: closed
       visible: false
       shader: unshaded
       map: [ "enum.BayDoorAncillaryLayers.Emag" ]
-      sprite: _FTL/Structures/Doors/Airlocks/Basic/sparks_broken.rsi
-    - state: closed
+    - sprite: _FTL/Structures/Doors/Airlocks/Basic/welded.rsi
       map: [ "enum.BayDoorAncillaryLayers.Welded" ]
-      sprite: _FTL/Structures/Doors/Airlocks/Basic/welded.rsi
+      state: closed
       visible: false
 
 - type: entity
diff --git a/Resources/Prototypes/_FTL/Entities/Structures/Machines/Computers/atm.yml b/Resources/Prototypes/_FTL/Entities/Structures/Machines/Computers/atm.yml
index 05e6ef4ea7..91d552ebe8 100644
--- a/Resources/Prototypes/_FTL/Entities/Structures/Machines/Computers/atm.yml
+++ b/Resources/Prototypes/_FTL/Entities/Structures/Machines/Computers/atm.yml
@@ -64,7 +64,7 @@
       key: enum.IdAtmUiKey.Key
     - type: UserInterface
       interfaces:
-        - key: enum.IdAtmUiKey.Key
+        enum.IdAtmUiKey.Key:
           type: IdAtmBoundUserInterface
     - type: PointLight
       radius: 0.8
diff --git a/Resources/Prototypes/_FTL/Entities/Structures/Machines/Computers/bartending_pad.yml b/Resources/Prototypes/_FTL/Entities/Structures/Machines/Computers/bartending_pad.yml
index 279f40413b..3f91aa8baf 100644
--- a/Resources/Prototypes/_FTL/Entities/Structures/Machines/Computers/bartending_pad.yml
+++ b/Resources/Prototypes/_FTL/Entities/Structures/Machines/Computers/bartending_pad.yml
@@ -39,7 +39,7 @@
         Credits: 0
     - type: UserInterface
       interfaces:
-        - key: enum.StoreUiKey.Key
+        enum.StoreUiKey.Key:
           type: StoreBoundUserInterface
     - type: ActivatableUI
       key: enum.StoreUiKey.Key
diff --git a/Resources/Prototypes/_FTL/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/_FTL/Entities/Structures/Machines/Computers/computers.yml
index fd391ef0ab..8d877d9425 100644
--- a/Resources/Prototypes/_FTL/Entities/Structures/Machines/Computers/computers.yml
+++ b/Resources/Prototypes/_FTL/Entities/Structures/Machines/Computers/computers.yml
@@ -26,7 +26,7 @@
     key: enum.ShipWeaponTargetingUiKey.Key
   - type: UserInterface
     interfaces:
-      - key: enum.ShipWeaponTargetingUiKey.Key
+      enum.ShipWeaponTargetingUiKey.Key:
         type: GunnerConsoleBoundUserInterface
   - type: RadarConsole
   - type: GunnerConsole
@@ -41,4 +41,4 @@
   - type: PointLight
     radius: 1.5
     energy: 1.6
-    color: "#17e64b"
\ No newline at end of file
+    color: "#17e64b"
diff --git a/Resources/Prototypes/_FTL/Entities/Structures/Machines/Computers/power_control.yml b/Resources/Prototypes/_FTL/Entities/Structures/Machines/Computers/power_control.yml
index bfb329572d..9dfb0e343c 100644
--- a/Resources/Prototypes/_FTL/Entities/Structures/Machines/Computers/power_control.yml
+++ b/Resources/Prototypes/_FTL/Entities/Structures/Machines/Computers/power_control.yml
@@ -72,7 +72,7 @@
       key: enum.PowerControlUiKey.Key
     - type: UserInterface
       interfaces:
-        - key: enum.PowerControlUiKey.Key
+        enum.PowerControlUiKey.Key:
           type: PowerControlBoundUserInterface
     - type: PointLight
       enabled: false
diff --git a/Resources/Prototypes/_FTL/Entities/Structures/Machines/Computers/starmap.yml b/Resources/Prototypes/_FTL/Entities/Structures/Machines/Computers/starmap.yml
index f34fe8209a..c17d63e103 100644
--- a/Resources/Prototypes/_FTL/Entities/Structures/Machines/Computers/starmap.yml
+++ b/Resources/Prototypes/_FTL/Entities/Structures/Machines/Computers/starmap.yml
@@ -19,7 +19,7 @@
       key: enum.StarmapConsoleUiKey.Key
     - type: UserInterface
       interfaces:
-        - key: enum.StarmapConsoleUiKey.Key
+        enum.StarmapConsoleUiKey.Key:
           type: StarmapConsoleBoundUserInterface
 #    - type: Computer
 #      board: SolarControlComputerCircuitboard
diff --git a/Resources/Prototypes/_FTL/Reagents/narcotics.yml b/Resources/Prototypes/_FTL/Reagents/narcotics.yml
index 7add1c8a41..55f8c5c3d6 100644
--- a/Resources/Prototypes/_FTL/Reagents/narcotics.yml
+++ b/Resources/Prototypes/_FTL/Reagents/narcotics.yml
@@ -14,7 +14,7 @@
         damage:
           types:
             VeilIndividualExposure: -1
-            Pierce: 0.35
+            Piercing: 0.35
             Slash: 0.35
       - !type:GenericStatusEffect
         key: SaphaphremTrip
diff --git a/Resources/Prototypes/_FTL/Tiles/fluid.yml b/Resources/Prototypes/_FTL/Tiles/fluid.yml
index af464d375b..0fd207c75a 100644
--- a/Resources/Prototypes/_FTL/Tiles/fluid.yml
+++ b/Resources/Prototypes/_FTL/Tiles/fluid.yml
@@ -19,7 +19,7 @@
       drawdepth: BelowFloor
       layers:
         - state: shoreline_blood
-    - type: SlowContacts
+    - type: SpeedModifierContacts
       walkSpeedModifier: 0.5
       sprintSpeedModifier: 0.5
     - type: Physics
diff --git a/Resources/Prototypes/_FTL/Voice/speech_emotes.yml b/Resources/Prototypes/_FTL/Voice/speech_emotes.yml
index f33e0d8c1e..3575f0edbc 100644
--- a/Resources/Prototypes/_FTL/Voice/speech_emotes.yml
+++ b/Resources/Prototypes/_FTL/Voice/speech_emotes.yml
@@ -1,30 +1,30 @@
 # IPC emotes
-- type: emote
-  id: Whirr
-  category: Vocal
-  chatMessages: [whirrs]
-  chatTriggers:
-    - whirr
-    - whirrs
-    - whirrs.
-    - whirrs!
+#- type: emote
+#  id: Whirr
+#  category: Vocal
+#  chatMessages: [whirrs]
+#  chatTriggers:
+#    - whirr
+#    - whirrs
+#    - whirrs.
+#    - whirrs!
 
-- type: emote
-  id: Beep
-  category: Vocal
-  chatMessages: [beeps]
-  chatTriggers:
-    - beep
-    - beeps
-    - beeps.
-    - beeps!
-
-- type: emote
-  id: Ping
-  category: Vocal
-  chatMessages: [pings]
-  chatTriggers:
-    - ping
-    - pings
-    - pings.
-    - pings!
+#- type: emote
+#  id: Beep
+#  category: Vocal
+#  chatMessages: [beeps]
+#  chatTriggers:
+#    - beep
+#    - beeps
+#    - beeps.
+#    - beeps!
+#
+#- type: emote
+#  id: Ping
+#  category: Vocal
+#  chatMessages: [pings]
+#  chatTriggers:
+#    - ping
+#    - pings
+#    - pings.
+#    - pings!
diff --git a/Resources/Prototypes/_FTL/WarpPoints/points.yml b/Resources/Prototypes/_FTL/WarpPoints/points.yml
index 93ff15ce51..dd7d4ce65b 100644
--- a/Resources/Prototypes/_FTL/WarpPoints/points.yml
+++ b/Resources/Prototypes/_FTL/WarpPoints/points.yml
@@ -14,7 +14,7 @@
       mapPaths:
       - /Maps/_FTL/ai/escape-pod-deserted.yml
       - /Maps/_FTL/ai/escape-pod-explosive.yml
-      - /Maps/_FTL/ai/escape-pod-occupied.yml
+#      - /Maps/_FTL/ai/escape-pod-occupied.yml
       - /Maps/_FTL/ai/rod-class.yml
 
 - type: ftlPoint
diff --git a/Resources/Prototypes/lobbyscreens.yml b/Resources/Prototypes/lobbyscreens.yml
index 5f62cf0e6f..7f0adeaea5 100644
--- a/Resources/Prototypes/lobbyscreens.yml
+++ b/Resources/Prototypes/lobbyscreens.yml
@@ -49,4 +49,4 @@
 #- type: lobbyBackground
 #  id: JaniShootout
 #  background: /Textures/LobbyScreens/janishootout.webp
- See the _FTL/ variant
+# See the _FTL/ variant