diff --git a/Content.Client/Botany/PlantAnalyzer/PlantAnalyzerBoundUserInterface.cs b/Content.Client/Botany/PlantAnalyzer/PlantAnalyzerBoundUserInterface.cs
new file mode 100644
index 0000000000..2cda541c80
--- /dev/null
+++ b/Content.Client/Botany/PlantAnalyzer/PlantAnalyzerBoundUserInterface.cs
@@ -0,0 +1,42 @@
+using Content.Shared.Botany.PlantAnalyzer;
+using JetBrains.Annotations;
+using Robust.Client.UserInterface;
+
+namespace Content.Client.Botany.PlantAnalyzer;
+
+[UsedImplicitly]
+public sealed class PlantAnalyzerBoundUserInterface : BoundUserInterface
+{
+    [ViewVariables]
+    private PlantAnalyzerWindow? _window;
+
+    public PlantAnalyzerBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+    {
+    }
+
+    protected override void Open()
+    {
+        base.Open();
+        _window = this.CreateWindow<PlantAnalyzerWindow>();
+        _window.Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName;
+        _window.Print.OnPressed += _ => Print();
+    }
+
+    protected override void ReceiveMessage(BoundUserInterfaceMessage message)
+    {
+        if (_window is null
+            || message is not PlantAnalyzerScannedUserMessage cast)
+            return;
+
+        _window.Populate(cast);
+    }
+
+    private void Print()
+    {
+        SendMessage(new PlantAnalyzerPrintMessage());
+        if (_window is null)
+            return;
+
+        _window.Print.Disabled = true;
+    }
+}
diff --git a/Content.Client/Botany/PlantAnalyzer/PlantAnalyzerWindow.xaml b/Content.Client/Botany/PlantAnalyzer/PlantAnalyzerWindow.xaml
new file mode 100644
index 0000000000..1cf01af521
--- /dev/null
+++ b/Content.Client/Botany/PlantAnalyzer/PlantAnalyzerWindow.xaml
@@ -0,0 +1,121 @@
+<controls:FancyWindow
+    xmlns="https://spacestation14.io"
+    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+    MinWidth="320"
+    MaxWidth="320">
+    <ScrollContainer
+        Margin="5 5 5 5"
+        ReturnMeasure="True"
+        VerticalExpand="True"
+        HorizontalExpand="False">
+        <BoxContainer
+            Name="RootContainer"
+            VerticalExpand="True"
+            Orientation="Vertical">
+            <BoxContainer
+                Name="DataContainer"
+                Margin="0 0 0 5"
+                Orientation="Vertical">
+                <BoxContainer Orientation="Horizontal" Margin="0 0 0 5">
+                    <SpriteView OverrideDirection="South" Scale="2 2" Name="SpriteView" Access="Public" SetSize="64 64" />
+                    <TextureRect Name="NoDataIcon" Access="Public" SetSize="64 64" Visible="false" Stretch="KeepAspectCentered" TexturePath="/Textures/Interface/Misc/health_analyzer_out_of_range.png"/>
+                    <BoxContainer Margin="5 0 0 0" Orientation="Vertical" VerticalAlignment="Top">
+                        <RichTextLabel Name="SeedLabel" SetWidth="150"
+                             Text="{Loc 'generic-unknown'}"/>
+                        <Label Name="ContainerLabel" VerticalAlignment="Top" StyleClasses="LabelSubText"
+                             Text="{Loc 'generic-unknown'}"/>
+                    </BoxContainer>
+                    <Label Margin="0 0 5 0" HorizontalExpand="True" HorizontalAlignment="Right" VerticalExpand="True"
+                           VerticalAlignment="Top" Name="ScanModeLabel"
+                           Text="{Loc 'health-analyzer-window-entity-unknown-text'}" />
+                </BoxContainer>
+                <PanelContainer StyleClasses="LowDivider" />
+                <BoxContainer Name="PlantDataTags" Margin="5 5 0 0" Orientation="Horizontal" Visible="false">
+                    <RichTextLabel Margin="0 0 8 0" Name="Alive" Visible="false" Text="{Loc 'plant-analyzer-component-alive'}" />
+                    <RichTextLabel Margin="0 0 8 0" Name="Dead" Visible="false" Text="{Loc 'plant-analyzer-component-dead'}" />
+                    <RichTextLabel Margin="0 0 8 0" Name="Unviable" Visible="false" Text="{Loc 'plant-analyzer-component-unviable'}" />
+                    <RichTextLabel Margin="0 0 8 0" Name="Kudzu" Visible="false" Text="{Loc 'plant-analyzer-component-kudzu'}" />
+                    <RichTextLabel Margin="0 0 8 0" Name="Mutating" Visible="false" Text="{Loc 'plant-analyzer-component-mutating'}" />
+                </BoxContainer>
+                <GridContainer Name="PlantDataGrid" Margin="0 0 0 5" Columns="6" Visible="false">
+                    <Label Text=" · " />
+                    <Label Text="{Loc 'plant-analyzer-component-health'}" />
+                    <Label SetWidth="8" />
+                    <Label HorizontalAlignment="Right" Name="Health" />
+                    <Label Text=" / " />
+                    <Label HorizontalAlignment="Right" Name="Endurance" />
+                    <Label Text=" · " />
+                    <Label Text="{Loc 'plant-analyzer-component-age'}" />
+                    <Label SetWidth="8" />
+                    <Label HorizontalAlignment="Right" Name="Age" />
+                    <Label Text=" / " />
+                    <Label HorizontalAlignment="Right" Name="Lifespan" />
+                </GridContainer>
+                <PanelContainer Name="PlantDataDivider" Visible="false" StyleClasses="LowDivider" />
+                <GridContainer Name="ContainerGrid" Margin="0 5" Columns="8" Visible="false">
+                    <!-- Max values from `PlantHolderSystem.CheckLevelSanity` -->
+                    <Label Text=" · " />
+                    <Label Text="{Loc 'plant-analyzer-component-water'}" />
+                    <Label SetWidth="8" />
+                    <Label FontColorOverride="cyan" HorizontalAlignment="Right" Name="WaterLevelLabel" />
+                    <Label Text=" / " />
+                    <Label HorizontalAlignment="Right" Text="100.00" />
+                    <Label Margin="12 0 0 0" Name="GtFieldIfTolerances1" />
+                    <Label HorizontalAlignment="Right" Name="WaterConsumptionLabel" />
+                    <Label Text=" · " />
+                    <Label Text="{Loc 'plant-analyzer-component-nutrition'}" />
+                    <Label SetWidth="8" />
+                    <Label FontColorOverride="orange" HorizontalAlignment="Right" Name="NutritionLevelLabel" />
+                    <Label Text=" / " />
+                    <Label HorizontalAlignment="Right" Text="100.00" />
+                    <Label Margin="12 0 0 0" Name="GtFieldIfTolerances2" />
+                    <Label HorizontalAlignment="Right" Name="NutritionConsumptionLabel" />
+                    <Label Text=" · " />
+                    <Label Text="{Loc 'plant-analyzer-component-toxins'}" />
+                    <Label SetWidth="8" />
+                    <Label FontColorOverride="yellowgreen" HorizontalAlignment="Right" Name="ToxinsLabel" />
+                    <Label Text=" / " />
+                    <Label HorizontalAlignment="Right" Text="100.00" />
+                    <Label Margin="12 0 0 0" Name="LtFieldIfTolerances1" />
+                    <Label HorizontalAlignment="Right" Name="ToxinsResistanceLabel" />
+                    <Label Text=" · " />
+                    <Label Text="{Loc 'plant-analyzer-component-pests'}" />
+                    <Label SetWidth="8" />
+                    <Label FontColorOverride="magenta" HorizontalAlignment="Right" Name="PestLevelLabel" />
+                    <Label Text=" / " />
+                    <Label HorizontalAlignment="Right" Text="10.00" />
+                    <Label Margin="12 0 0 0" Name="LtFieldIfTolerances2" />
+                    <Label HorizontalAlignment="Right" Name="PestResistanceLabel" />
+                    <Label Text=" · " />
+                    <Label Text="{Loc 'plant-analyzer-component-weeds'}" />
+                    <Label SetWidth="8" />
+                    <Label FontColorOverride="red" HorizontalAlignment="Right" Name="WeedLevelLabel" />
+                    <Label Text=" / " />
+                    <Label HorizontalAlignment="Right" Text="10.00" />
+                    <Label Margin="12 0 0 0" Name="LtFieldIfTolerances3" />
+                    <Label HorizontalAlignment="Right" Name="WeedResistanceLabel" />
+                </GridContainer>
+                <PanelContainer Name="ContainerDivider" Visible="false" StyleClasses="LowDivider" />
+                <BoxContainer Name="ChemicalsInWaterBox" Visible="false" Orientation="Horizontal" Margin="5">
+                    <RichTextLabel Name="ChemicalsInWaterLabel" SetWidth="290" />
+                </BoxContainer>
+                <PanelContainer Name="ChemicalsInWaterDivider" Visible="false" StyleClasses="LowDivider" />
+                <BoxContainer Name="EnvironmentBox" Visible="false" Orientation="Horizontal" Margin="5">
+                    <RichTextLabel Name="EnvironmentLabel" SetWidth="290" />
+                </BoxContainer>
+                <PanelContainer Name="EnvironmentDivider" Visible="false" StyleClasses="LowDivider" />
+                <BoxContainer Name="ProduceBox" Visible="false" Orientation="Horizontal" Margin="5">
+                    <RichTextLabel Name="ProduceLabel" SetWidth="290" />
+                </BoxContainer>
+                <PanelContainer Name="ProduceDivider" Visible="false" StyleClasses="LowDivider" />
+                <Button Name="Print"
+                    TextAlign="Center"
+                    HorizontalExpand="True"
+                    Access="Public"
+                    Disabled="True"
+                    Margin="0 5 0 0"
+                    Text="{Loc 'plant-analyzer-print'}" />
+            </BoxContainer>
+        </BoxContainer>
+    </ScrollContainer>
+</controls:FancyWindow>
diff --git a/Content.Client/Botany/PlantAnalyzer/PlantAnalyzerWindow.xaml.cs b/Content.Client/Botany/PlantAnalyzer/PlantAnalyzerWindow.xaml.cs
new file mode 100644
index 0000000000..31826eee52
--- /dev/null
+++ b/Content.Client/Botany/PlantAnalyzer/PlantAnalyzerWindow.xaml.cs
@@ -0,0 +1,207 @@
+using System.Linq;
+using Content.Client.UserInterface.Controls;
+using Content.Shared.Botany.PlantAnalyzer;
+using Content.Shared.IdentityManagement;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+
+namespace Content.Client.Botany.PlantAnalyzer;
+
+[GenerateTypedNameReferences]
+public sealed partial class PlantAnalyzerWindow : FancyWindow
+{
+    private readonly IEntityManager _entityManager;
+    private readonly IPrototypeManager _prototypeManager;
+    private readonly IGameTiming _gameTiming;
+
+    public PlantAnalyzerWindow()
+    {
+        RobustXamlLoader.Load(this);
+
+        var dependencies = IoCManager.Instance!;
+        _entityManager = dependencies.Resolve<IEntityManager>();
+        _prototypeManager = dependencies.Resolve<IPrototypeManager>();
+        _gameTiming = dependencies.Resolve<IGameTiming>();
+    }
+
+    public void Populate(PlantAnalyzerScannedUserMessage msg)
+    {
+        Print.Disabled = !msg.ScanMode.GetValueOrDefault(false)
+            || msg.PrintReadyAt.GetValueOrDefault(TimeSpan.MaxValue) > _gameTiming.CurTime
+            || msg.PlantData is null;
+
+        if (!_entityManager.TryGetEntity(msg.TargetEntity, out var target) || target is null)
+            return;
+
+        // Section 1: Icon and basic information.
+        SpriteView.SetEntity(target.Value);
+        SpriteView.Visible = msg.ScanMode.HasValue && msg.ScanMode.Value;
+        NoDataIcon.Visible = !SpriteView.Visible;
+
+        ScanModeLabel.Text = msg.ScanMode.HasValue
+            ? msg.ScanMode.Value
+                ? Loc.GetString("plant-analyzer-window-scan-mode-active")
+                : Loc.GetString("plant-analyzer-window-scan-mode-inactive")
+            : Loc.GetString("plant-analyzer-window-entity-unknown-text");
+        ScanModeLabel.FontColorOverride = msg.ScanMode.HasValue && msg.ScanMode.Value ? Color.Green : Color.Red;
+
+        SeedLabel.Text = msg.PlantData == null
+            ? Loc.GetString("plant-analyzer-component-no-seed")
+            : Loc.GetString(msg.PlantData.SeedDisplayName);
+
+        ContainerLabel.Text = _entityManager.HasComponent<MetaDataComponent>(target.Value)
+            ? Identity.Name(target.Value, _entityManager)
+            : Loc.GetString("generic-unknown");
+
+        // Section 2: Information regarding the plant.
+        if (msg.PlantData is not null)
+        {
+            Health.Text = msg.PlantData.Health.ToString("0.00");
+            Endurance.Text = msg.PlantData.Endurance.ToString("0.00");
+            Age.Text = msg.PlantData.Age.ToString("0.00");
+            Lifespan.Text = msg.PlantData.Lifespan.ToString("0.00");
+
+            // These mostly exists to prevent shifting of the text.
+            Dead.Visible = msg.PlantData.Dead;
+            Alive.Visible = !Dead.Visible;
+
+            Unviable.Visible = !msg.PlantData.Viable;
+            Mutating.Visible = msg.PlantData.Mutating;
+            Kudzu.Visible = msg.PlantData.Kudzu;
+
+            PlantDataGrid.Visible = true;
+        }
+        else
+        {
+            PlantDataGrid.Visible = false;
+        }
+        PlantDataTags.Visible = PlantDataGrid.Visible;
+        PlantDataDivider.Visible = PlantDataGrid.Visible;
+
+        // Section 3: Input
+        if (msg.TrayData is not null)
+        {
+            WaterLevelLabel.Text = msg.TrayData.WaterLevel.ToString("0.00");
+            NutritionLevelLabel.Text = msg.TrayData.NutritionLevel.ToString("0.00");
+            ToxinsLabel.Text = msg.TrayData.Toxins.ToString("0.00");
+            PestLevelLabel.Text = msg.TrayData.PestLevel.ToString("0.00");
+            WeedLevelLabel.Text = msg.TrayData.WeedLevel.ToString("0.00");
+
+            // Section 3.1: Tolerances part 1.
+            if (msg.TolerancesData is not null)
+            {
+                GtFieldIfTolerances1.Text = ">";
+                LtFieldIfTolerances1.Text = "<";
+
+                WaterConsumptionLabel.Text = msg.TolerancesData.WaterConsumption.ToString("0.00");
+                NutritionConsumptionLabel.Text = msg.TolerancesData.NutrientConsumption.ToString("0.00");
+                // Technically would be "x + epsilon" for toxin and pest.
+                // But it makes no difference here since I only display two digits.
+                ToxinsResistanceLabel.Text = msg.TolerancesData.ToxinsTolerance.ToString("0.00");
+                PestResistanceLabel.Text = msg.TolerancesData.PestTolerance.ToString("0.00");
+                WeedResistanceLabel.Text = msg.TolerancesData.WeedTolerance.ToString("0.00");
+            }
+            else
+            {
+                GtFieldIfTolerances1.Text = "";
+                LtFieldIfTolerances1.Text = "";
+
+                WaterConsumptionLabel.Text = "";
+                NutritionConsumptionLabel.Text = "";
+                ToxinsResistanceLabel.Text = "";
+                PestResistanceLabel.Text = "";
+                WeedResistanceLabel.Text = "";
+            }
+            GtFieldIfTolerances2.Text = GtFieldIfTolerances1.Text;
+            LtFieldIfTolerances2.Text = LtFieldIfTolerances1.Text;
+            LtFieldIfTolerances3.Text = LtFieldIfTolerances1.Text;
+
+            ContainerGrid.Visible = true;
+        }
+        else
+        {
+            ContainerGrid.Visible = false;
+        }
+        ContainerDivider.Visible = ContainerGrid.Visible;
+
+
+        // Section 3.5: They are putting chemicals in the water!
+        if (msg.TrayData?.Chemicals != null)
+        {
+            var count = msg.TrayData.Chemicals.Count;
+            var holder = ContainerLabel.Text;
+            var chemicals = PlantAnalyzerLocalizationHelper.ChemicalsToLocalizedStrings(msg.TrayData.Chemicals, _prototypeManager);
+            if (count == 0)
+                ChemicalsInWaterLabel.Text = Loc.GetString("plant-analyzer-soil-empty", ("holder", holder));
+            else
+                ChemicalsInWaterLabel.Text = Loc.GetString("plant-analyzer-soil", ("count", count), ("holder", holder), ("chemicals", chemicals));
+
+            ChemicalsInWaterBox.Visible = true;
+        }
+        else
+        {
+            ChemicalsInWaterBox.Visible = false;
+        }
+        ChemicalsInWaterDivider.Visible = ChemicalsInWaterBox.Visible;
+
+        // Section 4: Tolerances part 2.
+        if (msg.TolerancesData is not null)
+        {
+            (string, string)[] parameters = [
+                ("seedName", SeedLabel.Text),
+                ("gases", PlantAnalyzerLocalizationHelper.GasesToLocalizedStrings(msg.TolerancesData.ConsumeGasses, _prototypeManager)),
+                ("kpa", msg.TolerancesData.IdealPressure.ToString("0.00")),
+                ("kpaTolerance", msg.TolerancesData.PressureTolerance.ToString("0.00")),
+                ("temp", msg.TolerancesData.IdealHeat.ToString("0.00")),
+                ("tempTolerance", msg.TolerancesData.HeatTolerance.ToString("0.00")),
+                ("lightLevel", msg.TolerancesData.IdealLight.ToString("0.00")),
+                ("lightTolerance", msg.TolerancesData.LightTolerance.ToString("0.00"))
+            ];
+            EnvironmentLabel.Text = msg.TolerancesData.ConsumeGasses.Count == 0
+                ? msg.TolerancesData.IdealHeat - msg.TolerancesData.HeatTolerance <= 0f && msg.TolerancesData.IdealPressure - msg.TolerancesData.PressureTolerance <= 0f
+                    ? Loc.GetString("plant-analyzer-component-environment-void", [.. parameters])
+                    : Loc.GetString("plant-analyzer-component-environment", [.. parameters])
+                : Loc.GetString("plant-analyzer-component-environment-gas", [.. parameters]);
+
+            EnvironmentBox.Visible = true;
+        }
+        else
+        {
+            EnvironmentBox.Visible = false;
+        }
+        EnvironmentDivider.Visible = EnvironmentBox.Visible;
+
+        // Section 5: Output
+        if (msg.ProduceData is not null)
+        {
+            var gases = PlantAnalyzerLocalizationHelper.GasesToLocalizedStrings(msg.ProduceData.ExudeGasses, _prototypeManager);
+            var (produce, producePlural) = PlantAnalyzerLocalizationHelper.ProduceToLocalizedStrings(msg.ProduceData.Produce, _prototypeManager);
+            var chemicals = PlantAnalyzerLocalizationHelper.ChemicalsToLocalizedStrings(msg.ProduceData.Chemicals, _prototypeManager);
+
+            (string, object)[] parameters = [
+                ("yield", msg.ProduceData.Yield),
+                ("gasCount", msg.ProduceData.ExudeGasses.Count),
+                ("gases", gases),
+                ("potency", Loc.GetString(msg.ProduceData.Potency)),
+                ("seedless", msg.ProduceData.Seedless),
+                ("firstProduce", msg.ProduceData.Produce.FirstOrDefault() ?? ""),
+                ("produce", produce),
+                ("producePlural", producePlural),
+                ("chemCount", msg.ProduceData.Chemicals.Count),
+                ("chemicals", chemicals),
+                ("nothing", "")
+            ];
+
+            ProduceLabel.Text = Loc.GetString("plant-analyzer-output", [.. parameters]);
+            ProduceBox.Visible = true;
+        }
+        else
+        {
+            ProduceBox.Visible = false;
+        }
+        ProduceDivider.Visible = ProduceBox.Visible;
+    }
+}
diff --git a/Content.Client/IoC/ClientContentIoC.cs b/Content.Client/IoC/ClientContentIoC.cs
index 41d2ff33e4..dd7fa8ad72 100644
--- a/Content.Client/IoC/ClientContentIoC.cs
+++ b/Content.Client/IoC/ClientContentIoC.cs
@@ -22,13 +22,10 @@
 using Content.Shared.Administration.Logs;
 using Content.Client.Lobby;
 using Content.Client.Players.RateLimiting;
-using Content.Client.Replay;
 using Content.Shared.Administration.Managers;
 using Content.Shared.Chat;
 using Content.Shared.Players.PlayTimeTracking;
 using Content.Shared.Players.RateLimiting;
-using Robust.Client.GameObjects;
-
 namespace Content.Client.IoC
 {
     internal static class ClientContentIoC
diff --git a/Content.Client/Light/AfterLightTargetOverlay.cs b/Content.Client/Light/AfterLightTargetOverlay.cs
index 5cfe1e993b..06c508a54e 100644
--- a/Content.Client/Light/AfterLightTargetOverlay.cs
+++ b/Content.Client/Light/AfterLightTargetOverlay.cs
@@ -33,7 +33,8 @@ protected override void Draw(in OverlayDrawArgs args)
         var bounds = args.WorldBounds;
 
         // at 1-1 render scale it's mostly fine but at 4x4 it's way too fkn big
-        var newScale = viewport.RenderScale / 2f;
+        var lightScale = viewport.LightRenderTarget.Size / (Vector2) viewport.Size;
+        var newScale = viewport.RenderScale / (Vector2.One / lightScale);
 
         var localMatrix =
             viewport.LightRenderTarget.GetWorldToLocalMatrix(viewport.Eye, newScale);
diff --git a/Content.Client/Light/LightBlurOverlay.cs b/Content.Client/Light/LightBlurOverlay.cs
index ae0684f9ff..684f5a9452 100644
--- a/Content.Client/Light/LightBlurOverlay.cs
+++ b/Content.Client/Light/LightBlurOverlay.cs
@@ -39,6 +39,6 @@ protected override void Draw(in OverlayDrawArgs args)
 
         var target = beforeOverlay.EnlargedLightTarget;
         // Yeah that's all this does keep walkin.
-        _clyde.BlurRenderTarget(args.Viewport, target, _blurTarget, args.Viewport.Eye, 14f * 2f);
+        //_clyde.BlurRenderTarget(args.Viewport, target, _blurTarget, args.Viewport.Eye, 14f * 2f);
     }
 }
diff --git a/Content.Client/Light/RoofOverlay.cs b/Content.Client/Light/RoofOverlay.cs
index 981edf793c..5543103cdc 100644
--- a/Content.Client/Light/RoofOverlay.cs
+++ b/Content.Client/Light/RoofOverlay.cs
@@ -3,13 +3,16 @@
 using Content.Shared.Maps;
 using Robust.Client.Graphics;
 using Robust.Shared.Enums;
+using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
+using Robust.Shared.Physics;
 
 namespace Content.Client.Light;
 
 public sealed class RoofOverlay : Overlay
 {
     private readonly IEntityManager _entManager;
+    [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly IOverlayManager _overlay = default!;
 
     private readonly EntityLookupSystem _lookup;
@@ -17,6 +20,7 @@ public sealed class RoofOverlay : Overlay
     private readonly SharedTransformSystem _xformSystem;
 
     private readonly HashSet<Entity<OccluderComponent>> _occluders = new();
+    private List<Entity<MapGridComponent>> _grids = new();
 
     public override OverlaySpace Space => OverlaySpace.BeforeLighting;
 
@@ -39,14 +43,6 @@ protected override void Draw(in OverlayDrawArgs args)
         if (args.Viewport.Eye == null)
             return;
 
-        var mapEnt = _mapSystem.GetMap(args.MapId);
-
-        if (!_entManager.TryGetComponent(mapEnt, out RoofComponent? roofComp) ||
-            !_entManager.TryGetComponent(mapEnt, out MapGridComponent? grid))
-        {
-            return;
-        }
-
         var viewport = args.Viewport;
         var eye = args.Viewport.Eye;
 
@@ -55,46 +51,72 @@ protected override void Draw(in OverlayDrawArgs args)
         var bounds = lightoverlay.EnlargedBounds;
         var target = lightoverlay.EnlargedLightTarget;
 
+        _grids.Clear();
+        _mapManager.FindGridsIntersecting(args.MapId, bounds, ref _grids);
+
+        for (var i = _grids.Count - 1; i >= 0; i--)
+        {
+            var grid = _grids[i];
+
+            if (_entManager.HasComponent<RoofComponent>(grid.Owner))
+                continue;
+
+            _grids.RemoveAt(i);
+        }
+
+        if (_grids.Count == 0)
+            return;
+
+        var lightScale = viewport.LightRenderTarget.Size / (Vector2) viewport.Size;
+        var scale = viewport.RenderScale / (Vector2.One / lightScale);
+
         worldHandle.RenderInRenderTarget(target,
             () =>
             {
-                var invMatrix = target.GetWorldToLocalMatrix(eye, viewport.RenderScale / 2f);
+                foreach (var grid in _grids)
+                {
+                    if (!_entManager.TryGetComponent(grid.Owner, out RoofComponent? roof))
+                        continue;
 
-                var gridMatrix = _xformSystem.GetWorldMatrix(mapEnt);
-                var matty = Matrix3x2.Multiply(gridMatrix, invMatrix);
+                    var invMatrix = target.GetWorldToLocalMatrix(eye, scale);
 
-                worldHandle.SetTransform(matty);
+                    var gridMatrix = _xformSystem.GetWorldMatrix(grid.Owner);
+                    var matty = Matrix3x2.Multiply(gridMatrix, invMatrix);
 
-                var tileEnumerator = _mapSystem.GetTilesEnumerator(mapEnt, grid, bounds);
+                    worldHandle.SetTransform(matty);
 
-                // Due to stencilling we essentially draw on unrooved tiles
-                while (tileEnumerator.MoveNext(out var tileRef))
-                {
-                    if ((tileRef.Tile.Flags & (byte) TileFlag.Roof) == 0x0)
-                    {
-                        // Check if the tile is occluded in which case hide it anyway.
-                        // This is to avoid lit walls bleeding over to unlit tiles.
-                        _occluders.Clear();
-                        _lookup.GetLocalEntitiesIntersecting(mapEnt, tileRef.GridIndices, _occluders);
-                        var found = false;
+                    var tileEnumerator = _mapSystem.GetTilesEnumerator(grid.Owner, grid, bounds);
 
-                        foreach (var occluder in _occluders)
+                    // Due to stencilling we essentially draw on unrooved tiles
+                    while (tileEnumerator.MoveNext(out var tileRef))
+                    {
+                        if ((tileRef.Tile.Flags & (byte) TileFlag.Roof) == 0x0)
                         {
-                            if (!occluder.Comp.Enabled)
+                            // Check if the tile is occluded in which case hide it anyway.
+                            // This is to avoid lit walls bleeding over to unlit tiles.
+                            _occluders.Clear();
+                            _lookup.GetLocalEntitiesIntersecting(grid.Owner, tileRef.GridIndices, _occluders);
+                            var found = false;
+
+                            foreach (var occluder in _occluders)
+                            {
+                                if (!occluder.Comp.Enabled)
+                                    continue;
+
+                                found = true;
+                                break;
+                            }
+
+                            if (!found)
                                 continue;
-
-                            found = true;
-                            break;
                         }
 
-                        if (!found)
-                            continue;
+                        var local = _lookup.GetLocalBounds(tileRef, grid.Comp.TileSize);
+                        worldHandle.DrawRect(local, roof.Color);
                     }
-
-                    var local = _lookup.GetLocalBounds(tileRef, grid.TileSize);
-                    worldHandle.DrawRect(local, roofComp.Color);
                 }
-
             }, null);
+
+        worldHandle.SetTransform(Matrix3x2.Identity);
     }
 }
diff --git a/Content.Client/Light/TileEmissionOverlay.cs b/Content.Client/Light/TileEmissionOverlay.cs
index bccc6fc21e..2f4a1390ff 100644
--- a/Content.Client/Light/TileEmissionOverlay.cs
+++ b/Content.Client/Light/TileEmissionOverlay.cs
@@ -49,13 +49,19 @@ protected override void Draw(in OverlayDrawArgs args)
         var bounds = lightoverlay.EnlargedBounds;
         var target = lightoverlay.EnlargedLightTarget;
         var viewport = args.Viewport;
+        _grids.Clear();
+        _mapManager.FindGridsIntersecting(mapId, bounds, ref _grids, approx: true);
+
+        if (_grids.Count == 0)
+            return;
+
+        var lightScale = viewport.LightRenderTarget.Size / (Vector2) viewport.Size;
+        var scale = viewport.RenderScale / (Vector2.One / lightScale);
 
         args.WorldHandle.RenderInRenderTarget(target,
         () =>
         {
-            var invMatrix = target.GetWorldToLocalMatrix(viewport.Eye, viewport.RenderScale / 2f);
-            _grids.Clear();
-            _mapManager.FindGridsIntersecting(mapId, bounds, ref _grids, approx: true);
+            var invMatrix = target.GetWorldToLocalMatrix(viewport.Eye, scale);
 
             foreach (var grid in _grids)
             {
diff --git a/Content.Client/NukeOps/WarDeclaratorWindow.xaml.cs b/Content.Client/NukeOps/WarDeclaratorWindow.xaml.cs
index aeceae1327..e191e821c2 100644
--- a/Content.Client/NukeOps/WarDeclaratorWindow.xaml.cs
+++ b/Content.Client/NukeOps/WarDeclaratorWindow.xaml.cs
@@ -23,6 +23,7 @@ public sealed partial class WarDeclaratorWindow : FancyWindow
     public WarDeclaratorWindow()
     {
         RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
 
         WarButton.OnPressed += (_) => OnActivated?.Invoke(Rope.Collapse(MessageEdit.TextRope));
 
diff --git a/Content.Client/Renamable/RenamableBoundUserInterface.cs b/Content.Client/Renamable/RenamableBoundUserInterface.cs
new file mode 100644
index 0000000000..fd3b9bc506
--- /dev/null
+++ b/Content.Client/Renamable/RenamableBoundUserInterface.cs
@@ -0,0 +1,40 @@
+using System.IO;
+using Content.Shared.NameModifier.EntitySystems;
+using Content.Shared.Popups;
+using Content.Shared.Renamable.EntitySystems;
+using Robust.Client.UserInterface;
+
+namespace Content.Client.Renamable;
+
+public sealed class RenamableBoundUserInterface : BoundUserInterface
+{
+    [Dependency] private readonly IEntityManager _entManager = default!;
+    private EntityQuery<MetaDataComponent> _metaQuery;
+
+    [ViewVariables]
+    private RenamableWindow? _window;
+
+    public RenamableBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+    {
+        _metaQuery = _entManager.GetEntityQuery<MetaDataComponent>();
+    }
+
+    protected override void Open()
+    {
+        base.Open();
+
+        _window = this.CreateWindow<RenamableWindow>();
+        _window.OnNameChanged += OnNameChanged;
+        Reload();
+    }
+
+    private void OnNameChanged(string newName) => SendPredictedMessage(new RenamableBuiMessage(newName));
+
+    private void Reload(MetaDataComponent? metaData = null)
+    {
+        if (!_metaQuery.Resolve(Owner, ref metaData))
+            return;
+
+        _window!.SetCurrentName(metaData.EntityName);
+    }
+}
diff --git a/Content.Client/Renamable/RenamableWindow.xaml b/Content.Client/Renamable/RenamableWindow.xaml
new file mode 100644
index 0000000000..b5edd42678
--- /dev/null
+++ b/Content.Client/Renamable/RenamableWindow.xaml
@@ -0,0 +1,8 @@
+<DefaultWindow xmlns="https://spacestation14.io"
+               xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+               Title="{Loc 'renamable-ui-header'}">
+    <BoxContainer Orientation="Vertical" SeparationOverride="4" MinWidth="150">
+        <Label Name="CurrentNameLabel" Text="{Loc 'renamable-current-name-label'}" />
+        <LineEdit Name="NameLineEdit" />
+    </BoxContainer>
+</DefaultWindow>
diff --git a/Content.Client/Renamable/RenamableWindow.xaml.cs b/Content.Client/Renamable/RenamableWindow.xaml.cs
new file mode 100644
index 0000000000..4936b8fe10
--- /dev/null
+++ b/Content.Client/Renamable/RenamableWindow.xaml.cs
@@ -0,0 +1,48 @@
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.Renamable;
+
+
+[GenerateTypedNameReferences]
+public sealed partial class RenamableWindow : DefaultWindow
+{
+    public event Action<string>? OnNameChanged;
+
+    /// <summary>
+    /// Is the user currently entering text into the control?
+    /// </summary>
+    private bool _focused;
+    // TODO LineEdit Make this a bool on the LineEdit control
+
+    private string _name = string.Empty;
+
+    public RenamableWindow()
+    {
+        RobustXamlLoader.Load(this);
+
+        NameLineEdit.OnTextEntered += args =>
+        {
+            _name = args.Text;
+            OnNameChanged?.Invoke(_name);
+        };
+
+        NameLineEdit.OnFocusEnter += _ => _focused = true;
+        NameLineEdit.OnFocusExit += _ =>
+        {
+            _focused = false;
+            NameLineEdit.Text = _name;
+        };
+    }
+
+    public void SetCurrentName(string label)
+    {
+        if (label == _name)
+            return;
+
+        _name = label;
+        if (!_focused)
+            NameLineEdit.Text = label;
+    }
+}
diff --git a/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs b/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
index da94b345c2..62b0a14f21 100644
--- a/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
+++ b/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
@@ -1,6 +1,7 @@
 /* WD edit
 
 #nullable enable
+using System.Collections.Generic;
 using System.Linq;
 using Content.Server.Body.Components;
 using Content.Server.GameTicking;
@@ -111,11 +112,37 @@ public async Task TryStopNukeOpsFromConstantlyFailing()
 
         Assert.That(factionSys.IsMember(player, "Syndicate"), Is.True);
         Assert.That(factionSys.IsMember(player, "NanoTrasen"), Is.False);
+        var roles = roleSys.MindGetAllRoleInfo(mind);
+        var cmdRoles = roles.Where(x => x.Prototype == "NukeopsCommander");
+        Assert.That(cmdRoles.Count(), Is.EqualTo(1));
 
-        var roles = roleSys.MindGetAllRoles(mind);
-        var cmdRoles = roles.Where(x => x.Prototype == "NukeopsCommander" && x.Component is NukeopsRoleComponent);
+        // The second dummy player should be a medic
+        var dummyMind = mindSys.GetMind(dummyEnts[1])!.Value;
+        Assert.That(entMan.HasComponent<NukeOperativeComponent>(dummyEnts[1]));
+        Assert.That(roleSys.MindIsAntagonist(dummyMind));
+        Assert.That(roleSys.MindHasRole<NukeopsRoleComponent>(dummyMind));
+        Assert.That(factionSys.IsMember(dummyEnts[1], "Syndicate"), Is.True);
+        Assert.That(factionSys.IsMember(dummyEnts[1], "NanoTrasen"), Is.False);
+        roles = roleSys.MindGetAllRoleInfo(dummyMind);
+        cmdRoles = roles.Where(x => x.Prototype == "NukeopsMedic");
         Assert.That(cmdRoles.Count(), Is.EqualTo(1));
 
+        // The other two players should have just spawned in as normal.
+        CheckDummy(0);
+        CheckDummy(2);
+        void CheckDummy(int i)
+        {
+            var ent = dummyEnts[i];
+            var mindCrew = mindSys.GetMind(ent)!.Value;
+            Assert.That(entMan.HasComponent<NukeOperativeComponent>(ent), Is.False);
+            Assert.That(roleSys.MindIsAntagonist(mindCrew), Is.False);
+            Assert.That(roleSys.MindHasRole<NukeopsRoleComponent>(mindCrew), Is.False);
+            Assert.That(factionSys.IsMember(ent, "Syndicate"), Is.False);
+            Assert.That(factionSys.IsMember(ent, "NanoTrasen"), Is.True);
+            var nukeroles = new List<string>() { "Nukeops", "NukeopsMedic", "NukeopsCommander" };
+            Assert.That(roleSys.MindGetAllRoleInfo(mindCrew).Any(x => nukeroles.Contains(x.Prototype)), Is.False);
+        }
+
         // The game rule exists, and all the stations/shuttles/maps are properly initialized
         var rule = entMan.AllComponents<NukeopsRuleComponent>().Single().Component;
         var gridsRule = entMan.AllComponents<RuleGridsComponent>().Single().Component;
@@ -209,13 +236,29 @@ public async Task TryStopNukeOpsFromConstantlyFailing()
         for (var tick = 0; tick < totalTicks; tick += increment)
         {
             await pair.RunTicksSync(increment);
-            Assert.That(resp.SuffocationCycles, Is.LessThanOrEqualTo(resp.SuffocationCycleThreshold));
+            Assert.That(resp.SuffocationCycWles, Is.LessThanOrEqualTo(resp.SuffocationCycleThreshold));
             Assert.That(damage.TotalDamage, Is.EqualTo(FixedPoint2.Zero));
         }
 
-        //ticker.SetGamePreset((GamePresetPrototype?)null); WD edit
-        server.CfgMan.SetCVar(CCVars.GridFill, false);
-        await pair.SetAntagPref("NukeopsCommander", false);
+        // Check that the round does not end prematurely when agents are deleted in the outpost
+        var nukies = dummyEnts.Where(entMan.HasComponent<NukeOperativeComponent>).Append(player).ToArray();
+        await server.WaitAssertion(() =>
+        {
+            for (var i = 0; i < nukies.Length - 1; i++)
+            {
+                entMan.DeleteEntity(nukies[i]);
+                Assert.That(roundEndSys.IsRoundEndRequested,
+                    Is.False,
+                    $"The round ended, but {nukies.Length - i - 1} nukies are still alive!");
+            }
+            // Delete the last nukie and make sure the round ends.
+            entMan.DeleteEntity(nukies[^1]);
+
+            Assert.That(roundEndSys.IsRoundEndRequested,
+                "All nukies were deleted, but the round didn't end!");
+        });
+
+        ticker.SetGamePreset((GamePresetPrototype?) null);
         await pair.CleanReturnAsync();
     }
 }
diff --git a/Content.IntegrationTests/Tests/Minds/MindTests.cs b/Content.IntegrationTests/Tests/Minds/MindTests.cs
index 3b7ecf0135..d4d551f4e0 100644
--- a/Content.IntegrationTests/Tests/Minds/MindTests.cs
+++ b/Content.IntegrationTests/Tests/Minds/MindTests.cs
@@ -1,10 +1,8 @@
 #nullable enable
 using System.Linq;
-using Content.Server.Ghost;
 using Content.Server.Ghost.Roles;
 using Content.Server.Ghost.Roles.Components;
 using Content.Server.Mind.Commands;
-using Content.Server.Players;
 using Content.Server.Roles;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
@@ -18,7 +16,6 @@
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
 
@@ -287,27 +284,27 @@ await server.WaitAssertion(() =>
             Assert.Multiple(() =>
             {
                 Assert.That(roleSystem.MindHasRole<TraitorRoleComponent>(mindId), Is.False);
-                Assert.That(roleSystem.MindHasRole<JobComponent>(mindId), Is.False);
+                Assert.That(roleSystem.MindHasRole<JobRoleComponent>(mindId), Is.False);
             });
 
-            var traitorRole = new TraitorRoleComponent();
+            var traitorRole = "MindRoleTraitor";
 
             roleSystem.MindAddRole(mindId, traitorRole);
 
             Assert.Multiple(() =>
             {
                 Assert.That(roleSystem.MindHasRole<TraitorRoleComponent>(mindId));
-                Assert.That(roleSystem.MindHasRole<JobComponent>(mindId), Is.False);
+                Assert.That(roleSystem.MindHasRole<JobRoleComponent>(mindId), Is.False);
             });
 
-            var jobRole = new JobComponent();
+            var jobRole = "";
 
-            roleSystem.MindAddRole(mindId, jobRole);
+            roleSystem.MindAddJobRole(mindId, jobPrototype:jobRole);
 
             Assert.Multiple(() =>
             {
                 Assert.That(roleSystem.MindHasRole<TraitorRoleComponent>(mindId));
-                Assert.That(roleSystem.MindHasRole<JobComponent>(mindId));
+                Assert.That(roleSystem.MindHasRole<JobRoleComponent>(mindId));
             });
 
             roleSystem.MindRemoveRole<TraitorRoleComponent>(mindId);
@@ -315,15 +312,15 @@ await server.WaitAssertion(() =>
             Assert.Multiple(() =>
             {
                 Assert.That(roleSystem.MindHasRole<TraitorRoleComponent>(mindId), Is.False);
-                Assert.That(roleSystem.MindHasRole<JobComponent>(mindId));
+                Assert.That(roleSystem.MindHasRole<JobRoleComponent>(mindId));
             });
 
-            roleSystem.MindRemoveRole<JobComponent>(mindId);
+            roleSystem.MindRemoveRole<JobRoleComponent>(mindId);
 
             Assert.Multiple(() =>
             {
                 Assert.That(roleSystem.MindHasRole<TraitorRoleComponent>(mindId), Is.False);
-                Assert.That(roleSystem.MindHasRole<JobComponent>(mindId), Is.False);
+                Assert.That(roleSystem.MindHasRole<JobRoleComponent>(mindId), Is.False);
             });
         });
 
diff --git a/Content.Server/AbstractAnalyzer/AbstractAnalyzerComponent.cs b/Content.Server/AbstractAnalyzer/AbstractAnalyzerComponent.cs
new file mode 100644
index 0000000000..66eadb9473
--- /dev/null
+++ b/Content.Server/AbstractAnalyzer/AbstractAnalyzerComponent.cs
@@ -0,0 +1,68 @@
+using Robust.Shared.Audio;
+
+namespace Content.Server.AbstractAnalyzer;
+
+/// <summary>
+/// After scanning, retrieves the target Uid to use with its related UI.
+/// </summary>
+/// <remarks>
+/// Requires <c>ItemToggleComponent</c>.
+/// </remarks>
+public abstract partial class AbstractAnalyzerComponent : Component
+{
+    /// <summary>
+    /// When should the next update be sent for the patient
+    /// </summary>
+    /// <remarks>
+    /// Override this in your implementation with:
+    ///
+    /// ```cs
+    /// [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    /// [AutoPausedField]
+    /// public override TimeSpan NextUpdate { get; set; } = TimeSpan.Zero;
+    /// ```
+    /// </remarks>
+    public abstract TimeSpan NextUpdate { get; set; }
+
+    /// <summary>
+    /// The delay between patient health updates
+    /// </summary>
+    [DataField]
+    public TimeSpan UpdateInterval = TimeSpan.FromSeconds(1);
+
+    /// <summary>
+    /// How long it takes to scan someone.
+    /// </summary>
+    [DataField]
+    public TimeSpan ScanDelay = TimeSpan.FromSeconds(0.8);
+
+    /// <summary>
+    /// Which entity has been scanned, for continuous updates
+    /// </summary>
+    [DataField]
+    public EntityUid? ScannedEntity;
+
+    /// <summary>
+    /// The maximum range in tiles at which the analyzer can receive continuous updates
+    /// </summary>
+    [DataField]
+    public float MaxScanRange = 2.5f;
+
+    /// <summary>
+    /// Sound played on scanning begin
+    /// </summary>
+    [DataField]
+    public SoundSpecifier? ScanningBeginSound;
+
+    /// <summary>
+    /// Sound played on scanning end
+    /// </summary>
+    [DataField]
+    public SoundSpecifier ScanningEndSound = new SoundPathSpecifier("/Audio/Items/Medical/healthscanner.ogg");
+
+    /// <summary>
+    /// Whether to show up the popup
+    /// </summary>
+    [DataField]
+    public bool Silent;
+}
diff --git a/Content.Server/AbstractAnalyzer/AbstractAnalyzerSystem.cs b/Content.Server/AbstractAnalyzer/AbstractAnalyzerSystem.cs
new file mode 100644
index 0000000000..916c6898e9
--- /dev/null
+++ b/Content.Server/AbstractAnalyzer/AbstractAnalyzerSystem.cs
@@ -0,0 +1,194 @@
+using System.Diagnostics.CodeAnalysis;
+using Content.Server.PowerCell;
+using Content.Shared.DoAfter;
+using Content.Shared.Interaction;
+using Content.Shared.Interaction.Events;
+using Content.Shared.Item.ItemToggle;
+using Content.Shared.Item.ItemToggle.Components;
+using Content.Shared.Popups;
+using Robust.Server.GameObjects;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Containers;
+using Robust.Shared.Timing;
+
+namespace Content.Server.AbstractAnalyzer;
+
+public abstract class AbstractAnalyzerSystem<TAnalyzerComponent, TAnalyzerDoAfterEvent> : EntitySystem
+    where TAnalyzerComponent : AbstractAnalyzerComponent
+    where TAnalyzerDoAfterEvent : SimpleDoAfterEvent, new()
+{
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly PowerCellSystem _cell = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
+    [Dependency] private readonly ItemToggleSystem _toggle = default!;
+    [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
+    [Dependency] private readonly TransformSystem _transformSystem = default!;
+    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<TAnalyzerComponent, AfterInteractEvent>(OnAfterInteract);
+        SubscribeLocalEvent<TAnalyzerComponent, TAnalyzerDoAfterEvent>(OnDoAfter);
+        SubscribeLocalEvent<TAnalyzerComponent, EntGotInsertedIntoContainerMessage>(OnInsertedIntoContainer);
+        SubscribeLocalEvent<TAnalyzerComponent, ItemToggledEvent>(OnToggled);
+        SubscribeLocalEvent<TAnalyzerComponent, DroppedEvent>(OnDropped);
+    }
+
+    public override void Update(float frameTime)
+    {
+        var analyzerQuery = EntityQueryEnumerator<TAnalyzerComponent, TransformComponent>();
+        while (analyzerQuery.MoveNext(out var uid, out var component, out var transform))
+        {
+            //Update rate limited to 1 second
+            if (component.NextUpdate > _timing.CurTime
+                || component.ScannedEntity is not { } target)
+                continue;
+
+            if (Deleted(target))
+            {
+                StopAnalyzingEntity((uid, component), target);
+                continue;
+            }
+
+            component.NextUpdate = _timing.CurTime + component.UpdateInterval;
+
+            //Get distance between analyzer and the scanned entity
+            var targetCoordinates = Transform(target).Coordinates;
+            if (!_transformSystem.InRange(targetCoordinates, transform.Coordinates, component.MaxScanRange))
+            {
+                //Range too far, disable updates
+                StopAnalyzingEntity((uid, component), target);
+                continue;
+            }
+
+            UpdateScannedUser(uid, target, true);
+        }
+    }
+
+    /// <summary>
+    /// Trigger the doafter for scanning
+    /// </summary>
+    private void OnAfterInteract(Entity<TAnalyzerComponent> uid, ref AfterInteractEvent args)
+    {
+        if (args.Target == null || !args.CanReach || !ValidScanTarget(args.Target) || !_cell.HasDrawCharge(uid, user: args.User))
+            return;
+
+        _audio.PlayPvs(uid.Comp.ScanningBeginSound, uid);
+
+        var doAfterCancelled = !_doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager,
+            args.User, uid.Comp.ScanDelay, new TAnalyzerDoAfterEvent(), uid, target: args.Target, used: uid)
+        {
+            NeedHand = true,
+            BreakOnMove = true,
+        });
+
+        if (args.Target == args.User || doAfterCancelled || uid.Comp.Silent || args.Target is null)
+            return;
+
+        if (ScanTargetPopupMessage(uid, args, out var msg))
+            _popupSystem.PopupEntity(msg, args.Target.Value, args.Target.Value, PopupType.Medium);
+    }
+
+    private void OnDoAfter(Entity<TAnalyzerComponent> uid, ref TAnalyzerDoAfterEvent args)
+    {
+        if (args.Handled || args.Cancelled || args.Target == null || !_cell.HasDrawCharge(uid, user: args.User))
+            return;
+
+        if (!uid.Comp.Silent)
+            _audio.PlayPvs(uid.Comp.ScanningEndSound, uid);
+
+        OpenUserInterface(args.User, uid);
+        BeginAnalyzingEntity(uid, args.Target.Value);
+        args.Handled = true;
+    }
+
+    /// <summary>
+    /// Turn off when placed into a storage item or moved between slots/hands
+    /// </summary>
+    private void OnInsertedIntoContainer(Entity<TAnalyzerComponent> uid, ref EntGotInsertedIntoContainerMessage args)
+    {
+        if (uid.Comp.ScannedEntity is { })
+            _toggle.TryDeactivate(uid.Owner);
+    }
+
+    /// <summary>
+    /// Disable continuous updates once turned off
+    /// </summary>
+    private void OnToggled(Entity<TAnalyzerComponent> ent, ref ItemToggledEvent args)
+    {
+        if (!args.Activated && ent.Comp.ScannedEntity is { } target)
+            StopAnalyzingEntity(ent, target);
+    }
+
+    /// <summary>
+    /// Turn off the analyser when dropped
+    /// </summary>
+    private void OnDropped(Entity<TAnalyzerComponent> uid, ref DroppedEvent args)
+    {
+        if (uid.Comp.ScannedEntity is { })
+            _toggle.TryDeactivate(uid.Owner);
+    }
+
+    private void OpenUserInterface(EntityUid user, EntityUid analyzer)
+    {
+        if (!_uiSystem.HasUi(analyzer, GetUiKey()))
+            return;
+
+        _uiSystem.OpenUi(analyzer, GetUiKey(), user);
+    }
+
+    /// <summary>
+    /// Mark the entity as being analyzed, and link the analyzer to it
+    /// </summary>
+    /// <param name="analyzer">The analyzer that should receive the updates</param>
+    /// <param name="target">The entity to start analyzing</param>
+    private void BeginAnalyzingEntity(Entity<TAnalyzerComponent> analyzer, EntityUid target)
+    {
+        //Link the analyzer to the scanned entity
+        analyzer.Comp.ScannedEntity = target;
+
+        _toggle.TryActivate(analyzer.Owner);
+        _cell.SetDrawEnabled(analyzer.Owner, true);
+
+        UpdateScannedUser(analyzer, target, true);
+    }
+
+    /// <summary>
+    /// Remove the analyzer from the active list, and remove the component if it has no active analyzers
+    /// </summary>
+    /// <param name="analyzer">The analyzer that's receiving the updates</param>
+    /// <param name="target">The entity to analyze</param>
+    private void StopAnalyzingEntity(Entity<TAnalyzerComponent> analyzer, EntityUid target)
+    {
+        //Unlink the analyzer
+        analyzer.Comp.ScannedEntity = null;
+
+        _toggle.TryDeactivate(analyzer.Owner);
+        _cell.SetDrawEnabled(analyzer.Owner, false);
+
+        UpdateScannedUser(analyzer, target, false);
+    }
+
+    /// <summary>
+    /// Send an update for the target to the analyzer
+    /// </summary>
+    /// <param name="analyzer">The analyzer</param>
+    /// <param name="target">The entity being scanned</param>
+    /// <param name="scanMode">True makes the UI show ACTIVE, False makes the UI show INACTIVE</param>
+    public abstract void UpdateScannedUser(EntityUid analyzer, EntityUid target, bool scanMode);
+
+    /// <returns>A <see cref="Robust.Shared.Serialization.NetSerializableAttribute"/> byte enum key.</returns>
+    protected abstract Enum GetUiKey();
+
+    /// <summary>
+    /// The message the scan target receives on scan.
+    /// </summary>
+    /// <returns>true if the message should be shown</returns>
+    protected abstract bool ScanTargetPopupMessage(Entity<TAnalyzerComponent> uid, AfterInteractEvent args, [NotNullWhen(true)] out string? message);
+
+    /// <summary>
+    /// Used to validate if a specific entity is a valid target for a specific analyzer.
+    /// </summary>
+    protected abstract bool ValidScanTarget(EntityUid? target);
+}
diff --git a/Content.Server/Antag/AntagRandomSpawnRule.cs b/Content.Server/Antag/AntagRandomSpawnRule.cs
new file mode 100644
index 0000000000..499761a8df
--- /dev/null
+++ b/Content.Server/Antag/AntagRandomSpawnRule.cs
@@ -0,0 +1,22 @@
+using Content.Server.Antag.Components;
+using Content.Server.GameTicking.Rules;
+
+namespace Content.Server.Antag;
+
+public sealed class AntagRandomSpawnSystem : GameRuleSystem<AntagRandomSpawnComponent>
+{
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<AntagRandomSpawnComponent, AntagSelectLocationEvent>(OnSelectLocation);
+    }
+
+    private void OnSelectLocation(Entity<AntagRandomSpawnComponent> ent, ref AntagSelectLocationEvent args)
+    {
+        if (TryFindRandomTile(out _, out _, out _, out var coords))
+            args.Coordinates.Add(_transform.ToMapCoordinates(coords));
+    }
+}
diff --git a/Content.Server/Antag/AntagSelectionSystem.cs b/Content.Server/Antag/AntagSelectionSystem.cs
index 27de66d5e8..46d93f7cad 100644
--- a/Content.Server/Antag/AntagSelectionSystem.cs
+++ b/Content.Server/Antag/AntagSelectionSystem.cs
@@ -10,14 +10,16 @@
 using Content.Server.Preferences.Managers;
 using Content.Server.Roles;
 using Content.Server.Roles.Jobs;
-using Content.Server.Shuttles.Components;
 using Content.Server.Station.Systems;
+using Content.Server.Shuttles.Components;
 using Content.Shared.Antag;
 using Content.Shared.GameTicking;
 using Content.Shared.GameTicking.Components;
 using Content.Shared.Ghost;
 using Content.Shared.Humanoid;
+using Content.Shared.Mind;
 using Content.Shared.Players;
+using Content.Shared.Roles;
 using Content.Shared.Whitelist;
 using Robust.Server.Audio;
 using Robust.Server.GameObjects;
@@ -32,13 +34,13 @@ namespace Content.Server.Antag;
 
 public sealed partial class AntagSelectionSystem : GameRuleSystem<AntagSelectionComponent>
 {
-    [Dependency] private readonly IChatManager _chat = default!;
-    [Dependency] private readonly IPlayerManager _playerManager = default!;
-    [Dependency] private readonly IServerPreferencesManager _pref = default!;
     [Dependency] private readonly AudioSystem _audio = default!;
+    [Dependency] private readonly IChatManager _chat = default!;
     [Dependency] private readonly GhostRoleSystem _ghostRole = default!;
     [Dependency] private readonly JobSystem _jobs = default!;
     [Dependency] private readonly MindSystem _mind = default!;
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
+    [Dependency] private readonly IServerPreferencesManager _pref = default!;
     [Dependency] private readonly RoleSystem _role = default!;
     [Dependency] private readonly StationSpawningSystem _stationSpawning = default!;
     [Dependency] private readonly TransformSystem _transform = default!;
@@ -188,7 +190,10 @@ protected override void Started(EntityUid uid, AntagSelectionComponent component
     /// <summary>
     /// Chooses antagonists from the given selection of players
     /// </summary>
-    public void ChooseAntags(Entity<AntagSelectionComponent> ent, IList<ICommonSession> pool)
+    /// <param name="ent">The antagonist rule entity</param>
+    /// <param name="pool">The players to choose from</param>
+    /// <param name="midround">Disable picking players for pre-spawn antags in the middle of a round</param>
+    public void ChooseAntags(Entity<AntagSelectionComponent> ent, IList<ICommonSession> pool, bool midround = false)
     {
         if (ent.Comp.SelectionsComplete)
             return;
@@ -204,7 +209,14 @@ public void ChooseAntags(Entity<AntagSelectionComponent> ent, IList<ICommonSessi
     /// <summary>
     /// Chooses antagonists from the given selection of players for the given antag definition.
     /// </summary>
-    public void ChooseAntags(Entity<AntagSelectionComponent> ent, IList<ICommonSession> pool, AntagSelectionDefinition def)
+    /// <param name="ent">The antagonist rule entity</param>
+    /// <param name="pool">The players to choose from</param>
+    /// <param name="def">The antagonist selection parameters and criteria</param>
+    /// <param name="midround">Disable picking players for pre-spawn antags in the middle of a round</param>
+    public void ChooseAntags(Entity<AntagSelectionComponent> ent,
+        IList<ICommonSession> pool,
+        AntagSelectionDefinition def,
+        bool midround = false)
     {
         var playerPool = GetPlayerPool(ent, pool, def);
         var count = GetTargetAntagCount(ent, GetTotalPlayerCount(pool), def);
@@ -307,14 +319,17 @@ public void MakeAntag(Entity<AntagSelectionComponent> ent, ICommonSession? sessi
         if (session != null)
         {
             var curMind = session.GetMind();
-            if (curMind == null)
+
+            if (curMind == null ||
+                !TryComp<MindComponent>(curMind.Value, out var mindComp) ||
+                mindComp.OwnedEntity != antagEnt)
             {
                 curMind = _mind.CreateMind(session.UserId, Name(antagEnt.Value));
                 _mind.SetUserId(curMind.Value, session.UserId);
             }
 
             _mind.TransferTo(curMind.Value, antagEnt, ghostCheckOverride: true);
-            _role.MindAddRoles(curMind.Value, def.MindComponents);
+            _role.MindAddRoles(curMind.Value, def.MindRoles, null, true);
             ent.Comp.SelectedMinds.Add((curMind.Value, Name(player)));
             SendBriefing(session, def.Briefing);
         }
diff --git a/Content.Server/Antag/AntagSpawnerSystem.cs b/Content.Server/Antag/AntagSpawnerSystem.cs
new file mode 100644
index 0000000000..f8a036749a
--- /dev/null
+++ b/Content.Server/Antag/AntagSpawnerSystem.cs
@@ -0,0 +1,21 @@
+using Content.Server.Antag.Components;
+
+namespace Content.Server.Antag;
+
+/// <summary>
+/// Spawns an entity when creating an antag for <see cref="AntagSpawnerComponent"/>.
+/// </summary>
+public sealed class AntagSpawnerSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<AntagSpawnerComponent, AntagSelectEntityEvent>(OnSelectEntity);
+    }
+
+    private void OnSelectEntity(Entity<AntagSpawnerComponent> ent, ref AntagSelectEntityEvent args)
+    {
+        args.Entity = Spawn(ent.Comp.Prototype);
+    }
+}
diff --git a/Content.Server/Antag/Components/AntagRandomSpawnComponent.cs b/Content.Server/Antag/Components/AntagRandomSpawnComponent.cs
new file mode 100644
index 0000000000..16edd256a2
--- /dev/null
+++ b/Content.Server/Antag/Components/AntagRandomSpawnComponent.cs
@@ -0,0 +1,8 @@
+namespace Content.Server.Antag.Components;
+
+/// <summary>
+/// Spawns this rule's antags at random tiles on a station using <c>TryGetRandomTile</c>.
+/// Requires <see cref="AntagSelectionComponent"/>.
+/// </summary>
+[RegisterComponent]
+public sealed partial class AntagRandomSpawnComponent : Component;
diff --git a/Content.Server/Antag/Components/AntagSelectionComponent.cs b/Content.Server/Antag/Components/AntagSelectionComponent.cs
index cae56c1a7b..a800ccb197 100644
--- a/Content.Server/Antag/Components/AntagSelectionComponent.cs
+++ b/Content.Server/Antag/Components/AntagSelectionComponent.cs
@@ -2,7 +2,6 @@
 using Content.Shared.Antag;
 using Content.Shared.Destructible.Thresholds;
 using Content.Shared.Roles;
-using Content.Shared.Storage;
 using Content.Shared.Whitelist;
 using Robust.Shared.Audio;
 using Robust.Shared.Player;
@@ -143,10 +142,17 @@ public partial struct AntagSelectionDefinition()
 
     /// <summary>
     /// Components added to the player's mind.
+    /// Do NOT use this to add role-type components. Add those as MindRoles instead
     /// </summary>
     [DataField]
     public ComponentRegistry MindComponents = new();
 
+    /// <summary>
+    /// List of Mind Role Prototypes to be added to the player's mind.
+    /// </summary>
+    [DataField]
+    public List<ProtoId<EntityPrototype>>? MindRoles;
+
     /// <summary>
     /// A set of starting gear that's equipped to the player.
     /// </summary>
diff --git a/Content.Server/Antag/Components/AntagSpawnerComponent.cs b/Content.Server/Antag/Components/AntagSpawnerComponent.cs
new file mode 100644
index 0000000000..7153babc76
--- /dev/null
+++ b/Content.Server/Antag/Components/AntagSpawnerComponent.cs
@@ -0,0 +1,17 @@
+using Content.Server.Antag;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Antag.Components;
+
+/// <summary>
+/// Spawns a prototype for antags created with a spawner.
+/// </summary>
+[RegisterComponent, Access(typeof(AntagSpawnerSystem))]
+public sealed partial class AntagSpawnerComponent : Component
+{
+    /// <summary>
+    /// The entity to spawn.
+    /// </summary>
+    [DataField(required: true)]
+    public EntProtoId Prototype = string.Empty;
+}
diff --git a/Content.Server/Botany/Components/PlantAnalyzerComponent.cs b/Content.Server/Botany/Components/PlantAnalyzerComponent.cs
new file mode 100644
index 0000000000..b06236aa56
--- /dev/null
+++ b/Content.Server/Botany/Components/PlantAnalyzerComponent.cs
@@ -0,0 +1,42 @@
+using Content.Server.AbstractAnalyzer;
+using Content.Server.Botany.Systems;
+using Robust.Shared.Audio;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Server.Botany.Components;
+
+/// <inheritdoc/>
+[RegisterComponent, AutoGenerateComponentPause]
+[Access(typeof(PlantAnalyzerSystem))]
+public sealed partial class PlantAnalyzerComponent : AbstractAnalyzerComponent
+{
+    /// <inheritdoc/>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoPausedField]
+    public override TimeSpan NextUpdate { get; set; } = TimeSpan.Zero;
+
+    /// <summary>
+    /// When will the analyzer be ready to print again?
+    /// </summary>
+    [ViewVariables(VVAccess.ReadOnly)]
+    public TimeSpan PrintReadyAt = TimeSpan.Zero;
+
+    /// <summary>
+    /// How often can the analyzer print?
+    /// </summary>
+    [DataField]
+    public TimeSpan PrintCooldown = TimeSpan.FromSeconds(5);
+
+    /// <summary>
+    /// The sound that's played when the analyzer prints off a report.
+    /// </summary>
+    [DataField]
+    public SoundSpecifier SoundPrint = new SoundPathSpecifier("/Audio/Machines/short_print_and_rip.ogg");
+
+    /// <summary>
+    /// What the machine will print.
+    /// </summary>
+    [DataField]
+    public EntProtoId MachineOutput = "PlantAnalyzerReportPaper";
+}
diff --git a/Content.Server/Botany/Systems/BotanySystem.Seed.cs b/Content.Server/Botany/Systems/BotanySystem.Seed.cs
index 82190d1c44..8e30df8c08 100644
--- a/Content.Server/Botany/Systems/BotanySystem.Seed.cs
+++ b/Content.Server/Botany/Systems/BotanySystem.Seed.cs
@@ -145,17 +145,7 @@ public IEnumerable<EntityUid> Harvest(SeedData proto, EntityUid user, int yieldM
 
     public IEnumerable<EntityUid> GenerateProduct(SeedData proto, EntityCoordinates position, int yieldMod = 1)
     {
-        var totalYield = 0;
-        if (proto.Yield > -1)
-        {
-            if (yieldMod < 0)
-                totalYield = proto.Yield;
-            else
-                totalYield = proto.Yield * yieldMod;
-
-            totalYield = Math.Max(1, totalYield);
-        }
-
+        var totalYield = CalculateTotalYield(proto.Yield, yieldMod);
         var products = new List<EntityUid>();
 
         if (totalYield > 1 || proto.HarvestRepeat != HarvestType.NoRepeat)
@@ -222,5 +212,8 @@ public bool CanHarvest(SeedData proto, EntityUid? held = null)
         return !proto.Ligneous || proto.Ligneous && held != null && HasComp<SharpComponent>(held);
     }
 
+    public static int CalculateTotalYield(int yield, int yieldMod) =>
+        yield > -1 ? Math.Max(1, yieldMod < 0 ? yield : yield * yieldMod) : 0;
+
     #endregion
 }
diff --git a/Content.Server/Botany/Systems/PlantAnalyzerSystem.cs b/Content.Server/Botany/Systems/PlantAnalyzerSystem.cs
new file mode 100644
index 0000000000..9198f8389e
--- /dev/null
+++ b/Content.Server/Botany/Systems/PlantAnalyzerSystem.cs
@@ -0,0 +1,193 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using Content.Server.AbstractAnalyzer;
+using Content.Server.Botany.Components;
+using Content.Server.Paper;
+using Content.Server.Popups;
+using Content.Shared.Botany.PlantAnalyzer;
+using Content.Shared.Hands.EntitySystems;
+using Content.Shared.Interaction;
+using Content.Shared.Labels.EntitySystems;
+using Robust.Server.GameObjects;
+using Robust.Shared.Audio;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+
+namespace Content.Server.Botany.Systems;
+
+public sealed class PlantAnalyzerSystem : AbstractAnalyzerSystem<PlantAnalyzerComponent, PlantAnalyzerDoAfterEvent>
+{
+    [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
+    [Dependency] private readonly IEntityManager _entityManager = default!;
+    [Dependency] private readonly IGameTiming _gameTiming = default!;
+    [Dependency] private readonly PopupSystem _popupSystem = default!;
+    [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
+    [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
+    [Dependency] private readonly PaperSystem _paperSystem = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly SharedLabelSystem _labelSystem = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<PlantAnalyzerComponent, PlantAnalyzerPrintMessage>(OnPrint);
+    }
+
+    /// <inheritdoc/>
+    public override void UpdateScannedUser(EntityUid analyzer, EntityUid target, bool scanMode)
+    {
+        if (!_uiSystem.HasUi(analyzer, PlantAnalyzerUiKey.Key)
+            || !ValidScanTarget(target)
+            || !_entityManager.TryGetComponent<PlantAnalyzerComponent>(analyzer, out var analyzerComponent))
+            return;
+
+        _uiSystem.ServerSendUiMessage(analyzer, PlantAnalyzerUiKey.Key, GatherData(analyzerComponent, scanMode, target: target));
+    }
+
+    private PlantAnalyzerScannedUserMessage GatherData(PlantAnalyzerComponent analyzer, bool? scanMode = null, EntityUid? target = null)
+    {
+        target ??= analyzer.ScannedEntity;
+        PlantAnalyzerPlantData? plantData = null;
+        PlantAnalyzerTrayData? trayData = null;
+        PlantAnalyzerTolerancesData? tolerancesData = null;
+        PlantAnalyzerProduceData? produceData = null;
+        if (_entityManager.TryGetComponent<PlantHolderComponent>(target, out var plantHolder))
+        {
+            if (plantHolder.Seed is not null)
+            {
+                plantData = new PlantAnalyzerPlantData(
+                    seedDisplayName: plantHolder.Seed.DisplayName,
+                    health: plantHolder.Health,
+                    endurance: plantHolder.Seed.Endurance,
+                    age: plantHolder.Age,
+                    lifespan: plantHolder.Seed.Lifespan,
+                    dead: plantHolder.Dead,
+                    viable: plantHolder.Seed.Viable,
+                    mutating: plantHolder.MutationLevel > 0f,
+                    kudzu: plantHolder.Seed.TurnIntoKudzu
+                );
+                tolerancesData = new PlantAnalyzerTolerancesData(
+                    waterConsumption: plantHolder.Seed.WaterConsumption,
+                    nutrientConsumption: plantHolder.Seed.NutrientConsumption,
+                    toxinsTolerance: plantHolder.Seed.ToxinsTolerance,
+                    pestTolerance: plantHolder.Seed.PestTolerance,
+                    weedTolerance: plantHolder.Seed.WeedTolerance,
+                    lowPressureTolerance: plantHolder.Seed.LowPressureTolerance,
+                    highPressureTolerance: plantHolder.Seed.HighPressureTolerance,
+                    idealHeat: plantHolder.Seed.IdealHeat,
+                    heatTolerance: plantHolder.Seed.HeatTolerance,
+                    idealLight: plantHolder.Seed.IdealLight,
+                    lightTolerance: plantHolder.Seed.LightTolerance,
+                    consumeGasses: [.. plantHolder.Seed.ConsumeGasses.Keys]
+                );
+                produceData = new PlantAnalyzerProduceData(
+                    yield: plantHolder.Seed.ProductPrototypes.Count == 0 ? 0 : BotanySystem.CalculateTotalYield(plantHolder.Seed.Yield, plantHolder.YieldMod),
+                    potency: plantHolder.Seed.Potency,
+                    chemicals: [.. plantHolder.Seed.Chemicals.Keys],
+                    produce: plantHolder.Seed.ProductPrototypes,
+                    exudeGasses: [.. plantHolder.Seed.ExudeGasses.Keys],
+                    seedless: plantHolder.Seed.Seedless
+                );
+            }
+            trayData = new PlantAnalyzerTrayData(
+                waterLevel: plantHolder.WaterLevel,
+                nutritionLevel: plantHolder.NutritionLevel,
+                toxins: plantHolder.Toxins,
+                pestLevel: plantHolder.PestLevel,
+                weedLevel: plantHolder.WeedLevel,
+                chemicals: plantHolder.SoilSolution?.Comp.Solution.Contents.Select(r => r.Reagent.Prototype).ToList()
+            );
+        }
+
+        return new PlantAnalyzerScannedUserMessage(
+            GetNetEntity(target),
+            scanMode,
+            plantData,
+            trayData,
+            tolerancesData,
+            produceData,
+            analyzer.PrintReadyAt
+        );
+    }
+
+    private void OnPrint(EntityUid uid, PlantAnalyzerComponent component, PlantAnalyzerPrintMessage args)
+    {
+        var user = args.Actor;
+
+        if (_gameTiming.CurTime < component.PrintReadyAt)
+        {
+            // This shouldn't occur due to the UI guarding against it, but
+            // if it does, tell the user why nothing happened.
+            _popupSystem.PopupEntity(Loc.GetString("plant-analyzer-printer-not-ready"), uid, user);
+            return;
+        }
+
+        // Spawn a piece of paper.
+        var printed = EntityManager.SpawnEntity(component.MachineOutput, Transform(uid).Coordinates);
+        _handsSystem.PickupOrDrop(args.Actor, printed, checkActionBlocker: false);
+
+        if (!TryComp<PaperComponent>(printed, out var paperComp))
+        {
+            Log.Error("Printed paper did not have PaperComponent.");
+            return;
+        }
+
+        var data = GatherData(component);
+        var missingData = Loc.GetString("plant-analyzer-printout-missing");
+
+        var seedName = data.PlantData is not null ? Loc.GetString(data.PlantData.SeedDisplayName) : null;
+        (string, object)[] parameters = [
+            ("seedName", seedName ?? missingData),
+            ("produce", data.ProduceData is not null ? PlantAnalyzerLocalizationHelper.ProduceToLocalizedStrings(data.ProduceData.Produce, _prototypeManager).Plural : missingData),
+            ("water", data.TolerancesData?.WaterConsumption.ToString("0.00") ?? missingData),
+            ("nutrients", data.TolerancesData?.NutrientConsumption.ToString("0.00") ?? missingData),
+            ("toxins", data.TolerancesData?.ToxinsTolerance.ToString("0.00") ?? missingData),
+            ("pests", data.TolerancesData?.PestTolerance.ToString("0.00") ?? missingData),
+            ("weeds", data.TolerancesData?.WeedTolerance.ToString("0.00") ?? missingData),
+            ("gasesIn", data.TolerancesData is not null ? PlantAnalyzerLocalizationHelper.GasesToLocalizedStrings(data.TolerancesData.ConsumeGasses, _prototypeManager) : missingData),
+            ("kpa", data.TolerancesData?.IdealPressure.ToString("0.00") ?? missingData),
+            ("kpaTolerance", data.TolerancesData?.PressureTolerance.ToString("0.00") ?? missingData),
+            ("temp", data.TolerancesData?.IdealHeat.ToString("0.00") ?? missingData),
+            ("tempTolerance", data.TolerancesData?.HeatTolerance.ToString("0.00") ?? missingData),
+            ("lightLevel", data.TolerancesData?.IdealLight.ToString("0.00") ?? missingData),
+            ("lightTolerance", data.TolerancesData?.LightTolerance.ToString("0.00") ?? missingData),
+            ("yield", data.ProduceData?.Yield ?? -1),
+            ("potency", data.ProduceData is not null ? Loc.GetString(data.ProduceData.Potency) : missingData),
+            ("chemicals", data.ProduceData is not null ? PlantAnalyzerLocalizationHelper.ChemicalsToLocalizedStrings(data.ProduceData.Chemicals, _prototypeManager) : missingData),
+            ("gasesOut", data.ProduceData is not null ? PlantAnalyzerLocalizationHelper.GasesToLocalizedStrings(data.ProduceData.ExudeGasses, _prototypeManager) : missingData),
+            ("endurance", data.PlantData?.Endurance.ToString("0.00") ?? missingData),
+            ("lifespan", data.PlantData?.Lifespan.ToString("0.00") ?? missingData),
+            ("seeds", data.ProduceData is not null ? (data.ProduceData.Seedless ? "no" : "yes") : "other"),
+            ("viable", data.PlantData is not null ? (data.PlantData.Viable ? "yes" : "no") : "other"),
+            ("kudzu", data.PlantData is not null ? (data.PlantData.Kudzu ? "yes" : "no") : "other"),
+            ("indent", "    "),
+            ("nl", "\n")
+        ];
+
+        _paperSystem.SetContent(printed, Loc.GetString($"plant-analyzer-printout", [.. parameters]));
+        _labelSystem.Label(printed, seedName);
+        _audioSystem.PlayPvs(component.SoundPrint, uid,
+            AudioParams.Default
+            .WithVariation(0.25f)
+            .WithVolume(3f)
+            .WithRolloffFactor(2.8f)
+            .WithMaxDistance(4.5f));
+
+        component.PrintReadyAt = _gameTiming.CurTime + component.PrintCooldown;
+    }
+
+    /// <inheritdoc/>
+    protected override Enum GetUiKey() => PlantAnalyzerUiKey.Key;
+
+    /// <inheritdoc/>
+    protected override bool ScanTargetPopupMessage(Entity<PlantAnalyzerComponent> uid, AfterInteractEvent args, [NotNullWhen(true)] out string? message)
+    {
+        message = null;
+        return false;
+    }
+
+    /// <inheritdoc/>
+    protected override bool ValidScanTarget(EntityUid? target) => HasComp<PlantHolderComponent>(target);
+}
diff --git a/Content.Server/CharacterInfo/CharacterInfoSystem.cs b/Content.Server/CharacterInfo/CharacterInfoSystem.cs
index df8718a022..cb2216b5e3 100644
--- a/Content.Server/CharacterInfo/CharacterInfoSystem.cs
+++ b/Content.Server/CharacterInfo/CharacterInfoSystem.cs
@@ -36,7 +36,7 @@ private void OnRequestCharacterInfoEvent(RequestCharacterInfoEvent msg, EntitySe
         if (_minds.TryGetMind(entity, out var mindId, out var mind))
         {
             // Get objectives
-            foreach (var objective in mind.AllObjectives)
+            foreach (var objective in mind.Objectives)
             {
                 var info = _objectives.GetInfo(objective, mindId, mind);
                 if (info == null)
diff --git a/Content.Server/Cloning/CloningSystem.cs b/Content.Server/Cloning/CloningSystem.cs
index c322483bc1..afff2dd515 100644
--- a/Content.Server/Cloning/CloningSystem.cs
+++ b/Content.Server/Cloning/CloningSystem.cs
@@ -242,7 +242,7 @@ public bool TryCloning(EntityUid uid, EntityUid bodyToClone, Entity<MindComponen
 
         clonePod.ActivelyCloning = true;
 
-        if (_jobs.MindTryGetJob(mindEnt, out _, out var prototype))
+        if (_jobs.MindTryGetJob(mindEnt, out var prototype))
             foreach (var special in prototype.Special)
                 if (special is AddComponentSpecial)
                     special.AfterEquip(mob);
diff --git a/Content.Server/DeltaV/Objectives/Systems/NotJobsRequirementSystem.cs b/Content.Server/DeltaV/Objectives/Systems/NotJobsRequirementSystem.cs
index 4ba1500837..07f11d6811 100644
--- a/Content.Server/DeltaV/Objectives/Systems/NotJobsRequirementSystem.cs
+++ b/Content.Server/DeltaV/Objectives/Systems/NotJobsRequirementSystem.cs
@@ -22,7 +22,7 @@ private void OnCheck(EntityUid uid, NotJobsRequirementComponent comp, ref Requir
             return;
 
         // if player has no job then don't care
-        if (!TryComp<JobComponent>(args.MindId, out var job))
+        if (!TryComp<JobRoleComponent>(args.MindId, out var job))
             return;
         foreach (string forbidJob in comp.Jobs)
             if (job.Prototype == forbidJob)
diff --git a/Content.Server/DeltaV/ParadoxAnomaly/Systems/ParadoxAnomalySystem.cs b/Content.Server/DeltaV/ParadoxAnomaly/Systems/ParadoxAnomalySystem.cs
index a81bab2ebc..8c3bd6e086 100644
--- a/Content.Server/DeltaV/ParadoxAnomaly/Systems/ParadoxAnomalySystem.cs
+++ b/Content.Server/DeltaV/ParadoxAnomaly/Systems/ParadoxAnomalySystem.cs
@@ -77,7 +77,7 @@ private bool TrySpawnParadoxAnomaly(string rule, [NotNullWhen(true)] out EntityU
             if (!_proto.TryIndex<SpeciesPrototype>(humanoid.Species, out var species))
                 continue;
 
-            if (_mind.GetMind(uid, mindContainer) is not {} mindId || !HasComp<JobComponent>(mindId))
+            if (_mind.GetMind(uid, mindContainer) is not {} mindId || !HasComp<JobRoleComponent>(mindId))
                 continue;
 
             if (_role.MindIsAntagonist(mindId))
@@ -99,7 +99,7 @@ private bool TrySpawnParadoxAnomaly(string rule, [NotNullWhen(true)] out EntityU
             return null;
 
         var (uid, mindId, species, profile) = _random.Pick(candidates);
-        var jobId = Comp<JobComponent>(mindId).Prototype;
+        var jobId = Comp<JobRoleComponent>(mindId).Prototype;
         var job = _proto.Index<JobPrototype>(jobId!);
 
         // Find a suitable spawn point.
diff --git a/Content.Server/Dragon/DragonSystem.cs b/Content.Server/Dragon/DragonSystem.cs
index 6a7d2d840c..efac049b35 100644
--- a/Content.Server/Dragon/DragonSystem.cs
+++ b/Content.Server/Dragon/DragonSystem.cs
@@ -1,4 +1,3 @@
-using Content.Server.GenericAntag;
 using Content.Server.Objectives.Components;
 using Content.Server.Objectives.Systems;
 using Content.Server.Popups;
@@ -9,10 +8,10 @@
 using Content.Shared.Mind;
 using Content.Shared.Mind.Components;
 using Content.Shared.Mobs;
+using Content.Shared.Mobs.Systems;
 using Content.Shared.Movement.Systems;
 using Content.Shared.NPC.Systems;
 using Content.Shared.Zombies;
-using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
@@ -26,10 +25,11 @@ public sealed partial class DragonSystem : EntitySystem
     [Dependency] private readonly MovementSpeedModifierSystem _movement = default!;
     [Dependency] private readonly NpcFactionSystem _faction = default!;
     [Dependency] private readonly PopupSystem _popup = default!;
-    [Dependency] private readonly RoleSystem _role = default!;
     [Dependency] private readonly SharedActionsSystem _actions = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
+    [Dependency] private readonly SharedMapSystem _map = default!;
+    [Dependency] private readonly MobStateSystem _mobState = default!;
 
     private EntityQuery<CarpRiftsConditionComponent> _objQuery;
 
@@ -56,7 +56,6 @@ public override void Initialize()
         SubscribeLocalEvent<DragonComponent, DragonSpawnRiftActionEvent>(OnSpawnRift);
         SubscribeLocalEvent<DragonComponent, RefreshMovementSpeedModifiersEvent>(OnDragonMove);
         SubscribeLocalEvent<DragonComponent, MobStateChangedEvent>(OnMobStateChanged);
-        SubscribeLocalEvent<DragonComponent, GenericAntagCreatedEvent>(OnCreated);
         SubscribeLocalEvent<DragonComponent, EntityZombifiedEvent>(OnZombified);
     }
 
@@ -95,7 +94,8 @@ public override void Update(float frameTime)
                 }
             }
 
-            comp.RiftAccumulator += frameTime;
+            if (!_mobState.IsDead(uid))
+                comp.RiftAccumulator += frameTime;
 
             // Delete it, naughty dragon!
             if (comp.RiftAccumulator >= comp.RiftMaxAccumulator)
@@ -149,7 +149,7 @@ private void OnSpawnRift(EntityUid uid, DragonComponent component, DragonSpawnRi
         // cant stack rifts near eachother
         foreach (var (_, riftXform) in EntityQuery<DragonRiftComponent, TransformComponent>(true))
         {
-            if (riftXform.Coordinates.InRange(EntityManager, _transform, xform.Coordinates, RiftRange))
+            if (_transform.InRange(riftXform.Coordinates, xform.Coordinates, RiftRange))
             {
                 _popup.PopupEntity(Loc.GetString("carp-rift-proximity", ("proximity", RiftRange)), uid, uid);
                 return;
@@ -157,7 +157,7 @@ private void OnSpawnRift(EntityUid uid, DragonComponent component, DragonSpawnRi
         }
 
         // cant put a rift on solars
-        foreach (var tile in grid.GetTilesIntersecting(new Circle(xform.WorldPosition, RiftTileRadius), false))
+        foreach (var tile in _map.GetTilesIntersecting(xform.GridUid.Value, grid, new Circle(_transform.GetWorldPosition(xform), RiftTileRadius), false))
         {
             if (!tile.IsSpace(_tileDef))
                 continue;
@@ -193,18 +193,6 @@ private void OnMobStateChanged(EntityUid uid, DragonComponent component, MobStat
         DeleteRifts(uid, false, component);
     }
 
-    private void OnCreated(EntityUid uid, DragonComponent comp, ref GenericAntagCreatedEvent args)
-    {
-        var mindId = args.MindId;
-        var mind = args.Mind;
-
-        _role.MindAddRole(mindId, new DragonRoleComponent(), mind);
-        _role.MindAddRole(mindId, new RoleBriefingComponent()
-        {
-            Briefing = Loc.GetString("dragon-role-briefing")
-        }, mind);
-    }
-
     private void OnZombified(Entity<DragonComponent> ent, ref EntityZombifiedEvent args)
     {
         // prevent carp attacking zombie dragon
@@ -240,7 +228,7 @@ public void DeleteRifts(EntityUid uid, bool resetRole, DragonComponent? comp = n
             return;
 
         var mind = Comp<MindComponent>(mindContainer.Mind.Value);
-        foreach (var objId in mind.AllObjectives)
+        foreach (var objId in mind.Objectives)
         {
             if (_objQuery.TryGetComponent(objId, out var obj))
             {
@@ -262,7 +250,7 @@ public void RiftCharged(EntityUid uid, DragonComponent? comp = null)
             return;
 
         var mind = Comp<MindComponent>(mindContainer.Mind.Value);
-        foreach (var objId in mind.AllObjectives)
+        foreach (var objId in mind.Objectives)
         {
             if (_objQuery.TryGetComponent(objId, out var obj))
             {
diff --git a/Content.Server/EntityEffects/EffectConditions/JobCondition.cs b/Content.Server/EntityEffects/EffectConditions/JobCondition.cs
index c62cb60a22..7bb0b82069 100644
--- a/Content.Server/EntityEffects/EffectConditions/JobCondition.cs
+++ b/Content.Server/EntityEffects/EffectConditions/JobCondition.cs
@@ -5,6 +5,7 @@
 using Content.Shared.Mind.Components;
 using Content.Shared.Roles;
 using Content.Shared.Roles.Jobs;
+using Content.Shared.Mind;
 
 namespace Content.Server.EntityEffects.EffectConditions;
 
@@ -15,15 +16,22 @@ public sealed partial class JobCondition : EntityEffectCondition
     public override bool Condition(EntityEffectBaseArgs args)
     {
         args.EntityManager.TryGetComponent<MindContainerComponent>(args.TargetEntity, out var mindContainer);
-        if (mindContainer != null && mindContainer.Mind != null)
+
+        if ( mindContainer is null
+             || !args.EntityManager.TryGetComponent<MindComponent>(mindContainer.Mind, out var mind))
+            return false;
+
+        foreach (var roleId in mind.MindRoles)
         {
-            var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
-            if (args.EntityManager.TryGetComponent<JobComponent>(mindContainer?.Mind, out var comp) && prototypeManager.TryIndex(comp.Prototype, out var prototype))
-            {
-                foreach (var jobId in Job)
-                    if (prototype.ID == jobId)
-                        return true;
-            }
+            if(!args.EntityManager.HasComponent<JobRoleComponent>(roleId))
+                continue;
+
+            if(!args.EntityManager.TryGetComponent<MindRoleComponent>(roleId, out var mindRole)
+               || mindRole.JobPrototype is null)
+                continue;
+
+            if (Job.Contains(mindRole.JobPrototype.Value))
+                return true;
         }
 
         return false;
@@ -35,5 +43,3 @@ public override string GuidebookExplanation(IPrototypeManager prototype)
         return Loc.GetString("reagent-effect-condition-guidebook-job-condition", ("job", ContentLocalizationManager.FormatListToOr(localizedNames)));
     }
 }
-
-
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustPests.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustPests.cs
index 219529bfc4..fabf99430b 100644
--- a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustPests.cs
+++ b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustPests.cs
@@ -11,7 +11,7 @@ public sealed partial class PlantAdjustPests : PlantAdjustAttribute
 
     public override void Effect(EntityEffectBaseArgs args)
     {
-        if (!CanMetabolize(args.TargetEntity, out var plantHolderComp, args.EntityManager))
+        if (!CanMetabolize(args.TargetEntity, out var plantHolderComp, args.EntityManager, mustHaveAlivePlant: false))
             return;
 
         plantHolderComp.PestLevel += Amount;
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustToxins.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustToxins.cs
index ab1baa4285..876f8bf1a7 100644
--- a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustToxins.cs
+++ b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustToxins.cs
@@ -11,7 +11,7 @@ public sealed partial class PlantAdjustToxins : PlantAdjustAttribute
 
     public override void Effect(EntityEffectBaseArgs args)
     {
-        if (!CanMetabolize(args.TargetEntity, out var plantHolderComp, args.EntityManager))
+        if (!CanMetabolize(args.TargetEntity, out var plantHolderComp, args.EntityManager, mustHaveAlivePlant: false))
             return;
 
         plantHolderComp.Toxins += Amount;
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustWeeds.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustWeeds.cs
index 421e31998d..b4f8343eac 100644
--- a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustWeeds.cs
+++ b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustWeeds.cs
@@ -11,7 +11,7 @@ public sealed partial class PlantAdjustWeeds : PlantAdjustAttribute
 
     public override void Effect(EntityEffectBaseArgs args)
     {
-        if (!CanMetabolize(args.TargetEntity, out var plantHolderComp, args.EntityManager))
+        if (!CanMetabolize(args.TargetEntity, out var plantHolderComp, args.EntityManager, mustHaveAlivePlant: false))
             return;
 
         plantHolderComp.WeedLevel += Amount;
diff --git a/Content.Server/GameTicking/GameTicker.RoundFlow.cs b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
index e022e5af64..cc45240b4a 100644
--- a/Content.Server/GameTicking/GameTicker.RoundFlow.cs
+++ b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
@@ -4,6 +4,7 @@
 using Content.Server.GameTicking.Events;
 using Content.Server.Ghost;
 using Content.Server.Maps;
+using Content.Server.Roles;
 using Content.Shared.CCVar;
 using Content.Shared.Database;
 using Content.Shared.GameTicking;
@@ -27,6 +28,7 @@ namespace Content.Server.GameTicking
     public sealed partial class GameTicker
     {
         [Dependency] private readonly DiscordWebhook _discord = default!;
+        [Dependency] private readonly RoleSystem _role = default!;
         [Dependency] private readonly ITaskManager _taskManager = default!;
         [Dependency] private readonly AnnouncerSystem _announcer = default!;
 
@@ -372,6 +374,7 @@ public void ShowRoundEndScoreboard(string text = "")
             var listOfPlayerInfo = new List<RoundEndMessageEvent.RoundEndPlayerInfo>();
             // Grab the great big book of all the Minds, we'll need them for this.
             var allMinds = EntityQueryEnumerator<MindComponent>();
+            var pvsOverride = _configurationManager.GetCVar(CCVars.RoundEndPVSOverrides);
             while (allMinds.MoveNext(out var mindId, out var mind))
             {
                 // TODO don't list redundant observer roles?
@@ -380,7 +383,7 @@ public void ShowRoundEndScoreboard(string text = "")
                 var userId = mind.UserId ?? mind.OriginalOwnerUserId;
 
                 var connected = false;
-                var observer = HasComp<ObserverRoleComponent>(mindId);
+                var observer = _role.MindHasRole<ObserverRoleComponent>(mindId);
                 // Continuing
                 if (userId != null && _playerManager.ValidSessionId(userId.Value))
                 {
@@ -402,12 +405,12 @@ public void ShowRoundEndScoreboard(string text = "")
                 else if (mind.CurrentEntity != null && TryName(mind.CurrentEntity.Value, out var icName))
                     playerIcName = icName;
 
-                if (TryGetEntity(mind.OriginalOwnedEntity, out var entity))
+                if (TryGetEntity(mind.OriginalOwnedEntity, out var entity) && pvsOverride)
                 {
                     _pvsOverride.AddGlobalOverride(GetNetEntity(entity.Value), recursive: true);
                 }
 
-                var roles = _roles.MindGetAllRoles(mindId);
+                var roles = _roles.MindGetAllRoleInfo(mindId);
 
                 var playerEndRoundInfo = new RoundEndMessageEvent.RoundEndPlayerInfo()
                 {
diff --git a/Content.Server/GameTicking/GameTicker.Spawning.cs b/Content.Server/GameTicking/GameTicker.Spawning.cs
index f8cad3d55c..dc2966fe59 100644
--- a/Content.Server/GameTicking/GameTicker.Spawning.cs
+++ b/Content.Server/GameTicking/GameTicker.Spawning.cs
@@ -3,7 +3,6 @@
 using System.Numerics;
 using Content.Server.Administration.Managers;
 using Content.Server.GameTicking.Events;
-using Content.Server.Ghost;
 using Content.Server.RandomMetadata;
 using Content.Server.Spawners.Components;
 using Content.Server.Speech.Components;
@@ -17,7 +16,6 @@
 using Content.Shared.Preferences;
 using Content.Shared.Roles;
 using Content.Shared.Roles.Jobs;
-using Content.Shared.Silicon.Components;
 using JetBrains.Annotations;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
@@ -248,21 +246,12 @@ private void SpawnPlayer(ICommonSession player,
             _mind.SetUserId(newMind, data.UserId);
 
             var jobPrototype = _prototypeManager.Index<JobPrototype>(jobId);
-            var job = new JobComponent { Prototype = jobId };
-            _roles.MindAddRole(newMind, job, silent: silent);
+            _roles.MindAddJobRole(newMind, silent: silent, jobPrototype:jobId);
             var jobName = _jobs.MindTryGetJobName(newMind);
 
             _playTimeTrackings.PlayerRolesChanged(player);
 
-            // Delta-V: Add AlwaysUseSpawner.
-            var spawnPointType = SpawnPointType.Unset;
-            if (jobPrototype.AlwaysUseSpawner)
-            {
-                lateJoin = false;
-                spawnPointType = SpawnPointType.Job;
-            }
-
-            var mobMaybe = _stationSpawning.SpawnPlayerCharacterOnStation(station, job, character, spawnPointType: spawnPointType);
+            var mobMaybe = _stationSpawning.SpawnPlayerCharacterOnStation(station, jobId, character);
             DebugTools.AssertNotNull(mobMaybe);
             var mob = mobMaybe!.Value;
 
@@ -301,13 +290,17 @@ private void SpawnPlayer(ICommonSession player,
             _stationJobs.TryAssignJob(station, jobPrototype, player.UserId);
 
             if (lateJoin)
+            {
                 _adminLogger.Add(LogType.LateJoin,
                     LogImpact.Medium,
                     $"Player {player.Name} late joined as {character.Name:characterName} on station {Name(station):stationName} with {ToPrettyString(mob):entity} as a {jobName:jobName}.");
+            }
             else
+            {
                 _adminLogger.Add(LogType.RoundStartJoin,
                     LogImpact.Medium,
                     $"Player {player.Name} joined as {character.Name:characterName} on station {Name(station):stationName} with {ToPrettyString(mob):entity} as a {jobName:jobName}.");
+            }
 
             // Make sure they're aware of extended access.
             if (Comp<StationJobsComponent>(station).ExtendedAccess
@@ -408,7 +401,7 @@ public void SpawnObserver(ICommonSession player)
                 var (mindId, mindComp) = _mind.CreateMind(player.UserId, name);
                 mind = (mindId, mindComp);
                 _mind.SetUserId(mind.Value, player.UserId);
-                _roles.MindAddRole(mind.Value, new ObserverRoleComponent());
+                _roles.MindAddRole(mind.Value, "MindRoleObserver");
             }
 
             var ghost = _ghost.SpawnGhost(mind.Value);
diff --git a/Content.Server/GameTicking/Rules/Components/TraitorRuleComponent.cs b/Content.Server/GameTicking/Rules/Components/TraitorRuleComponent.cs
index cbc519bcfd..696f72a6ed 100644
--- a/Content.Server/GameTicking/Rules/Components/TraitorRuleComponent.cs
+++ b/Content.Server/GameTicking/Rules/Components/TraitorRuleComponent.cs
@@ -87,5 +87,5 @@ public enum SelectionState
     /// The amount of TC traitors start with.
     /// </summary>
     [DataField]
-    public FixedPoint2 StartingBalance = 100;
+    public int StartingBalance = 100;
 }
diff --git a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
index d6e0cb9290..93691289b7 100644
--- a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
@@ -13,7 +13,6 @@
 using Content.Server.Shuttles.Events;
 using Content.Server.Shuttles.Systems;
 using Content.Server.Station.Components;
-using Content.Server.Store.Components;
 using Content.Server.Store.Systems;
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
@@ -37,9 +36,9 @@ namespace Content.Server.GameTicking.Rules;
 
 public sealed class NukeopsRuleSystem : GameRuleSystem<NukeopsRuleComponent>
 {
+    [Dependency] private readonly AntagSelectionSystem _antag = default!;
     [Dependency] private readonly EmergencyShuttleSystem _emergency = default!;
     [Dependency] private readonly NpcFactionSystem _npcFaction = default!;
-    [Dependency] private readonly AntagSelectionSystem _antag = default!;
     [Dependency] private readonly PopupSystem _popupSystem = default!;
     [Dependency] private readonly RoundEndSystem _roundEndSystem = default!;
     [Dependency] private readonly StoreSystem _store = default!;
@@ -64,6 +63,7 @@ public override void Initialize()
         SubscribeLocalEvent<NukeOperativeComponent, EntityZombifiedEvent>(OnOperativeZombified);
 
         SubscribeLocalEvent<NukeOpsShuttleComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<NukeopsRoleComponent, GetBriefingEvent>(OnGetBriefing);
 
         SubscribeLocalEvent<ConsoleFTLAttemptEvent>(OnShuttleFTLAttempt);
         SubscribeLocalEvent<WarDeclaredEvent>(OnWarDeclared);
@@ -72,7 +72,9 @@ public override void Initialize()
         SubscribeLocalEvent<NukeopsRuleComponent, AfterAntagEntitySelectedEvent>(OnAfterAntagEntSelected);
     }
 
-    protected override void Started(EntityUid uid, NukeopsRuleComponent component, GameRuleComponent gameRule,
+    protected override void Started(EntityUid uid,
+        NukeopsRuleComponent component,
+        GameRuleComponent gameRule,
         GameRuleStartedEvent args)
     {
         var eligible = new List<Entity<StationEventEligibleComponent, NpcFactionMemberComponent>>();
@@ -92,7 +94,9 @@ protected override void Started(EntityUid uid, NukeopsRuleComponent component, G
     }
 
     #region Event Handlers
-    protected override void AppendRoundEndText(EntityUid uid, NukeopsRuleComponent component, GameRuleComponent gameRule,
+    protected override void AppendRoundEndText(EntityUid uid,
+        NukeopsRuleComponent component,
+        GameRuleComponent gameRule,
         ref RoundEndTextAppendEvent args)
     {
         var winText = Loc.GetString($"nukeops-{component.WinType.ToString().ToLower()}");
@@ -233,7 +237,8 @@ private void OnRoundEnd(Entity<NukeopsRuleComponent> ent)
 
         // If the disk is currently at Central Command, the crew wins - just slightly.
         // This also implies that some nuclear operatives have died.
-        SetWinType(ent, diskAtCentCom
+        SetWinType(ent,
+            diskAtCentCom
             ? WinType.CrewMinor
             : WinType.OpsMinor);
         ent.Comp.WinConditions.Add(diskAtCentCom
@@ -461,8 +466,11 @@ private void CheckRoundShouldEnd(Entity<NukeopsRuleComponent> ent)
             : WinCondition.AllNukiesDead);
 
         SetWinType(ent, WinType.CrewMajor, false);
-        _roundEndSystem.DoRoundEndBehavior(
-            nukeops.RoundEndBehavior, nukeops.EvacShuttleTime, nukeops.RoundEndTextSender, nukeops.RoundEndTextShuttleCall, nukeops.RoundEndTextAnnouncement);
+        _roundEndSystem.DoRoundEndBehavior(nukeops.RoundEndBehavior,
+            nukeops.EvacShuttleTime,
+            nukeops.RoundEndTextSender,
+            nukeops.RoundEndTextShuttleCall,
+            nukeops.RoundEndTextAnnouncement);
 
         // prevent it called multiple times
         nukeops.RoundEndBehavior = RoundEndBehavior.Nothing;
@@ -470,16 +478,22 @@ private void CheckRoundShouldEnd(Entity<NukeopsRuleComponent> ent)
 
     private void OnAfterAntagEntSelected(Entity<NukeopsRuleComponent> ent, ref AfterAntagEntitySelectedEvent args)
     {
-        if (ent.Comp.TargetStation is not { } station)
-            return;
+        var target = (ent.Comp.TargetStation is not null) ? Name(ent.Comp.TargetStation.Value) : "the target";
 
-        _antag.SendBriefing(args.Session, Loc.GetString("nukeops-welcome",
-                ("station", station),
+        _antag.SendBriefing(args.Session,
+            Loc.GetString("nukeops-welcome",
+                ("station", target),
                 ("name", Name(ent))),
             Color.Red,
             ent.Comp.GreetSoundNotification);
     }
 
+    private void OnGetBriefing(Entity<NukeopsRoleComponent> role, ref GetBriefingEvent args)
+    {
+        // TODO Different character screen briefing for the 3 nukie types
+        args.Append(Loc.GetString("nukeops-briefing"));
+    }
+
     /// <remarks>
     /// Is this method the shitty glue holding together the last of my sanity? yes.
     /// Do i have a better solution? not presently.
diff --git a/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs b/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
index c5f88ab6cf..939ab87115 100644
--- a/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
@@ -15,7 +15,6 @@
 using Content.Shared.GameTicking.Components;
 using Content.Shared.Humanoid;
 using Content.Shared.IdentityManagement;
-using Content.Shared.Mind;
 using Content.Shared.Mind.Components;
 using Content.Shared.Mindshield.Components;
 using Content.Shared.Mobs;
@@ -38,8 +37,8 @@ namespace Content.Server.GameTicking.Rules;
 public sealed class RevolutionaryRuleSystem : GameRuleSystem<RevolutionaryRuleComponent>
 {
     [Dependency] private readonly IAdminLogManager _adminLogManager = default!;
-    [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly AntagSelectionSystem _antag = default!;
+    [Dependency] private readonly EmergencyShuttleSystem _emergencyShuttle = default!;
     [Dependency] private readonly EuiManager _euiMan = default!;
     [Dependency] private readonly MindSystem _mind = default!;
     [Dependency] private readonly MobStateSystem _mobState = default!;
@@ -49,7 +48,7 @@ public sealed class RevolutionaryRuleSystem : GameRuleSystem<RevolutionaryRuleCo
     [Dependency] private readonly SharedStunSystem _stun = default!;
     [Dependency] private readonly RoundEndSystem _roundEnd = default!;
     [Dependency] private readonly StationSystem _stationSystem = default!;
-    [Dependency] private readonly EmergencyShuttleSystem _emergencyShuttle = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
 
     //Used in OnPostFlash, no reference to the rule component is available
     public readonly ProtoId<NpcFactionPrototype> RevolutionaryNpcFaction = "Revolutionary";
@@ -59,9 +58,12 @@ public override void Initialize()
     {
         base.Initialize();
         SubscribeLocalEvent<CommandStaffComponent, MobStateChangedEvent>(OnCommandMobStateChanged);
+
+        SubscribeLocalEvent<HeadRevolutionaryComponent, AfterFlashedEvent>(OnPostFlash);
         SubscribeLocalEvent<HeadRevolutionaryComponent, MobStateChangedEvent>(OnHeadRevMobStateChanged);
+
         SubscribeLocalEvent<RevolutionaryRoleComponent, GetBriefingEvent>(OnGetBriefing);
-        SubscribeLocalEvent<HeadRevolutionaryComponent, AfterFlashedEvent>(OnPostFlash);
+
     }
 
     protected override void Started(EntityUid uid, RevolutionaryRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
@@ -85,7 +87,9 @@ protected override void ActiveTick(EntityUid uid, RevolutionaryRuleComponent com
         }
     }
 
-    protected override void AppendRoundEndText(EntityUid uid, RevolutionaryRuleComponent component, GameRuleComponent gameRule,
+    protected override void AppendRoundEndText(EntityUid uid,
+        RevolutionaryRuleComponent component,
+        GameRuleComponent gameRule,
         ref RoundEndTextAppendEvent args)
     {
         base.AppendRoundEndText(uid, component, gameRule, ref args);
@@ -101,7 +105,9 @@ protected override void AppendRoundEndText(EntityUid uid, RevolutionaryRuleCompo
         args.AddLine(Loc.GetString("rev-headrev-count", ("initialCount", sessionData.Count)));
         foreach (var (mind, data, name) in sessionData)
         {
-            var count = CompOrNull<RevolutionaryRoleComponent>(mind)?.ConvertedCount ?? 0;
+            _role.MindHasRole<RevolutionaryRoleComponent>(mind, out var role);
+            var count = CompOrNull<RevolutionaryRoleComponent>(role)?.ConvertedCount ?? 0;
+
             args.AddLine(Loc.GetString("rev-headrev-name-user",
                 ("name", name),
                 ("username", data.UserName),
@@ -113,10 +119,8 @@ protected override void AppendRoundEndText(EntityUid uid, RevolutionaryRuleCompo
 
     private void OnGetBriefing(EntityUid uid, RevolutionaryRoleComponent comp, ref GetBriefingEvent args)
     {
-        if (!TryComp<MindComponent>(uid, out var mind) || mind.OwnedEntity == null)
-            return;
-
-        var head = HasComp<HeadRevolutionaryComponent>(mind.OwnedEntity);
+        var ent = args.Mind.Comp.OwnedEntity;
+        var head = HasComp<HeadRevolutionaryComponent>(ent);
         args.Append(Loc.GetString(head ? "head-rev-briefing" : "rev-briefing"));
     }
 
@@ -145,15 +149,20 @@ private void OnPostFlash(EntityUid uid, HeadRevolutionaryComponent comp, ref Aft
 
         if (ev.User != null)
         {
-            _adminLogManager.Add(LogType.Mind, LogImpact.Medium, $"{ToPrettyString(ev.User.Value)} converted {ToPrettyString(ev.Target)} into a Revolutionary");
+            _adminLogManager.Add(LogType.Mind,
+                LogImpact.Medium,
+                $"{ToPrettyString(ev.User.Value)} converted {ToPrettyString(ev.Target)} into a Revolutionary");
 
-            if (_mind.TryGetRole<RevolutionaryRoleComponent>(ev.User.Value, out var headrev))
-                headrev.ConvertedCount++;
+            if (_mind.TryGetMind(ev.User.Value, out var revMindId, out _))
+            {
+                if (_role.MindHasRole<RevolutionaryRoleComponent>(revMindId, out _, out var role))
+                    role.Value.Comp.ConvertedCount++;
+            }
         }
 
         if (mindId == default || !_role.MindHasRole<RevolutionaryRoleComponent>(mindId))
         {
-            _role.MindAddRole(mindId, new RevolutionaryRoleComponent { PrototypeId = RevPrototypeId });
+            _role.MindAddRole(mindId, "MindRoleRevolutionary");
         }
 
         if (mind?.Session != null)
diff --git a/Content.Server/GameTicking/Rules/ThiefRuleSystem.cs b/Content.Server/GameTicking/Rules/ThiefRuleSystem.cs
index faec4a9e9c..b00ed38636 100644
--- a/Content.Server/GameTicking/Rules/ThiefRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/ThiefRuleSystem.cs
@@ -1,21 +1,13 @@
 using Content.Server.Antag;
 using Content.Server.GameTicking.Rules.Components;
-using Content.Server.Mind;
-using Content.Server.Objectives;
 using Content.Server.Roles;
 using Content.Shared.Humanoid;
-using Content.Shared.Mind;
-using Content.Shared.Objectives.Components;
-using Robust.Shared.Random;
 
 namespace Content.Server.GameTicking.Rules;
 
 public sealed class ThiefRuleSystem : GameRuleSystem<ThiefRuleComponent>
 {
-    [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly MindSystem _mindSystem = default!;
     [Dependency] private readonly AntagSelectionSystem _antag = default!;
-    [Dependency] private readonly ObjectivesSystem _objectives = default!;
 
     public override void Initialize()
     {
@@ -26,32 +18,33 @@ public override void Initialize()
         SubscribeLocalEvent<ThiefRoleComponent, GetBriefingEvent>(OnGetBriefing);
     }
 
-    private void AfterAntagSelected(Entity<ThiefRuleComponent> ent, ref AfterAntagEntitySelectedEvent args)
+    // Greeting upon thief activation
+    private void AfterAntagSelected(Entity<ThiefRuleComponent> mindId, ref AfterAntagEntitySelectedEvent args)
     {
-        if (!_mindSystem.TryGetMind(args.EntityUid, out var mindId, out var mind))
-            return;
-
-        //Generate objectives
-        _antag.SendBriefing(args.EntityUid, MakeBriefing(args.EntityUid), null, null);
+        var ent = args.EntityUid;
+        _antag.SendBriefing(ent, MakeBriefing(ent), null, null);
     }
 
-    //Add mind briefing
-    private void OnGetBriefing(Entity<ThiefRoleComponent> thief, ref GetBriefingEvent args)
+    // Character screen briefing
+    private void OnGetBriefing(Entity<ThiefRoleComponent> role, ref GetBriefingEvent args)
     {
-        if (!TryComp<MindComponent>(thief.Owner, out var mind) || mind.OwnedEntity == null)
-            return;
+        var ent = args.Mind.Comp.OwnedEntity;
 
-        args.Append(MakeBriefing(mind.OwnedEntity.Value));
+        if (ent is null)
+            return;
+        args.Append(MakeBriefing(ent.Value));
     }
 
-    private string MakeBriefing(EntityUid thief)
+    private string MakeBriefing(EntityUid ent)
     {
-        var isHuman = HasComp<HumanoidAppearanceComponent>(thief);
+        var isHuman = HasComp<HumanoidAppearanceComponent>(ent);
         var briefing = isHuman
             ? Loc.GetString("thief-role-greeting-human")
             : Loc.GetString("thief-role-greeting-animal");
 
-        briefing += "\n \n" + Loc.GetString("thief-role-greeting-equipment") + "\n";
+        if (isHuman)
+            briefing += "\n \n" + Loc.GetString("thief-role-greeting-equipment") + "\n";
+
         return briefing;
     }
 }
diff --git a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
index 51545c6ce5..68fc4b80fd 100644
--- a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
@@ -10,9 +10,7 @@
 using Content.Shared.Mind;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.NPC.Systems;
-using Content.Shared.Objectives.Components;
 using Content.Shared.PDA;
-using Content.Shared.Radio;
 using Content.Shared.Roles;
 using Content.Shared.Roles.Jobs;
 using Content.Shared.Roles.RoleCodeword;
@@ -28,24 +26,21 @@ namespace Content.Server.GameTicking.Rules;
 public sealed class TraitorRuleSystem : GameRuleSystem<TraitorRuleComponent>
 {
     private static readonly Color TraitorCodewordColor = Color.FromHex("#cc3b3b");
-
-    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-    [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly NpcFactionSystem _npcFaction = default!;
     [Dependency] private readonly AntagSelectionSystem _antag = default!;
-    [Dependency] private readonly UplinkSystem _uplink = default!;
-    [Dependency] private readonly MindSystem _mindSystem = default!;
-    [Dependency] private readonly SharedRoleSystem _roleSystem = default!;
     [Dependency] private readonly SharedJobSystem _jobs = default!;
-    [Dependency] private readonly ObjectivesSystem _objectives = default!;
+    [Dependency] private readonly MindSystem _mindSystem = default!;
+    [Dependency] private readonly NpcFactionSystem _npcFaction = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly SharedRoleCodewordSystem _roleCodewordSystem = default!;
+    [Dependency] private readonly SharedRoleSystem _roleSystem = default!;
+    [Dependency] private readonly UplinkSystem _uplink = default!;
 
     public override void Initialize()
     {
         base.Initialize();
 
         SubscribeLocalEvent<TraitorRuleComponent, AfterAntagEntitySelectedEvent>(AfterEntitySelected);
-
         SubscribeLocalEvent<TraitorRuleComponent, ObjectivesTextPrependEvent>(OnObjectivesTextPrepend);
     }
 
@@ -75,7 +70,7 @@ private void MakeCodewords(TraitorRuleComponent component)
 
     public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component)
     {
-        //Grab the mind if it wasnt provided
+        //Grab the mind if it wasn't provided
         if (!_mindSystem.TryGetMind(traitor, out var mindId, out var mind))
             return false;
 
@@ -92,13 +87,8 @@ public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component)
         {
             // Calculate the amount of currency on the uplink.
             var startingBalance = component.StartingBalance;
-            if (_jobs.MindTryGetJob(mindId, out _, out var job))
-            {
-                if (startingBalance < job.AntagAdvantage) // Can't use Math functions on FixedPoint2
-                    startingBalance = 0;
-                else
-                    startingBalance = startingBalance - job.AntagAdvantage;
-            }
+            if (_jobs.MindTryGetJob(mindId, out var prototype))
+                startingBalance = Math.Max(startingBalance - prototype.AntagAdvantage, 0);
 
             // creadth: we need to create uplink for the antag.
             // PDA should be in place already
@@ -116,14 +106,18 @@ public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component)
 
         _antag.SendBriefing(traitor, GenerateBriefing(component.Codewords, code, issuer), null, component.GreetSoundNotification);
 
-
         component.TraitorMinds.Add(mindId);
 
         // Assign briefing
-        _roleSystem.MindAddRole(mindId, new RoleBriefingComponent
+        //Since this provides neither an antag/job prototype, nor antag status/roletype,
+        //and is intrinsically related to the traitor role
+        //it does not need to be a separate Mind Role Entity
+        _roleSystem.MindHasRole<TraitorRoleComponent>(mindId, out var traitorRole);
+        if (traitorRole is not null)
         {
-            Briefing = briefing
-        }, mind, true);
+            AddComp<RoleBriefingComponent>(traitorRole.Value.Owner);
+            Comp<RoleBriefingComponent>(traitorRole.Value.Owner).Briefing = briefing;
+        }
 
         // Send codewords to only the traitor client
         var color = TraitorCodewordColor; // Fall back to a dark red Syndicate color if a prototype is not found
diff --git a/Content.Server/GameTicking/Rules/ZombieRuleSystem.cs b/Content.Server/GameTicking/Rules/ZombieRuleSystem.cs
index 6c96bfd18c..c967edac22 100644
--- a/Content.Server/GameTicking/Rules/ZombieRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/ZombieRuleSystem.cs
@@ -3,6 +3,7 @@
 using Content.Server.Chat.Systems;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Popups;
+using Content.Server.Roles;
 using Content.Server.RoundEnd;
 using Content.Server.Station.Components;
 using Content.Server.Station.Systems;
@@ -13,6 +14,7 @@
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
+using Content.Shared.Roles;
 using Content.Shared.Zombies;
 using Robust.Shared.Player;
 using Robust.Shared.Timing;
@@ -22,26 +24,42 @@ namespace Content.Server.GameTicking.Rules;
 
 public sealed class ZombieRuleSystem : GameRuleSystem<ZombieRuleComponent>
 {
+    [Dependency] private readonly AntagSelectionSystem _antag = default!;
     [Dependency] private readonly ChatSystem _chat = default!;
-    [Dependency] private readonly RoundEndSystem _roundEnd = default!;
-    [Dependency] private readonly PopupSystem _popup = default!;
-    [Dependency] private readonly MobStateSystem _mobState = default!;
-    [Dependency] private readonly ZombieSystem _zombie = default!;
     [Dependency] private readonly SharedMindSystem _mindSystem = default!;
+    [Dependency] private readonly MobStateSystem _mobState = default!;
+    [Dependency] private readonly PopupSystem _popup = default!;
+    [Dependency] private readonly SharedRoleSystem _roles = default!;
+    [Dependency] private readonly RoundEndSystem _roundEnd = default!;
     [Dependency] private readonly StationSystem _station = default!;
-    [Dependency] private readonly AntagSelectionSystem _antag = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly AnnouncerSystem _announcer = default!;
     [Dependency] private readonly GameTicker _gameTicker = default!;
+    [Dependency] private readonly ZombieSystem _zombie = default!;
 
     public override void Initialize()
     {
         base.Initialize();
 
+        SubscribeLocalEvent<InitialInfectedRoleComponent, GetBriefingEvent>(OnGetBriefing);
+        SubscribeLocalEvent<ZombieRoleComponent, GetBriefingEvent>(OnGetBriefing);
         SubscribeLocalEvent<IncurableZombieComponent, ZombifySelfActionEvent>(OnZombifySelf);
     }
 
-    protected override void AppendRoundEndText(EntityUid uid, ZombieRuleComponent component, GameRuleComponent gameRule,
+    private void OnGetBriefing(Entity<InitialInfectedRoleComponent> role, ref GetBriefingEvent args)
+    {
+        if (!_roles.MindHasRole<ZombieRoleComponent>(args.Mind.Owner))
+            args.Append(Loc.GetString("zombie-patientzero-role-greeting"));
+    }
+
+    private void OnGetBriefing(Entity<ZombieRoleComponent> role, ref GetBriefingEvent args)
+    {
+        args.Append(Loc.GetString("zombie-infection-greeting"));
+    }
+
+    protected override void AppendRoundEndText(EntityUid uid,
+        ZombieRuleComponent component,
+        GameRuleComponent gameRule,
         ref RoundEndTextAppendEvent args)
     {
         base.AppendRoundEndText(uid, component, gameRule, ref args);
diff --git a/Content.Server/Ghost/Roles/GhostRoleMarkerRoleComponent.cs b/Content.Server/Ghost/Roles/GhostRoleMarkerRoleComponent.cs
index bd276e6df7..3dfa37a6b1 100644
--- a/Content.Server/Ghost/Roles/GhostRoleMarkerRoleComponent.cs
+++ b/Content.Server/Ghost/Roles/GhostRoleMarkerRoleComponent.cs
@@ -1,11 +1,13 @@
-namespace Content.Server.Ghost.Roles;
+using Content.Shared.Roles;
+
+namespace Content.Server.Ghost.Roles;
 
 /// <summary>
 /// This is used for round end display of ghost roles.
 /// It may also be used to ensure some ghost roles count as antagonists in future.
 /// </summary>
 [RegisterComponent]
-public sealed partial class GhostRoleMarkerRoleComponent : Component
+public sealed partial class GhostRoleMarkerRoleComponent : BaseMindRoleComponent
 {
     [DataField("name")] public string? Name;
 }
diff --git a/Content.Server/Ghost/Roles/GhostRoleSystem.cs b/Content.Server/Ghost/Roles/GhostRoleSystem.cs
index 346cb64ea8..40a937e17c 100644
--- a/Content.Server/Ghost/Roles/GhostRoleSystem.cs
+++ b/Content.Server/Ghost/Roles/GhostRoleSystem.cs
@@ -504,7 +504,12 @@ public void GhostRoleInternalCreateMindAndTransfer(ICommonSession player, Entity
 
             var newMind = _mindSystem.CreateMind(player.UserId,
                 EntityManager.GetComponent<MetaDataComponent>(mob).EntityName);
-            _roleSystem.MindAddRole(newMind, new GhostRoleMarkerRoleComponent { Name = role.RoleName });
+
+            _roleSystem.MindAddRole(newMind, "MindRoleGhostMarker");
+
+            if (_roleSystem.MindHasRole<GhostRoleMarkerRoleComponent>(newMind, out _, out var markerRole)
+                && markerRole is not null)
+                markerRole.Value.Comp.Name = role.RoleName;
 
             _mindSystem.SetUserId(newMind, player.UserId);
             _mindSystem.TransferTo(newMind, mob);
diff --git a/Content.Server/IoC/ServerContentIoC.cs b/Content.Server/IoC/ServerContentIoC.cs
index 4a4fbc709b..0f29803e91 100644
--- a/Content.Server/IoC/ServerContentIoC.cs
+++ b/Content.Server/IoC/ServerContentIoC.cs
@@ -17,8 +17,6 @@
 using Content.Server.Players.JobWhitelist;
 using Content.Server.MoMMI;
 using Content.Server.NodeContainer.NodeGroups;
-using Content.Server.Players;
-using Content.Server.Players.JobWhitelist;
 using Content.Server.Players.PlayTimeTracking;
 using Content.Server.Players.RateLimiting;
 using Content.Server.Preferences.Managers;
diff --git a/Content.Server/Mind/Commands/MindInfoCommand.cs b/Content.Server/Mind/Commands/MindInfoCommand.cs
index d4961b82db..c365702a31 100644
--- a/Content.Server/Mind/Commands/MindInfoCommand.cs
+++ b/Content.Server/Mind/Commands/MindInfoCommand.cs
@@ -43,7 +43,7 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
             builder.AppendFormat("player: {0}, mob: {1}\nroles: ", mind.UserId, mind.OwnedEntity);
 
             var roles = _entities.System<SharedRoleSystem>();
-            foreach (var role in roles.MindGetAllRoles(mindId))
+            foreach (var role in roles.MindGetAllRoleInfo(mindId))
             {
                 builder.AppendFormat("{0} ", role.Name);
             }
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/PickNearbyServicableHydroponicsTrayOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/PickNearbyServicableHydroponicsTrayOperator.cs
new file mode 100644
index 0000000000..fe7aeec169
--- /dev/null
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/PickNearbyServicableHydroponicsTrayOperator.cs
@@ -0,0 +1,81 @@
+using System.Threading;
+using System.Threading.Tasks;
+using Content.Server.Botany.Components;
+using Content.Server.NPC.Pathfinding;
+using Content.Shared.Emag.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Silicons.Bots;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Specific;
+
+public sealed partial class PickNearbyServicableHydroponicsTrayOperator : HTNOperator
+{
+    [Dependency] private readonly IEntityManager _entManager = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+
+    private EntityLookupSystem _lookup = default!;
+    private PathfindingSystem _pathfinding = default!;
+
+    /// <summary>
+    /// Determines how close the bot needs to be to service a tray
+    /// </summary>
+    [DataField] public string RangeKey = NPCBlackboard.PlantbotServiceRange;
+
+    /// <summary>
+    /// Target entity to service
+    /// </summary>
+    [DataField(required: true)]
+    public string TargetKey = string.Empty;
+
+    /// <summary>
+    /// Target entitycoordinates to move to.
+    /// </summary>
+    [DataField(required: true)]
+    public string TargetMoveKey = string.Empty;
+
+    public override void Initialize(IEntitySystemManager sysManager)
+    {
+        base.Initialize(sysManager);
+
+        _lookup = sysManager.GetEntitySystem<EntityLookupSystem>();
+        _pathfinding = sysManager.GetEntitySystem<PathfindingSystem>();
+    }
+
+    public override async Task<(bool Valid, Dictionary<string, object>? Effects)> Plan(NPCBlackboard blackboard,
+        CancellationToken cancelToken)
+    {
+        var owner = blackboard.GetValue<EntityUid>(NPCBlackboard.Owner);
+
+        if (!blackboard.TryGetValue<float>(RangeKey, out var range, _entManager) || !_entManager.TryGetComponent<PlantbotComponent>(owner, out _))
+            return (false, null);
+
+        var entityQuery = _entManager.GetEntityQuery<PlantHolderComponent>();
+        var emagged = _entManager.HasComponent<EmaggedComponent>(owner);
+
+        foreach (var target in _lookup.GetEntitiesInRange(owner, range))
+        {
+            if (!entityQuery.TryGetComponent(target, out var plantHolderComponent))
+                continue;
+
+            if (plantHolderComponent is { WaterLevel: >= PlantbotServiceOperator.RequiredWaterLevelToService, WeedLevel: <= PlantbotServiceOperator.RequiredWeedsAmountToWeed } && (!emagged || plantHolderComponent.Dead || plantHolderComponent.WaterLevel <= 0f))
+                continue;
+
+            //Needed to make sure it doesn't sometimes stop right outside it's interaction range
+            var pathRange = SharedInteractionSystem.InteractionRange - 1f;
+            var path = await _pathfinding.GetPath(owner, target, pathRange, cancelToken);
+
+            if (path.Result == PathResult.NoPath)
+                continue;
+
+            return (true, new Dictionary<string, object>()
+            {
+                {TargetKey, target},
+                {TargetMoveKey, _entManager.GetComponent<TransformComponent>(target).Coordinates},
+                {NPCBlackboard.PathfindKey, path},
+            });
+        }
+
+        return (false, null);
+    }
+}
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/PickNearbyWeldableOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/PickNearbyWeldableOperator.cs
index 020a3d73ec..e417a03fb6 100644
--- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/PickNearbyWeldableOperator.cs
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/PickNearbyWeldableOperator.cs
@@ -58,13 +58,24 @@ public override void Initialize(IEntitySystemManager sysManager)
             if (!damageQuery.TryGetComponent(target, out var damage))
                 continue;
 
-            var tagPrototype = _prototypeManager.Index<TagPrototype>(WeldbotWeldOperator.SiliconTag);
+            var tagSiliconMobPrototype = _prototypeManager.Index<TagPrototype>(WeldbotWeldOperator.SiliconTag);
+            var tagWeldFixableStructurePrototype = _prototypeManager.Index<TagPrototype>(WeldbotWeldOperator.WeldotFixableStructureTag);
 
-            if (!_entManager.TryGetComponent<TagComponent>(target, out var tagComponent) || !_tagSystem.HasTag(tagComponent, tagPrototype) || !emagged && damage.DamagePerGroup["Brute"].Value == 0)
+            if (!_entManager.TryGetComponent<TagComponent>(target, out var tagComponent))
                 continue;
 
-            //Needed to make sure it doesn't sometimes stop right outside it's interaction range
-            var pathRange = SharedInteractionSystem.InteractionRange - 1f;
+            var canWeldSiliconMob = _tagSystem.HasTag(tagComponent, tagSiliconMobPrototype) && (emagged || damage.DamagePerGroup["Brute"].Value > 0);
+            var canWeldStructure = _tagSystem.HasTag(tagComponent, tagWeldFixableStructurePrototype) && damage.TotalDamage.Value > 0;
+
+            if(!canWeldSiliconMob && !canWeldStructure)
+                continue;
+
+            var pathRange = SharedInteractionSystem.InteractionRange;
+
+            //Needed to make sure it doesn't sometimes stop right outside its interaction range, in case of a mob.
+            if (canWeldSiliconMob)
+                pathRange--;
+
             var path = await _pathfinding.GetPath(owner, target, pathRange, cancelToken);
 
             if (path.Result == PathResult.NoPath)
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/PlantBotServiceOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/PlantBotServiceOperator.cs
new file mode 100644
index 0000000000..1d7adc4d7d
--- /dev/null
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/PlantBotServiceOperator.cs
@@ -0,0 +1,96 @@
+using Content.Server.Botany.Components;
+using Content.Server.Botany.Systems;
+using Content.Server.Chat.Systems;
+using Content.Shared.Chat;
+using Content.Shared.Damage;
+using Content.Shared.Emag.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Popups;
+using Content.Shared.Silicons.Bots;
+using Content.Shared.Tag;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Specific;
+
+public sealed partial class PlantbotServiceOperator : HTNOperator
+{
+    [Dependency] private readonly IEntityManager _entMan = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+
+    private ChatSystem _chat = default!;
+    private SharedAudioSystem _audio = default!;
+    private SharedInteractionSystem _interaction = default!;
+    private SharedPopupSystem _popup = default!;
+    private PlantHolderSystem _plantHolderSystem = default!;
+    private DamageableSystem _damageableSystem = default!;
+    private TagSystem _tagSystem = default!;
+
+    public const float RequiredWaterLevelToService = 80f;
+    public const float RequiredWeedsAmountToWeed = 1f;
+    public const float WaterTransferAmount = 10f;
+    public const float WeedsRemovedAmount = 1f;
+    public const string SiliconTag = "SiliconMob";
+
+    /// <summary>
+    /// Target entity to inject.
+    /// </summary>
+    [DataField(required: true)]
+    public string TargetKey = string.Empty;
+
+    public override void Initialize(IEntitySystemManager sysManager)
+    {
+        base.Initialize(sysManager);
+
+        _chat = sysManager.GetEntitySystem<ChatSystem>();
+        _audio = sysManager.GetEntitySystem<SharedAudioSystem>();
+        _interaction = sysManager.GetEntitySystem<SharedInteractionSystem>();
+        _popup = sysManager.GetEntitySystem<SharedPopupSystem>();
+        _plantHolderSystem = sysManager.GetEntitySystem<PlantHolderSystem>();
+    }
+
+    public override void TaskShutdown(NPCBlackboard blackboard, HTNOperatorStatus status)
+    {
+        base.TaskShutdown(blackboard, status);
+        blackboard.Remove<EntityUid>(TargetKey);
+    }
+
+    public override HTNOperatorStatus Update(NPCBlackboard blackboard, float frameTime)
+    {
+        var owner = blackboard.GetValue<EntityUid>(NPCBlackboard.Owner);
+
+        if (!blackboard.TryGetValue<EntityUid>(TargetKey, out var target, _entMan) || _entMan.Deleted(target))
+            return HTNOperatorStatus.Failed;
+
+        if (!_entMan.TryGetComponent<PlantbotComponent>(owner, out var botComp)
+            || !_entMan.TryGetComponent<PlantHolderComponent>(target, out var plantHolderComponent)
+            || !_interaction.InRangeUnobstructed(owner, target)
+            || (plantHolderComponent is { WaterLevel: >= RequiredWaterLevelToService, WeedLevel: <= RequiredWeedsAmountToWeed } && (!_entMan.HasComponent<EmaggedComponent>(owner) || plantHolderComponent.Dead || plantHolderComponent.WaterLevel <= 0f)))
+            return HTNOperatorStatus.Failed;
+
+        if (botComp.IsEmagged)
+        {
+            _plantHolderSystem.AdjustWater(target, -WaterTransferAmount);
+            _audio.PlayPvs(botComp.RemoveWaterSound, target);
+        }
+        else
+        {
+            if (plantHolderComponent.WaterLevel <= RequiredWaterLevelToService)
+            {
+                _plantHolderSystem.AdjustWater(target, 10);
+                _audio.PlayPvs(botComp.WaterSound, target);
+                _chat.TrySendInGameICMessage(owner, Loc.GetString("plantbot-add-water"), InGameICChatType.Speak, hideChat: true, hideLog: true);
+            }
+            else if (plantHolderComponent.WeedLevel >= RequiredWeedsAmountToWeed)
+            {
+                plantHolderComponent.WeedLevel -= WeedsRemovedAmount;
+                _audio.PlayPvs(botComp.WeedSound, target);
+                _chat.TrySendInGameICMessage(owner, Loc.GetString("plantbot-remove-weeds"), InGameICChatType.Speak, hideChat: true, hideLog: true);
+            }
+            else
+                return HTNOperatorStatus.Failed;
+        }
+
+        return HTNOperatorStatus.Finished;
+    }
+}
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/WeldbotWeldOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/WeldbotWeldOperator.cs
index be5b983fb3..96e22274b5 100644
--- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/WeldbotWeldOperator.cs
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/WeldbotWeldOperator.cs
@@ -25,6 +25,11 @@ public sealed partial class WeldbotWeldOperator : HTNOperator
     private TagSystem _tagSystem = default!;
 
     public const string SiliconTag = "SiliconMob";
+    public const string WeldotFixableStructureTag = "WeldbotFixableStructure";
+
+    public const float EmaggedBurnDamage = 10;
+    public const float SiliconRepairAmount = 30;
+    public const float StructureRepairAmount = 5;
 
     /// <summary>
     /// Target entity to inject.
@@ -57,33 +62,58 @@ public override HTNOperatorStatus Update(NPCBlackboard blackboard, float frameTi
         if (!blackboard.TryGetValue<EntityUid>(TargetKey, out var target, _entMan) || _entMan.Deleted(target))
             return HTNOperatorStatus.Failed;
 
-        var tagPrototype = _prototypeManager.Index<TagPrototype>(SiliconTag);
+        var tagSiliconMobPrototype = _prototypeManager.Index<TagPrototype>(SiliconTag);
+        var tagWeldFixableStructurePrototype = _prototypeManager.Index<TagPrototype>(WeldotFixableStructureTag);
+
+        if(!_entMan.TryGetComponent<TagComponent>(target, out var tagComponent))
+            return HTNOperatorStatus.Failed;
+
+        var weldableIsSilicon = _tagSystem.HasTag(tagComponent, tagSiliconMobPrototype);
+        var weldableIsStructure = _tagSystem.HasTag(tagComponent, tagWeldFixableStructurePrototype);
 
-        if (!_entMan.TryGetComponent<TagComponent>(target, out var tagComponent) || !_tagSystem.HasTag(tagComponent, tagPrototype)
+        if ((!weldableIsSilicon && !weldableIsStructure)
             || !_entMan.TryGetComponent<WeldbotComponent>(owner, out var botComp)
             || !_entMan.TryGetComponent<DamageableComponent>(target, out var damage)
-            || !_interaction.InRangeUnobstructed(owner, target)
-            || (damage.DamagePerGroup["Brute"].Value == 0 && !_entMan.HasComponent<EmaggedComponent>(owner)))
+            || !_interaction.InRangeUnobstructed(owner, target))
+            return HTNOperatorStatus.Failed;
+
+        var canWeldSilicon = damage.DamagePerGroup["Brute"].Value > 0  || _entMan.HasComponent<EmaggedComponent>(owner);
+        var canWeldStructure = damage.TotalDamage.Value > 0;
+
+        if ((!canWeldSilicon && weldableIsSilicon) || (!canWeldStructure && weldableIsStructure))
             return HTNOperatorStatus.Failed;
 
         if (botComp.IsEmagged)
         {
-            if (!_prototypeManager.TryIndex<DamageGroupPrototype>("Burn", out var prototype))
+            if (!_prototypeManager.TryIndex<DamageGroupPrototype>("Burn", out var prototype) || weldableIsStructure)
                 return HTNOperatorStatus.Failed;
 
-            _damageableSystem.TryChangeDamage(target, new DamageSpecifier(prototype, 10), true, false, damage);
+            _damageableSystem.TryChangeDamage(target, new DamageSpecifier(prototype, EmaggedBurnDamage), true, false, damage);
         }
         else
         {
-            if (!_prototypeManager.TryIndex<DamageGroupPrototype>("Brute", out var prototype))
+            if (weldableIsSilicon)
+            {
+                if (!_prototypeManager.TryIndex<DamageGroupPrototype>("Brute", out var prototype))
+                    return HTNOperatorStatus.Failed;
+
+                _damageableSystem.TryChangeDamage(target, new DamageSpecifier(prototype, -SiliconRepairAmount), true, false, damage);
+            }
+            else if (weldableIsStructure)
+            {
+                //If a structure explicitly has a tag to allow a Weldbot to fix it, trust that we can just do so no matter what the damage actually is.
+                _damageableSystem.ChangeAllDamage(target, damage, -StructureRepairAmount);
+            }
+            else
+            {
                 return HTNOperatorStatus.Failed;
-
-            _damageableSystem.TryChangeDamage(target, new DamageSpecifier(prototype, -50), true, false, damage);
+            }
         }
 
         _audio.PlayPvs(botComp.WeldSound, target);
 
-        if(damage.DamagePerGroup["Brute"].Value == 0) //only say "all done if we're actually done!"
+        if((weldableIsSilicon && damage.DamagePerGroup["Brute"].Value == 0)
+            || (weldableIsStructure && damage.TotalDamage.Value == 0)) //only say "all done if we're actually done!"
             _chat.TrySendInGameICMessage(owner, Loc.GetString("weldbot-finish-weld"), InGameICChatType.Speak, hideChat: true, hideLog: true);
 
         return HTNOperatorStatus.Finished;
diff --git a/Content.Server/NPC/NPCBlackboard.cs b/Content.Server/NPC/NPCBlackboard.cs
index a3371f6768..6b6ae9b069 100644
--- a/Content.Server/NPC/NPCBlackboard.cs
+++ b/Content.Server/NPC/NPCBlackboard.cs
@@ -27,6 +27,7 @@ public sealed partial class NPCBlackboard : IEnumerable<KeyValuePair<string, obj
         {"MaximumIdleTime", 7f},
         {MedibotInjectRange, 4f},
         {WeldbotWeldRange, 4f},
+        {PlantbotServiceRange, 4f},
         {MeleeMissChance, 0.3f},
         {"MeleeRange", 1f},
         {"MinimumIdleTime", 2f},
@@ -294,6 +295,7 @@ public string GetVisionRadiusKey(IEntityManager entMan)
     public const string Inventory = "Inventory";
     public const string MedibotInjectRange = "MedibotInjectRange";
     public const string WeldbotWeldRange = "WeldbotWeldRange";
+    public const string PlantbotServiceRange = "PlantbotServiceRange";
 
     public const string MeleeMissChance = "MeleeMissChance";
 
diff --git a/Content.Server/Objectives/Commands/ListObjectivesCommand.cs b/Content.Server/Objectives/Commands/ListObjectivesCommand.cs
index 97fc943269..88dcdcedf6 100644
--- a/Content.Server/Objectives/Commands/ListObjectivesCommand.cs
+++ b/Content.Server/Objectives/Commands/ListObjectivesCommand.cs
@@ -33,7 +33,7 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args)
             }
 
             shell.WriteLine($"Objectives for player {player.UserId}:");
-            var objectives = mind.AllObjectives.ToList();
+            var objectives = mind.Objectives.ToList();
             if (objectives.Count == 0)
             {
                 shell.WriteLine("None.");
diff --git a/Content.Server/Objectives/Systems/HelpProgressConditionSystem.cs b/Content.Server/Objectives/Systems/HelpProgressConditionSystem.cs
index e4455c0381..e0a56149b3 100644
--- a/Content.Server/Objectives/Systems/HelpProgressConditionSystem.cs
+++ b/Content.Server/Objectives/Systems/HelpProgressConditionSystem.cs
@@ -59,7 +59,7 @@ private void OnTraitorAssigned(EntityUid uid, RandomTraitorProgressComponent com
             if (!TryComp<MindComponent>(traitor, out var mind))
                 continue;
 
-            foreach (var objective in mind.AllObjectives)
+            foreach (var objective in mind.Objectives)
             {
                 if (HasComp<HelpProgressConditionComponent>(objective))
                     removeList.Add(traitor);
@@ -88,7 +88,7 @@ private float GetProgress(EntityUid target)
 
         if (TryComp<MindComponent>(target, out var mind))
         {
-            foreach (var objective in mind.AllObjectives)
+            foreach (var objective in mind.Objectives)
             {
                 // this has the potential to loop forever, anything setting target has to check that there is no HelpProgressCondition.
                 var info = _objectives.GetInfo(objective, target, mind);
diff --git a/Content.Server/Objectives/Systems/KillPersonConditionSystem.cs b/Content.Server/Objectives/Systems/KillPersonConditionSystem.cs
index 7afc74af4d..71d438698f 100644
--- a/Content.Server/Objectives/Systems/KillPersonConditionSystem.cs
+++ b/Content.Server/Objectives/Systems/KillPersonConditionSystem.cs
@@ -90,7 +90,7 @@ private void OnHeadAssigned(EntityUid uid, PickRandomHeadComponent comp, ref Obj
         foreach (var mind in allHumans)
         {
             // RequireAdminNotify used as a cheap way to check for command department
-            if (_job.MindTryGetJob(mind, out _, out var prototype) && prototype.RequireAdminNotify)
+            if (_job.MindTryGetJob(mind, out var prototype) && prototype.RequireAdminNotify)
                 allHeads.Add(mind);
         }
 
diff --git a/Content.Server/Objectives/Systems/NinjaConditionsSystem.cs b/Content.Server/Objectives/Systems/NinjaConditionsSystem.cs
index 47c54b937a..ee99658f66 100644
--- a/Content.Server/Objectives/Systems/NinjaConditionsSystem.cs
+++ b/Content.Server/Objectives/Systems/NinjaConditionsSystem.cs
@@ -1,9 +1,10 @@
 using Content.Server.Objectives.Components;
+using Content.Server.Roles;
 using Content.Server.Warps;
 using Content.Shared.Objectives.Components;
 using Content.Shared.Ninja.Components;
+using Content.Shared.Roles;
 using Robust.Shared.Random;
-using Content.Server.Roles;
 
 namespace Content.Server.Objectives.Systems;
 
@@ -16,6 +17,7 @@ public sealed class NinjaConditionsSystem : EntitySystem
     [Dependency] private readonly MetaDataSystem _metaData = default!;
     [Dependency] private readonly NumberObjectiveSystem _number = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly SharedRoleSystem _roles = default!;
 
     public override void Initialize()
     {
@@ -46,10 +48,8 @@ private float DoorjackProgress(DoorjackConditionComponent comp, int target)
     // spider charge
     private void OnSpiderChargeRequirementCheck(EntityUid uid, SpiderChargeConditionComponent comp, ref RequirementCheckEvent args)
     {
-        if (args.Cancelled || !HasComp<NinjaRoleComponent>(args.MindId))
-        {
+        if (args.Cancelled || !_roles.MindHasRole<NinjaRoleComponent>(args.MindId))
             return;
-        }
 
         // choose spider charge detonation point
         var warps = new List<EntityUid>();
diff --git a/Content.Server/Objectives/Systems/NotCommandRequirementSystem.cs b/Content.Server/Objectives/Systems/NotCommandRequirementSystem.cs
index e63492bb5e..50d747c1a2 100644
--- a/Content.Server/Objectives/Systems/NotCommandRequirementSystem.cs
+++ b/Content.Server/Objectives/Systems/NotCommandRequirementSystem.cs
@@ -21,7 +21,7 @@ private void OnCheck(EntityUid uid, NotCommandRequirementComponent comp, ref Req
             return;
 
         // cheap equivalent to checking that job department is command, since all command members require admin notification when leaving
-        if (_job.MindTryGetJob(args.MindId, out _, out var prototype) && prototype.RequireAdminNotify)
+        if (_job.MindTryGetJob(args.MindId, out var prototype) && prototype.RequireAdminNotify)
             args.Cancelled = true;
     }
 }
diff --git a/Content.Server/Objectives/Systems/NotJobRequirementSystem.cs b/Content.Server/Objectives/Systems/NotJobRequirementSystem.cs
index 5c2b040463..ac7e579c38 100644
--- a/Content.Server/Objectives/Systems/NotJobRequirementSystem.cs
+++ b/Content.Server/Objectives/Systems/NotJobRequirementSystem.cs
@@ -8,6 +8,8 @@ namespace Content.Server.Objectives.Systems;
 /// </summary>
 public sealed class NotJobRequirementSystem : EntitySystem
 {
+    [Dependency] private readonly SharedJobSystem _jobs = default!;
+
     public override void Initialize()
     {
         base.Initialize();
@@ -20,11 +22,10 @@ private void OnCheck(EntityUid uid, NotJobRequirementComponent comp, ref Require
         if (args.Cancelled)
             return;
 
-        // if player has no job then don't care
-        if (!TryComp<JobComponent>(args.MindId, out var job))
-            return;
+        _jobs.MindTryGetJob(args.MindId, out var proto);
 
-        if (job.Prototype == comp.Job)
+        // if player has no job then don't care
+        if (proto is not null && proto.ID == comp.Job)
             args.Cancelled = true;
     }
 }
diff --git a/Content.Server/Objectives/Systems/ObjectiveBlacklistRequirementSystem.cs b/Content.Server/Objectives/Systems/ObjectiveBlacklistRequirementSystem.cs
index 8fe7e7e203..0671c6b67e 100644
--- a/Content.Server/Objectives/Systems/ObjectiveBlacklistRequirementSystem.cs
+++ b/Content.Server/Objectives/Systems/ObjectiveBlacklistRequirementSystem.cs
@@ -23,7 +23,7 @@ private void OnCheck(EntityUid uid, ObjectiveBlacklistRequirementComponent comp,
         if (args.Cancelled)
             return;
 
-        foreach (var objective in args.Mind.AllObjectives)
+        foreach (var objective in args.Mind.Objectives)
         {
             if (_whitelistSystem.IsBlacklistPass(comp.Blacklist, objective))
             {
diff --git a/Content.Server/Objectives/Systems/RoleRequirementSystem.cs b/Content.Server/Objectives/Systems/RoleRequirementSystem.cs
index 8421987bae..83d4c2ea4c 100644
--- a/Content.Server/Objectives/Systems/RoleRequirementSystem.cs
+++ b/Content.Server/Objectives/Systems/RoleRequirementSystem.cs
@@ -22,8 +22,6 @@ private void OnCheck(EntityUid uid, RoleRequirementComponent comp, ref Requireme
         if (args.Cancelled)
             return;
 
-        // this whitelist trick only works because roles are components on the mind and not entities
-        // if that gets reworked then this will need changing
         if (_whitelistSystem.IsWhitelistFail(comp.Roles, args.MindId))
             args.Cancelled = true;
     }
diff --git a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
index ba7b9f3c37..387ee9c309 100644
--- a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
+++ b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
@@ -31,17 +31,16 @@ namespace Content.Server.Players.PlayTimeTracking;
 /// </summary>
 public sealed class PlayTimeTrackingSystem : EntitySystem
 {
+    [Dependency] private readonly IAdminManager _adminManager = default!;
     [Dependency] private readonly IAfkManager _afk = default!;
-    [Dependency] private readonly IPlayerManager _playerManager = default!;
-    [Dependency] private readonly IPrototypeManager _prototypes = default!;
     [Dependency] private readonly IConfigurationManager _cfg = default!;
     [Dependency] private readonly MindSystem _minds = default!;
     [Dependency] private readonly PlayTimeTrackingManager _tracking = default!;
-    [Dependency] private readonly IAdminManager _adminManager = default!;
     [Dependency] private readonly CharacterRequirementsSystem _characterRequirements = default!;
     [Dependency] private readonly IServerPreferencesManager _prefs = default!;
-    [Dependency] private readonly IConfigurationManager _config = default!;
-
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
+    [Dependency] private readonly IPrototypeManager _prototypes = default!;
+    [Dependency] private readonly SharedRoleSystem _roles = default!;
 
     public override void Initialize()
     {
@@ -105,10 +104,7 @@ private bool IsPlayerAlive(ICommonSession session)
 
     public IEnumerable<string> GetTimedRoles(EntityUid mindId)
     {
-        var ev = new MindGetAllRolesEvent(new List<RoleInfo>());
-        RaiseLocalEvent(mindId, ref ev);
-
-        foreach (var role in ev.Roles)
+        foreach (var role in _roles.MindGetAllRoleInfo(mindId))
         {
             if (string.IsNullOrWhiteSpace(role.PlayTimeTrackerId))
                 continue;
@@ -226,7 +222,7 @@ public bool IsAllowed(ICommonSession player, string role)
             job,
             EntityManager,
             _prototypes,
-            _config,
+            _cfg,
             out _);
     }
 
@@ -257,7 +253,7 @@ public HashSet<ProtoId<JobPrototype>> GetDisallowedJobs(ICommonSession player)
                         job,
                         EntityManager,
                         _prototypes,
-                        _config,
+                        _cfg,
                         out _))
                     continue;
 
@@ -304,7 +300,7 @@ public void RemoveDisallowedJobs(NetUserId userId, List<ProtoId<JobPrototype>> j
                 jobber,
                 EntityManager,
                 _prototypes,
-                _config,
+                _cfg,
                 out _))
             {
                 jobs.RemoveSwap(i);
diff --git a/Content.Server/Revolutionary/Components/CommandStaffComponent.cs b/Content.Server/Revolutionary/Components/CommandStaffComponent.cs
index d7395bf16e..14a73c8fd5 100644
--- a/Content.Server/Revolutionary/Components/CommandStaffComponent.cs
+++ b/Content.Server/Revolutionary/Components/CommandStaffComponent.cs
@@ -11,3 +11,5 @@ public sealed partial class CommandStaffComponent : Component
     public float PsionicBonusModifier = 1;
     public float PsionicBonusOffset = 0.25f;
 }
+
+//TODO this should probably be on a mind role, not the mob
diff --git a/Content.Server/Roles/DragonRoleComponent.cs b/Content.Server/Roles/DragonRoleComponent.cs
index b85fd53eb0..c47455d8f6 100644
--- a/Content.Server/Roles/DragonRoleComponent.cs
+++ b/Content.Server/Roles/DragonRoleComponent.cs
@@ -4,9 +4,9 @@
 namespace Content.Server.Roles;
 
 /// <summary>
-/// Role used to keep track of space dragons for antag purposes.
+///     Added to mind role entities to tag that they are a space dragon.
 /// </summary>
-[RegisterComponent, Access(typeof(DragonSystem)), ExclusiveAntagonist]
-public sealed partial class DragonRoleComponent : AntagonistRoleComponent
+[RegisterComponent, Access(typeof(DragonSystem))]
+public sealed partial class DragonRoleComponent : BaseMindRoleComponent
 {
 }
diff --git a/Content.Server/Roles/InitialInfectedRoleComponent.cs b/Content.Server/Roles/InitialInfectedRoleComponent.cs
index 52d3db4164..475cd3ba60 100644
--- a/Content.Server/Roles/InitialInfectedRoleComponent.cs
+++ b/Content.Server/Roles/InitialInfectedRoleComponent.cs
@@ -2,8 +2,11 @@
 
 namespace Content.Server.Roles;
 
-[RegisterComponent, ExclusiveAntagonist]
-public sealed partial class InitialInfectedRoleComponent : AntagonistRoleComponent
+/// <summary>
+///     Added to mind role entities to tag that they are an initial infected.
+/// </summary>
+[RegisterComponent]
+public sealed partial class InitialInfectedRoleComponent : BaseMindRoleComponent
 {
 
 }
diff --git a/Content.Server/Roles/Jobs/JobSystem.cs b/Content.Server/Roles/Jobs/JobSystem.cs
index 9f0dd7ae32..7e69d9d92b 100644
--- a/Content.Server/Roles/Jobs/JobSystem.cs
+++ b/Content.Server/Roles/Jobs/JobSystem.cs
@@ -30,7 +30,7 @@ private void MindOnDoGreeting(EntityUid mindId, MindComponent component, ref Min
         if (!_mind.TryGetSession(mindId, out var session))
             return;
 
-        if (!MindTryGetJob(mindId, out _, out var prototype))
+        if (!MindTryGetJob(mindId, out var prototype))
             return;
 
         _chat.DispatchServerMessage(session, Loc.GetString("job-greet-introduce-job-name",
@@ -47,6 +47,6 @@ public void MindAddJob(EntityUid mindId, string jobPrototypeId)
         if (MindHasJobWithId(mindId, jobPrototypeId))
             return;
 
-        _roles.MindAddRole(mindId, new JobComponent { Prototype = jobPrototypeId });
+        _roles.MindAddJobRole(mindId, null, false, jobPrototypeId);
     }
 }
diff --git a/Content.Server/Roles/NinjaRoleComponent.cs b/Content.Server/Roles/NinjaRoleComponent.cs
index cb60e5bdf0..7bdffe67a3 100644
--- a/Content.Server/Roles/NinjaRoleComponent.cs
+++ b/Content.Server/Roles/NinjaRoleComponent.cs
@@ -2,7 +2,10 @@
 
 namespace Content.Server.Roles;
 
-[RegisterComponent, ExclusiveAntagonist]
-public sealed partial class NinjaRoleComponent : AntagonistRoleComponent
+/// <summary>
+///     Added to mind role entities to tag that they are a space ninja.
+/// </summary>
+[RegisterComponent]
+public sealed partial class NinjaRoleComponent : BaseMindRoleComponent
 {
 }
diff --git a/Content.Server/Roles/NukeopsRoleComponent.cs b/Content.Server/Roles/NukeopsRoleComponent.cs
index a6ff0b71b0..41561088ea 100644
--- a/Content.Server/Roles/NukeopsRoleComponent.cs
+++ b/Content.Server/Roles/NukeopsRoleComponent.cs
@@ -3,9 +3,9 @@
 namespace Content.Server.Roles;
 
 /// <summary>
-///     Added to mind entities to tag that they are a nuke operative.
+///     Added to mind role entities to tag that they are a nuke operative.
 /// </summary>
-[RegisterComponent, ExclusiveAntagonist]
-public sealed partial class NukeopsRoleComponent : AntagonistRoleComponent
+[RegisterComponent]
+public sealed partial class NukeopsRoleComponent : BaseMindRoleComponent
 {
 }
diff --git a/Content.Server/Roles/RemoveRoleCommand.cs b/Content.Server/Roles/RemoveRoleCommand.cs
index feba63a253..fd4bb09317 100644
--- a/Content.Server/Roles/RemoveRoleCommand.cs
+++ b/Content.Server/Roles/RemoveRoleCommand.cs
@@ -45,7 +45,7 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
             var roles = _entityManager.System<SharedRoleSystem>();
             var jobs = _entityManager.System<SharedJobSystem>();
             if (jobs.MindHasJobWithId(mind, args[1]))
-                roles.MindRemoveRole<JobComponent>(mind.Value);
+                roles.MindTryRemoveRole<JobRoleComponent>(mind.Value);
         }
     }
 }
diff --git a/Content.Server/Roles/RevolutionaryRoleComponent.cs b/Content.Server/Roles/RevolutionaryRoleComponent.cs
index bf56b96008..dcdb131b9d 100644
--- a/Content.Server/Roles/RevolutionaryRoleComponent.cs
+++ b/Content.Server/Roles/RevolutionaryRoleComponent.cs
@@ -3,10 +3,10 @@
 namespace Content.Server.Roles;
 
 /// <summary>
-///     Added to mind entities to tag that they are a Revolutionary.
+///     Added to mind role entities to tag that they are a Revolutionary.
 /// </summary>
-[RegisterComponent, ExclusiveAntagonist]
-public sealed partial class RevolutionaryRoleComponent : AntagonistRoleComponent
+[RegisterComponent]
+public sealed partial class RevolutionaryRoleComponent : BaseMindRoleComponent
 {
     /// <summary>
     /// For headrevs, how many people you have converted.
diff --git a/Content.Server/Roles/RoleSystem.cs b/Content.Server/Roles/RoleSystem.cs
index c53fa1cf9e..333f4f9b60 100644
--- a/Content.Server/Roles/RoleSystem.cs
+++ b/Content.Server/Roles/RoleSystem.cs
@@ -1,32 +1,40 @@
+using Content.Shared.Mind;
 using Content.Shared.Roles;
 
 namespace Content.Server.Roles;
 
 public sealed class RoleSystem : SharedRoleSystem
 {
-    public override void Initialize()
-    {
-        // TODO make roles entities
-        base.Initialize();
-
-        SubscribeAntagEvents<DragonRoleComponent>();
-        SubscribeAntagEvents<InitialInfectedRoleComponent>();
-        SubscribeAntagEvents<NinjaRoleComponent>();
-        SubscribeAntagEvents<NukeopsRoleComponent>();
-        SubscribeAntagEvents<RevolutionaryRoleComponent>();
-        SubscribeAntagEvents<SubvertedSiliconRoleComponent>();
-        SubscribeAntagEvents<TraitorRoleComponent>();
-        SubscribeAntagEvents<ZombieRoleComponent>();
-        SubscribeAntagEvents<ThiefRoleComponent>();
-    }
-
     public string? MindGetBriefing(EntityUid? mindId)
     {
         if (mindId == null)
+        {
+            Log.Error($"MingGetBriefing failed for mind {mindId}");
+            return null;
+        }
+
+        TryComp<MindComponent>(mindId.Value, out var mindComp);
+
+        if (mindComp is null)
+        {
+            Log.Error($"MingGetBriefing failed for mind {mindId}");
             return null;
+        }
 
         var ev = new GetBriefingEvent();
-        RaiseLocalEvent(mindId.Value, ref ev);
+
+        // This is on the event because while this Entity<T> is also present on every Mind Role Entity's MindRoleComp
+        // getting to there from a GetBriefing event subscription can be somewhat boilerplate
+        // and this needs to be looked up for the event anyway so why calculate it again later
+        ev.Mind = (mindId.Value, mindComp);
+
+        // Briefing is no longer raised on the mind entity itself
+        // because all the components that briefings subscribe to should be on Mind Role Entities
+        foreach(var role in mindComp.MindRoles)
+        {
+            RaiseLocalEvent(role, ref ev);
+        }
+
         return ev.Briefing;
     }
 }
@@ -38,8 +46,16 @@ public override void Initialize()
 [ByRefEvent]
 public sealed class GetBriefingEvent
 {
+    /// <summary>
+    /// The text that will be shown on the Character Screen
+    /// </summary>
     public string? Briefing;
 
+    /// <summary>
+    /// The Mind to whose Mind Role Entities the briefing is sent to
+    /// </summary>
+    public Entity<MindComponent> Mind;
+
     public GetBriefingEvent(string? briefing = null)
     {
         Briefing = briefing;
diff --git a/Content.Server/Roles/SubvertedSiliconRoleComponent.cs b/Content.Server/Roles/SubvertedSiliconRoleComponent.cs
index 70056fbec9..55727573b9 100644
--- a/Content.Server/Roles/SubvertedSiliconRoleComponent.cs
+++ b/Content.Server/Roles/SubvertedSiliconRoleComponent.cs
@@ -2,7 +2,10 @@
 
 namespace Content.Server.Roles;
 
+/// <summary>
+///     Added to mind role entities to tag that they are a hacked borg.
+/// </summary>
 [RegisterComponent]
-public sealed partial class SubvertedSiliconRoleComponent : AntagonistRoleComponent
+public sealed partial class SubvertedSiliconRoleComponent : BaseMindRoleComponent
 {
 }
diff --git a/Content.Server/Roles/TerminatorRoleComponent.cs b/Content.Server/Roles/TerminatorRoleComponent.cs
index 31deb9fb82..f378c91a0a 100644
--- a/Content.Server/Roles/TerminatorRoleComponent.cs
+++ b/Content.Server/Roles/TerminatorRoleComponent.cs
@@ -2,7 +2,5 @@
 
 namespace Content.Server.Roles;
 
-[RegisterComponent, ExclusiveAntagonist]
-public sealed partial class TerminatorRoleComponent : AntagonistRoleComponent
-{
-}
+[RegisterComponent]
+public sealed partial class TerminatorRoleComponent : BaseMindRoleComponent;
diff --git a/Content.Server/Roles/ThiefRoleComponent.cs b/Content.Server/Roles/ThiefRoleComponent.cs
index 82e350ef63..c0ddee71a4 100644
--- a/Content.Server/Roles/ThiefRoleComponent.cs
+++ b/Content.Server/Roles/ThiefRoleComponent.cs
@@ -2,7 +2,10 @@
 
 namespace Content.Server.Roles;
 
+/// <summary>
+///     Added to mind role entities to tag that they are a thief.
+/// </summary>
 [RegisterComponent]
-public sealed partial class ThiefRoleComponent : AntagonistRoleComponent
+public sealed partial class ThiefRoleComponent : BaseMindRoleComponent
 {
 }
diff --git a/Content.Server/Roles/TraitorRoleComponent.cs b/Content.Server/Roles/TraitorRoleComponent.cs
index 96bfe8dd80..a8a11a8f1b 100644
--- a/Content.Server/Roles/TraitorRoleComponent.cs
+++ b/Content.Server/Roles/TraitorRoleComponent.cs
@@ -2,7 +2,10 @@
 
 namespace Content.Server.Roles;
 
-[RegisterComponent, ExclusiveAntagonist]
-public sealed partial class TraitorRoleComponent : AntagonistRoleComponent
+/// <summary>
+///     Added to mind role entities to tag that they are a syndicate traitor.
+/// </summary>
+[RegisterComponent]
+public sealed partial class TraitorRoleComponent : BaseMindRoleComponent
 {
 }
diff --git a/Content.Server/Roles/ZombieRoleComponent.cs b/Content.Server/Roles/ZombieRoleComponent.cs
index 2f9948022b..cff25e53e8 100644
--- a/Content.Server/Roles/ZombieRoleComponent.cs
+++ b/Content.Server/Roles/ZombieRoleComponent.cs
@@ -2,7 +2,10 @@
 
 namespace Content.Server.Roles;
 
-[RegisterComponent, ExclusiveAntagonist]
-public sealed partial class ZombieRoleComponent : AntagonistRoleComponent
+/// <summary>
+///     Added to mind role entities to tag that they are a zombie.
+/// </summary>
+[RegisterComponent]
+public sealed partial class ZombieRoleComponent : BaseMindRoleComponent
 {
 }
diff --git a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
index c6a9b57e47..3fdbaa4910 100644
--- a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
+++ b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
@@ -343,8 +343,7 @@ public void HandlePlayerSpawning(PlayerSpawningEvent ev)
             return;
 
         if (ev.Job is not null
-            && ev.Job.Prototype is not null
-            && _protoManager.Index<JobPrototype>(ev.Job.Prototype.Value.Id).AlwaysUseSpawner)
+            && _protoManager.Index<JobPrototype>(ev.Job).AlwaysUseSpawner)
             return;
 
         if (!HasComp<StationArrivalsComponent>(ev.Station))
diff --git a/Content.Server/Silicons/Laws/SiliconLawSystem.cs b/Content.Server/Silicons/Laws/SiliconLawSystem.cs
index 5175993e24..dd3436ccef 100644
--- a/Content.Server/Silicons/Laws/SiliconLawSystem.cs
+++ b/Content.Server/Silicons/Laws/SiliconLawSystem.cs
@@ -28,12 +28,12 @@ namespace Content.Server.Silicons.Laws;
 public sealed class SiliconLawSystem : SharedSiliconLawSystem
 {
     [Dependency] private readonly IChatManager _chatManager = default!;
-    [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] private readonly SharedMindSystem _mind = default!;
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
+    [Dependency] private readonly SharedRoleSystem _roles = default!;
     [Dependency] private readonly StationSystem _station = default!;
-    [Dependency] private readonly UserInterfaceSystem _userInterface = default!;
     [Dependency] private readonly SharedStunSystem _stunSystem = default!;
-    [Dependency] private readonly SharedRoleSystem _roles = default!;
+    [Dependency] private readonly UserInterfaceSystem _userInterface = default!;
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -178,10 +178,8 @@ private void EnsureEmaggedRole(EntityUid uid, EmagSiliconLawComponent component)
         if (component.AntagonistRole == null || !_mind.TryGetMind(uid, out var mindId, out _))
             return;
 
-        if (_roles.MindHasRole<SubvertedSiliconRoleComponent>(mindId))
-            return;
-
-        _roles.MindAddRole(mindId, new SubvertedSiliconRoleComponent { PrototypeId = component.AntagonistRole });
+        if (!_roles.MindHasRole<SubvertedSiliconRoleComponent>(mindId))
+            _roles.MindAddRole(mindId, "MindRoleSubvertedSilicon");
     }
 
     public SiliconLawset GetLaws(EntityUid uid, SiliconLawBoundComponent? component = null)
diff --git a/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs b/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
index 35ac28df84..edd287af6d 100644
--- a/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
@@ -37,6 +37,7 @@ public sealed class EventHorizonSystem : SharedEventHorizonSystem
     #endregion Dependencies
 
     private EntityQuery<PhysicsComponent> _physicsQuery;
+    private const float CosmicSpeedLimit = 20f;
 
     public override void Initialize()
     {
@@ -125,10 +126,12 @@ public void Update(EntityUid uid, EventHorizonComponent? eventHorizon = null, Tr
     /// </summary>
     public void ConsumeEntity(EntityUid hungry, EntityUid morsel, EventHorizonComponent eventHorizon, BaseContainer? outerContainer = null)
     {
-        if (!EntityManager.IsQueuedForDeletion(morsel) // I saw it log twice a few times for some reason?
-        && (HasComp<MindContainerComponent>(morsel)
+        if (EntityManager.IsQueuedForDeletion(morsel)) // already handled, and we're substepping
+            return;
+
+        if (HasComp<MindContainerComponent>(morsel)
             || _tagSystem.HasTag(morsel, "HighRiskItem")
-            || HasComp<ContainmentFieldGeneratorComponent>(morsel)))
+            || HasComp<ContainmentFieldGeneratorComponent>(morsel))
         {
             _adminLogger.Add(LogType.EntityDelete, LogImpact.Extreme, $"{ToPrettyString(morsel)} entered the event horizon of {ToPrettyString(hungry)} and was deleted");
         }
@@ -140,6 +143,9 @@ public void ConsumeEntity(EntityUid hungry, EntityUid morsel, EventHorizonCompon
             var impulse = (otherPhysics.LinearVelocity - thisPhysics.LinearVelocity)
                 * otherPhysics.FixturesMass
                 * thisPhysics.FixturesMass / (thisPhysics.FixturesMass + otherPhysics.FixturesMass); // Accounts for the expected mass change from consuming the object
+            if (impulse.Length() >= CosmicSpeedLimit) // Stop it from quantum tunneling through walls.
+                impulse = impulse.Normalized() * CosmicSpeedLimit;
+
             _physics.ApplyLinearImpulse(hungry, impulse, body: thisPhysics);
         }
 
diff --git a/Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs b/Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs
index fc96b8170f..e47d9eed19 100644
--- a/Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs
+++ b/Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs
@@ -36,7 +36,7 @@ public void HandlePlayerSpawning(PlayerSpawningEvent args)
 
         // If it's just a spawn pref check if it's for cryo (silly).
         if (args.HumanoidCharacterProfile?.SpawnPriority != SpawnPriorityPreference.Cryosleep &&
-            (!_proto.TryIndex(args.Job?.Prototype, out var jobProto) || jobProto.JobEntity == null))
+            (!_proto.TryIndex(args.Job, out var jobProto) || jobProto.JobEntity == null))
             return;
 
         var query = EntityQueryEnumerator<ContainerSpawnPointComponent, ContainerManagerComponent, TransformComponent>();
@@ -50,7 +50,7 @@ public void HandlePlayerSpawning(PlayerSpawningEvent args)
             // DeltaV - Custom override for override spawnpoints, only used for prisoners currently. This shouldn't run for any other jobs
             if (args.DesiredSpawnPointType == SpawnPointType.Job)
             {
-                if (spawnPoint.SpawnType != SpawnPointType.Job || spawnPoint.Job != args.Job?.Prototype)
+                if (spawnPoint.SpawnType != SpawnPointType.Job || spawnPoint.Job != args.Job)
                     continue;
 
                 possibleContainers.Add((uid, spawnPoint, container, xform));
@@ -61,7 +61,7 @@ public void HandlePlayerSpawning(PlayerSpawningEvent args)
             if (spawnPoint.SpawnType == SpawnPointType.Unset)
             {
                 // make sure we also check the job here for various reasons.
-                if (spawnPoint.Job == null || spawnPoint.Job == args.Job?.Prototype)
+                if (spawnPoint.Job == null || spawnPoint.Job == args.Job)
                     possibleContainers.Add((uid, spawnPoint, container, xform));
                 continue;
             }
@@ -71,7 +71,7 @@ public void HandlePlayerSpawning(PlayerSpawningEvent args)
 
             if (_gameTicker.RunLevel != GameRunLevel.InRound &&
                 spawnPoint.SpawnType == SpawnPointType.Job &&
-                (args.Job == null || spawnPoint.Job == args.Job.Prototype))
+                (args.Job == null || spawnPoint.Job == args.Job))
                 possibleContainers.Add((uid, spawnPoint, container, xform));
         }
 
diff --git a/Content.Server/Spawners/EntitySystems/SpawnPointSystem.cs b/Content.Server/Spawners/EntitySystems/SpawnPointSystem.cs
index 66cde5bb75..831ed6a491 100644
--- a/Content.Server/Spawners/EntitySystems/SpawnPointSystem.cs
+++ b/Content.Server/Spawners/EntitySystems/SpawnPointSystem.cs
@@ -36,7 +36,7 @@ private void OnPlayerSpawning(PlayerSpawningEvent args)
             if (args.DesiredSpawnPointType != SpawnPointType.Unset)
             {
                 var isMatchingJob = spawnPoint.SpawnType == SpawnPointType.Job &&
-                    (args.Job == null || spawnPoint.Job?.ID == args.Job.Prototype);
+                    (args.Job == null || spawnPoint.Job?.ID == args.Job);
 
                 switch (args.DesiredSpawnPointType)
                 {
@@ -57,7 +57,7 @@ private void OnPlayerSpawning(PlayerSpawningEvent args)
 
             if (_gameTicker.RunLevel != GameRunLevel.InRound &&
                 spawnPoint.SpawnType == SpawnPointType.Job &&
-                (args.Job == null || spawnPoint.Job?.ID == args.Job.Prototype))
+                (args.Job == null || spawnPoint.Job is not null && spawnPoint.Job == args.Job))
             {
                 possiblePositions.Add(xform.Coordinates);
             }
diff --git a/Content.Server/Station/Systems/StationSpawningSystem.cs b/Content.Server/Station/Systems/StationSpawningSystem.cs
index f44416d0c9..bfe0d6e95f 100644
--- a/Content.Server/Station/Systems/StationSpawningSystem.cs
+++ b/Content.Server/Station/Systems/StationSpawningSystem.cs
@@ -17,12 +17,11 @@
 using Content.Shared.Humanoid.Prototypes;
 using Content.Shared.PDA;
 using Content.Shared.Preferences;
+using Content.Shared.Preferences.Loadouts;
 using Content.Shared.Random;
 using Content.Shared.Random.Helpers;
 using Content.Shared.Roles;
-using Content.Shared.Roles.Jobs;
 using Content.Shared.Station;
-using Content.Shared.StatusIcon;
 using JetBrains.Annotations;
 using Robust.Shared.Configuration;
 using Robust.Shared.Map;
@@ -49,9 +48,6 @@ public sealed class StationSpawningSystem : SharedStationSpawningSystem
     [Dependency] private readonly IdentitySystem _identity = default!;
     [Dependency] private readonly MetaDataSystem _metaSystem = default!;
     [Dependency] private readonly InternalEncryptionKeySpawner _internalEncryption = default!;
-    [Dependency] private readonly ArrivalsSystem _arrivalsSystem = default!;
-    [Dependency] private readonly ContainerSpawnPointSystem _containerSpawnPointSystem = default!;
-    [Dependency] private readonly CharacterRequirementsSystem _characterRequirements = default!;
 
     private bool _randomizeCharacters;
 
@@ -75,7 +71,7 @@ public override void Initialize()
     /// <remarks>
     /// This only spawns the character, and does none of the mind-related setup you'd need for it to be playable.
     /// </remarks>
-    public EntityUid? SpawnPlayerCharacterOnStation(EntityUid? station, JobComponent? job, HumanoidCharacterProfile? profile, StationSpawningComponent? stationSpawning = null, SpawnPointType spawnPointType = SpawnPointType.Unset)
+    public EntityUid? SpawnPlayerCharacterOnStation(EntityUid? station, ProtoId<JobPrototype>? job, HumanoidCharacterProfile? profile, StationSpawningComponent? stationSpawning = null, SpawnPointType spawnPointType = SpawnPointType.Unset)
     {
         if (station != null && !Resolve(station.Value, ref stationSpawning))
             throw new ArgumentException("Tried to use a non-station entity as a station!", nameof(station));
@@ -103,12 +99,12 @@ public override void Initialize()
     /// <returns>The spawned entity</returns>
      public EntityUid SpawnPlayerMob(
         EntityCoordinates coordinates,
-        JobComponent? job,
+        ProtoId<JobPrototype>? job,
         HumanoidCharacterProfile? profile,
         EntityUid? station,
         EntityUid? entity = null)
     {
-        _prototypeManager.TryIndex(job?.Prototype ?? string.Empty, out var prototype);
+        _prototypeManager.TryIndex(job ?? string.Empty, out var prototype);
 
         // If we're not spawning a humanoid, we're gonna exit early without doing all the humanoid stuff.
         if (prototype?.JobEntity != null)
@@ -169,9 +165,9 @@ public EntityUid SpawnPlayerMob(
         return entity.Value;
     }
 
-    private void DoJobSpecials(JobComponent? job, EntityUid entity)
+    private void DoJobSpecials(ProtoId<JobPrototype>? job, EntityUid entity)
     {
-        if (!_prototypeManager.TryIndex(job?.Prototype ?? string.Empty, out JobPrototype? prototype))
+        if (!_prototypeManager.TryIndex(job ?? string.Empty, out JobPrototype? prototype))
             return;
 
         foreach (var jobSpecial in prototype.Special)
@@ -236,7 +232,7 @@ public sealed class PlayerSpawningEvent : EntityEventArgs
     /// <summary>
     /// The job to use, if any.
     /// </summary>
-    public readonly JobComponent? Job;
+    public readonly ProtoId<JobPrototype>? Job;
     /// <summary>
     /// The profile to use, if any.
     /// </summary>
@@ -250,7 +246,7 @@ public sealed class PlayerSpawningEvent : EntityEventArgs
     /// </summary>
     public readonly SpawnPointType DesiredSpawnPointType;
 
-    public PlayerSpawningEvent(JobComponent? job, HumanoidCharacterProfile? humanoidCharacterProfile, EntityUid? station, SpawnPointType spawnPointType = SpawnPointType.Unset)
+    public PlayerSpawningEvent(ProtoId<JobPrototype>? job, HumanoidCharacterProfile? humanoidCharacterProfile, EntityUid? station, SpawnPointType spawnPointType = SpawnPointType.Unset)
     {
         Job = job;
         HumanoidCharacterProfile = humanoidCharacterProfile;
diff --git a/Content.Server/Store/Conditions/BuyerAntagCondition.cs b/Content.Server/Store/Conditions/BuyerAntagCondition.cs
index 1edc4a3365..4b1b6013eb 100644
--- a/Content.Server/Store/Conditions/BuyerAntagCondition.cs
+++ b/Content.Server/Store/Conditions/BuyerAntagCondition.cs
@@ -33,16 +33,16 @@ public override bool Condition(ListingConditionArgs args)
             return true;
 
         var roleSystem = ent.System<SharedRoleSystem>();
-        var roles = roleSystem.MindGetAllRoles(mindId);
+        var roles = roleSystem.MindGetAllRoleInfo(mindId);
 
         if (Blacklist != null)
         {
             foreach (var role in roles)
             {
-                if (role.Component is not AntagonistRoleComponent blacklistantag)
+                if (!role.Antagonist || string.IsNullOrEmpty(role.Prototype))
                     continue;
 
-                if (blacklistantag.PrototypeId != null && Blacklist.Contains(blacklistantag.PrototypeId))
+                if (Blacklist.Contains(role.Prototype))
                     return false;
             }
         }
@@ -52,10 +52,11 @@ public override bool Condition(ListingConditionArgs args)
             var found = false;
             foreach (var role in roles)
             {
-                if (role.Component is not AntagonistRoleComponent antag)
+
+                if (!role.Antagonist || string.IsNullOrEmpty(role.Prototype))
                     continue;
 
-                if (antag.PrototypeId != null && Whitelist.Contains(antag.PrototypeId))
+                if (Whitelist.Contains(role.Prototype))
                     found = true;
             }
             if (!found)
diff --git a/Content.Server/Store/Conditions/BuyerDepartmentCondition.cs b/Content.Server/Store/Conditions/BuyerDepartmentCondition.cs
index ea8de4a9cc..43c06efad3 100644
--- a/Content.Server/Store/Conditions/BuyerDepartmentCondition.cs
+++ b/Content.Server/Store/Conditions/BuyerDepartmentCondition.cs
@@ -37,13 +37,13 @@ public override bool Condition(ListingConditionArgs args)
             return true;
 
         var jobs = ent.System<SharedJobSystem>();
-        jobs.MindTryGetJob(mindId, out var job, out _);
+        jobs.MindTryGetJob(mindId, out var job);
 
-        if (Blacklist != null && job?.Prototype != null)
+        if (Blacklist != null && job != null)
         {
             foreach (var department in prototypeManager.EnumeratePrototypes<DepartmentPrototype>())
             {
-                if (department.Roles.Contains(job.Prototype.Value) && Blacklist.Contains(department.ID))
+                if (department.Roles.Contains(job.ID) && Blacklist.Contains(department.ID))
                     return false;
             }
         }
@@ -52,11 +52,11 @@ public override bool Condition(ListingConditionArgs args)
         {
             var found = false;
 
-            if (job?.Prototype != null)
+            if (job != null)
             {
                 foreach (var department in prototypeManager.EnumeratePrototypes<DepartmentPrototype>())
                 {
-                    if (department.Roles.Contains(job.Prototype.Value) && Whitelist.Contains(department.ID))
+                    if (department.Roles.Contains(job.ID) && Whitelist.Contains(department.ID))
                     {
                         found = true;
                         break;
diff --git a/Content.Server/Store/Conditions/BuyerJobCondition.cs b/Content.Server/Store/Conditions/BuyerJobCondition.cs
index 6a53af188c..1ff4a97c33 100644
--- a/Content.Server/Store/Conditions/BuyerJobCondition.cs
+++ b/Content.Server/Store/Conditions/BuyerJobCondition.cs
@@ -34,17 +34,17 @@ public override bool Condition(ListingConditionArgs args)
             return true;
 
         var jobs = ent.System<SharedJobSystem>();
-        jobs.MindTryGetJob(mindId, out var job, out _);
+        jobs.MindTryGetJob(mindId, out var job);
 
         if (Blacklist != null)
         {
-            if (job?.Prototype != null && Blacklist.Contains(job.Prototype))
+            if (job is not null && Blacklist.Contains(job.ID))
                 return false;
         }
 
         if (Whitelist != null)
         {
-            if (job?.Prototype == null || !Whitelist.Contains(job.Prototype))
+            if (job == null || !Whitelist.Contains(job.ID))
                 return false;
         }
 
diff --git a/Content.Server/Traits/TraitSystem.Functions.cs b/Content.Server/Traits/TraitSystem.Functions.cs
index deb3102d4b..12b8a2337c 100644
--- a/Content.Server/Traits/TraitSystem.Functions.cs
+++ b/Content.Server/Traits/TraitSystem.Functions.cs
@@ -22,6 +22,7 @@
 using Content.Shared.NPC.Systems;
 using Content.Shared.Weapons.Melee;
 using Robust.Shared.Audio;
+using Content.Shared.Tag;
 
 namespace Content.Server.Traits;
 
@@ -677,3 +678,23 @@ public override void OnPlayerSpawn(EntityUid uid,
         entityManager.Dirty(uid, melee);
     }
 }
+
+
+// <summary>
+// Adds a Tag to something
+// </summary>
+[UsedImplicitly]
+public sealed partial class TraitAddTag : TraitFunction
+{
+    [DataField, AlwaysPushInheritance]
+    public List<ProtoId<TagPrototype>> Tags { get; private set; } = new();
+    
+    public override void OnPlayerSpawn(EntityUid uid,
+        IComponentFactory factory,
+        IEntityManager entityManager,
+        ISerializationManager serializationManager)
+    {
+        var tagSystem = entityManager.System<TagSystem>();
+        tagSystem.AddTags(uid, Tags);
+    }
+}
diff --git a/Content.Server/Zombies/ZombieSystem.Transform.cs b/Content.Server/Zombies/ZombieSystem.Transform.cs
index 2ddff91d40..3e4da3c801 100644
--- a/Content.Server/Zombies/ZombieSystem.Transform.cs
+++ b/Content.Server/Zombies/ZombieSystem.Transform.cs
@@ -12,7 +12,6 @@
 using Content.Server.NPC.Components;
 using Content.Server.NPC.HTN;
 using Content.Server.NPC.Systems;
-using Content.Server.Roles;
 using Content.Server.Speech.Components;
 using Content.Server.Temperature.Components;
 using Content.Shared.Abilities.Psionics;
@@ -244,7 +243,7 @@ public void ZombifyEntity(EntityUid target, MobStateComponent? mobState = null)
             if (hasMind && _mind.TryGetSession(mindId, out var session))
             {
                 //Zombie role for player manifest
-                _roles.MindAddRole(mindId, new ZombieRoleComponent { PrototypeId = zombiecomp.ZombieRoleId });
+                _roles.MindAddRole(mindId, "MindRoleZombie", mind: null, silent: true);
 
                 //Greeting message for new bebe zombers
                 _chatMan.DispatchServerMessage(session, Loc.GetString("zombie-infection-greeting"));
diff --git a/Content.Server/_Goobstation/Ghostbar/GhostBarSystem.cs b/Content.Server/_Goobstation/Ghostbar/GhostBarSystem.cs
index 8fce377a7d..71169b3d7e 100644
--- a/Content.Server/_Goobstation/Ghostbar/GhostBarSystem.cs
+++ b/Content.Server/_Goobstation/Ghostbar/GhostBarSystem.cs
@@ -99,7 +99,7 @@ public void SpawnPlayer(GhostBarSpawnEvent msg, EntitySessionEventArgs args)
         var randomSpawnPoint = _random.Pick(spawnPoints);
         var randomJob = _random.Pick(_jobComponents);
         var profile = _ticker.GetPlayerProfile(args.SenderSession);
-        var mobUid = _spawningSystem.SpawnPlayerMob(randomSpawnPoint, new JobComponent { Prototype = randomJob }, profile, null); // Einstein Engines - pass in JobComponent
+        var mobUid = _spawningSystem.SpawnPlayerMob(randomSpawnPoint, randomJob, profile, null);
 
         // Einstein Engines start - apply loadouts and traits
         var playTimes = _playTimeTracking.GetTrackerTimes(player);
diff --git a/Content.Shared/Botany/PlantAnalyzer/PlantAnalyzerDoAfterEvent.cs b/Content.Shared/Botany/PlantAnalyzer/PlantAnalyzerDoAfterEvent.cs
new file mode 100644
index 0000000000..37d7b042e2
--- /dev/null
+++ b/Content.Shared/Botany/PlantAnalyzer/PlantAnalyzerDoAfterEvent.cs
@@ -0,0 +1,7 @@
+using Content.Shared.DoAfter;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Botany.PlantAnalyzer;
+
+[Serializable, NetSerializable]
+public sealed partial class PlantAnalyzerDoAfterEvent : SimpleDoAfterEvent { }
diff --git a/Content.Shared/Botany/PlantAnalyzer/PlantAnalyzerLocalizationHelper.cs b/Content.Shared/Botany/PlantAnalyzer/PlantAnalyzerLocalizationHelper.cs
new file mode 100644
index 0000000000..f2ebabbb01
--- /dev/null
+++ b/Content.Shared/Botany/PlantAnalyzer/PlantAnalyzerLocalizationHelper.cs
@@ -0,0 +1,61 @@
+using Content.Shared.Atmos;
+using Content.Shared.Atmos.Prototypes;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Localizations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Botany.PlantAnalyzer;
+
+public sealed class PlantAnalyzerLocalizationHelper
+{
+    public static string GasesToLocalizedStrings(List<Gas> gases, IPrototypeManager protMan)
+    {
+        if (gases.Count == 0)
+            return "";
+
+        List<int> gasIds = [];
+        foreach (var gas in gases)
+            gasIds.Add((int)gas);
+
+        List<string> gasesLoc = [];
+        foreach (var gas in protMan.EnumeratePrototypes<GasPrototype>())
+            if (gasIds.Contains(int.Parse(gas.ID)))
+                gasesLoc.Add(Loc.GetString(gas.Name));
+
+        return ContentLocalizationManager.FormatList(gasesLoc);
+    }
+
+    public static string ChemicalsToLocalizedStrings(List<string> ids, IPrototypeManager protMan)
+    {
+        if (ids.Count == 0)
+            return "";
+
+        List<string> locStrings = [];
+        foreach (var id in ids)
+            locStrings.Add(protMan.TryIndex<ReagentPrototype>(id, out var prototype) ? prototype.LocalizedName : id);
+
+        return ContentLocalizationManager.FormatList(locStrings);
+    }
+
+    public static (string Singular, string Plural) ProduceToLocalizedStrings(List<string> ids, IPrototypeManager protMan)
+    {
+        if (ids.Count == 0)
+            return ("", "");
+
+        List<string> singularStrings = [];
+        List<string> pluralStrings = [];
+        foreach (var id in ids)
+        {
+            var singular = protMan.TryIndex<EntityPrototype>(id, out var prototype) ? prototype.Name : id;
+            var plural = Loc.GetString("plant-analyzer-produce-plural", ("thing", singular));
+
+            singularStrings.Add(singular);
+            pluralStrings.Add(plural);
+        }
+
+        return (
+            ContentLocalizationManager.FormatListToOr(singularStrings),
+            ContentLocalizationManager.FormatListToOr(pluralStrings)
+        );
+    }
+}
diff --git a/Content.Shared/Botany/PlantAnalyzer/PlantAnalyzerScannedUserMessage.cs b/Content.Shared/Botany/PlantAnalyzer/PlantAnalyzerScannedUserMessage.cs
new file mode 100644
index 0000000000..f60ef2c93d
--- /dev/null
+++ b/Content.Shared/Botany/PlantAnalyzer/PlantAnalyzerScannedUserMessage.cs
@@ -0,0 +1,114 @@
+using Content.Shared.Atmos;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Botany.PlantAnalyzer;
+
+[Serializable, NetSerializable]
+public sealed class PlantAnalyzerScannedUserMessage(NetEntity? targetEntity, bool? scanMode, PlantAnalyzerPlantData? plantData, PlantAnalyzerTrayData? trayData, PlantAnalyzerTolerancesData? tolerancesData, PlantAnalyzerProduceData? produceData, TimeSpan? printReadyAt) : BoundUserInterfaceMessage
+{
+    public readonly NetEntity? TargetEntity = targetEntity;
+    public readonly bool? ScanMode = scanMode;
+    public readonly PlantAnalyzerPlantData? PlantData = plantData;
+    public readonly PlantAnalyzerTrayData? TrayData = trayData;
+    public readonly PlantAnalyzerTolerancesData? TolerancesData = tolerancesData;
+    public readonly PlantAnalyzerProduceData? ProduceData = produceData;
+    public readonly TimeSpan? PrintReadyAt = printReadyAt;
+}
+
+/// <summary>
+/// Everything that is kept independed of a given plant/seed.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed class PlantAnalyzerTrayData(float waterLevel, float nutritionLevel, float toxins, float pestLevel, float weedLevel, List<string>? chemicals)
+{
+    public float WaterLevel = waterLevel;
+    public float NutritionLevel = nutritionLevel;
+    public float Toxins = toxins;
+    public float PestLevel = pestLevel;
+    public float WeedLevel = weedLevel;
+    public List<string>? Chemicals = chemicals;
+}
+
+
+/// <summary>
+/// All the information to keep the plant alive.
+/// Which is most of the "Tolerances" reagion plus the gases it may need.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed class PlantAnalyzerTolerancesData(float nutrientConsumption, float waterConsumption, float idealHeat, float heatTolerance, float idealLight, float lightTolerance, float toxinsTolerance, float lowPressureTolerance, float highPressureTolerance, float pestTolerance, float weedTolerance, List<Gas> consumeGasses)
+{
+    public float WaterConsumption = waterConsumption;
+    public float NutrientConsumption = nutrientConsumption;
+    public float ToxinsTolerance = toxinsTolerance;
+    public float PestTolerance = pestTolerance;
+    public float WeedTolerance = weedTolerance;
+    public float IdealPressure = (lowPressureTolerance + highPressureTolerance) / 2;
+    public float PressureTolerance = (lowPressureTolerance + highPressureTolerance) / 2 - lowPressureTolerance;
+    public float IdealHeat = idealHeat;
+    public float HeatTolerance = heatTolerance;
+    public float IdealLight = idealLight;
+    public float LightTolerance = lightTolerance;
+    public List<Gas> ConsumeGasses = consumeGasses;
+}
+
+/// <summary>
+/// Information about the plant inside the tray.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed class PlantAnalyzerPlantData(string seedDisplayName, float health, float endurance, float age, float lifespan, bool dead, bool viable, bool mutating, bool kudzu)
+{
+    public string SeedDisplayName = seedDisplayName;
+    public float Health = health;
+    public float Endurance = endurance;
+    public float Age = age;
+    public float Lifespan = lifespan;
+    public bool Dead = dead;
+    public bool Viable = viable;
+    public bool Mutating = mutating;
+    public bool Kudzu = kudzu;
+}
+
+/// <summary>
+/// Information about the output of a plant (produce and gas).
+/// </summary>
+[Serializable, NetSerializable]
+public sealed class PlantAnalyzerProduceData(int yield, float potency, List<string> chemicals, List<string> produce, List<Gas> exudeGasses, bool seedless)
+{
+    public int Yield = yield;
+    public string Potency = ObscurePotency(potency);
+    public List<string> Chemicals = chemicals;
+    public List<string> Produce = produce;
+    public List<Gas> ExudeGasses = exudeGasses;
+    public bool Seedless = seedless;
+
+    private static readonly Dictionary<float, string> PotencyThresholds = new()
+    {
+        { 5f, "tiny" },
+        { 10f, "small" },
+        { 15f, "below-average" },
+        { 20f, "average" },
+        { 25f, "above-average" },
+        { 30f, "large" },
+        { 40f, "huge" },
+        { 50f, "gigantic" },
+        { 60f, "ludicrous" }
+    };
+
+    private static string ObscurePotency(float potency)
+    {
+        foreach (var threshold in PotencyThresholds)
+        {
+            if (potency <= threshold.Key)
+            {
+                return "plant-analyzer-potency-" + threshold.Value;
+            }
+        }
+
+        return "plant-analyzer-potency-immeasurable";
+    }
+}
+
+[Serializable, NetSerializable]
+public sealed class PlantAnalyzerPrintMessage : BoundUserInterfaceMessage
+{
+}
diff --git a/Content.Shared/Botany/PlantAnalyzer/PlantAnalyzerUiKey.cs b/Content.Shared/Botany/PlantAnalyzer/PlantAnalyzerUiKey.cs
new file mode 100644
index 0000000000..a45b163b19
--- /dev/null
+++ b/Content.Shared/Botany/PlantAnalyzer/PlantAnalyzerUiKey.cs
@@ -0,0 +1,6 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Botany.PlantAnalyzer;
+
+[Serializable, NetSerializable]
+public enum PlantAnalyzerUiKey : byte { Key }
diff --git a/Content.Shared/CCVar/CCVars.Game.cs b/Content.Shared/CCVar/CCVars.Game.cs
index fd45000bb0..efff707047 100644
--- a/Content.Shared/CCVar/CCVars.Game.cs
+++ b/Content.Shared/CCVar/CCVars.Game.cs
@@ -386,6 +386,14 @@ public static readonly CVarDef<bool>
     public static readonly CVarDef<string> RoundEndSoundCollection =
         CVarDef.Create("game.round_end_sound_collection", "RoundEnd", CVar.SERVERONLY);
 
+    /// <summary>
+    /// Whether or not to add every player as a global override to PVS at round end.
+    /// This will allow all players to see their clothing in the round screen player list screen,
+    /// but may cause lag during round end with very high player counts.
+    /// </summary>
+    public static readonly CVarDef<bool> RoundEndPVSOverrides =
+        CVarDef.Create("game.round_end_pvs_overrides", true, CVar.SERVERONLY);
+
     /// <summary>
     /// Set to true to enable the dynamic hostname system.
     /// Automatically updates the hostname to include current map and preset.
diff --git a/Content.Shared/Damage/Systems/DamageContactsSystem.cs b/Content.Shared/Damage/Systems/DamageContactsSystem.cs
index b08ef77fed..3cc73a87c5 100644
--- a/Content.Shared/Damage/Systems/DamageContactsSystem.cs
+++ b/Content.Shared/Damage/Systems/DamageContactsSystem.cs
@@ -65,7 +65,7 @@ private void OnEntityEnter(EntityUid uid, DamageContactsComponent component, ref
         if (HasComp<DamagedByContactComponent>(otherUid))
             return;
 
-        if (_whitelistSystem.IsWhitelistFail(component.IgnoreWhitelist, otherUid))
+        if (_whitelistSystem.IsWhitelistPass(component.IgnoreWhitelist, otherUid))
             return;
 
         var damagedByContact = EnsureComp<DamagedByContactComponent>(otherUid);
diff --git a/Content.Shared/Damage/Systems/DamageableSystem.cs b/Content.Shared/Damage/Systems/DamageableSystem.cs
index e162d6f159..ab1fe8035f 100644
--- a/Content.Shared/Damage/Systems/DamageableSystem.cs
+++ b/Content.Shared/Damage/Systems/DamageableSystem.cs
@@ -256,6 +256,39 @@ public void SetAllDamage(EntityUid uid, DamageableComponent component, FixedPoin
             // Shitmed Change End
         }
 
+        /// <summary>
+        ///     Changes all damage types supported by a <see cref="DamageableComponent"/> by the specified value.
+        /// </summary>
+        /// <remakrs>
+        ///     Will not lower damage to a negative value.
+        /// </remakrs>
+        public void ChangeAllDamage(EntityUid uid, DamageableComponent component, FixedPoint2 addedValue)
+        {
+            foreach (var type in component.Damage.DamageDict.Keys)
+            {
+                component.Damage.DamageDict[type] += addedValue;
+                if (component.Damage.DamageDict[type] < 0)
+                    component.Damage.DamageDict[type] = 0;
+            }
+
+            // Changing damage does not count as 'dealing' damage, even if it is set to a larger value, so we pass an
+            // empty damage delta.
+            DamageChanged(uid, component, new DamageSpecifier());
+
+            // Shitmed Change Start
+            if (!HasComp<TargetingComponent>(uid))
+                return;
+
+            foreach (var (part, _) in _body.GetBodyChildren(uid))
+            {
+                if (!TryComp(part, out DamageableComponent? damageComp))
+                    continue;
+
+                ChangeAllDamage(part, damageComp, addedValue);
+            }
+            // Shitmed Change End
+        }
+
         public void SetDamageModifierSetId(EntityUid uid, string damageModifierSetId, DamageableComponent? comp = null)
         {
             if (!_damageableQuery.Resolve(uid, ref comp))
diff --git a/Content.Shared/Mind/Components/MindContainerComponent.cs b/Content.Shared/Mind/Components/MindContainerComponent.cs
index be6ad6b125..f3eff2ccf8 100644
--- a/Content.Shared/Mind/Components/MindContainerComponent.cs
+++ b/Content.Shared/Mind/Components/MindContainerComponent.cs
@@ -1,103 +1,100 @@
 using System.Diagnostics.CodeAnalysis;
 using Robust.Shared.GameStates;
 
-namespace Content.Shared.Mind.Components
+namespace Content.Shared.Mind.Components;
+
+/// <summary>
+/// This component indicates that this entity may have mind, which is simply an entity with a <see cref="MindComponent"/>.
+/// The mind entity is not actually stored in a "container", but is simply stored in nullspace.
+/// </summary>
+[RegisterComponent, Access(typeof(SharedMindSystem)), NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class MindContainerComponent : Component
 {
     /// <summary>
-    /// This component indicates that this entity may have mind, which is simply an entity with a <see cref="MindComponent"/>.
-    /// The mind entity is not actually stored in a "container", but is simply stored in nullspace.
+    ///     The mind controlling this mob. Can be null.
     /// </summary>
-    [RegisterComponent, Access(typeof(SharedMindSystem)), NetworkedComponent, AutoGenerateComponentState]
-    public sealed partial class MindContainerComponent : Component
-    {
-        /// <summary>
-        ///     The mind controlling this mob. Can be null.
-        /// </summary>
-        [DataField, AutoNetworkedField]
-        [Access(typeof(SharedMindSystem), Other = AccessPermissions.ReadWriteExecute)] // FIXME Friends
-        public EntityUid? Mind { get; set; }
+    [DataField, AutoNetworkedField]
+    public EntityUid? Mind { get; set; }
+
+    /// <summary>
+    ///     True if we have a mind, false otherwise.
+    /// </summary>
+    [MemberNotNullWhen(true, nameof(Mind))]
+    public bool HasMind => Mind != null;
 
-        /// <summary>
-        ///     True if we have a mind, false otherwise.
-        /// </summary>
-        [MemberNotNullWhen(true, nameof(Mind))]
-        public bool HasMind => Mind != null;
+    /// <summary>
+    ///     Whether examining should show information about the mind or not.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField("showExamineInfo"), AutoNetworkedField]
+    public bool ShowExamineInfo { get; set; }
 
-        /// <summary>
-        ///     Whether examining should show information about the mind or not.
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("showExamineInfo"), AutoNetworkedField]
-        public bool ShowExamineInfo { get; set; }
+    /// <summary>
+    ///     Whether the mind will be put on a ghost after this component is shutdown.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField("ghostOnShutdown")]
+    public bool GhostOnShutdown { get; set; } = true;
 
-        /// <summary>
-        ///     Whether the mind will be put on a ghost after this component is shutdown.
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("ghostOnShutdown")]
-        [Access(typeof(SharedMindSystem), Other = AccessPermissions.ReadWriteExecute)] // FIXME Friends
-        public bool GhostOnShutdown { get; set; } = true;
+    /// <summary>
+    ///     Psionics: The first mind to control this mob. Will only be null if the mob never had a mind at all.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public EntityUid? OriginalMind;
+}
 
-        /// <summary>
-        /// DeltaV: The first mind to control this mob. Will only be null if the mob never had a mind at all.
-        /// </summary>
-        [DataField, AutoNetworkedField]
-        public EntityUid? OriginalMind;
-    }
+public abstract class MindEvent : EntityEventArgs
+{
+    public readonly Entity<MindComponent> Mind;
+    public readonly Entity<MindContainerComponent> Container;
 
-    public abstract class MindEvent : EntityEventArgs
+    public MindEvent(Entity<MindComponent> mind, Entity<MindContainerComponent> container)
     {
-        public readonly Entity<MindComponent> Mind;
-        public readonly Entity<MindContainerComponent> Container;
-
-        public MindEvent(Entity<MindComponent> mind, Entity<MindContainerComponent> container)
-        {
-            Mind = mind;
-            Container = container;
-        }
+        Mind = mind;
+        Container = container;
     }
+}
 
-    /// <summary>
-    /// Event raised directed at a mind-container when a mind gets removed.
-    /// </summary>
-    public sealed class MindRemovedMessage : MindEvent
+/// <summary>
+/// Event raised directed at a mind-container when a mind gets removed.
+/// </summary>
+public sealed class MindRemovedMessage : MindEvent
+{
+    public MindRemovedMessage(Entity<MindComponent> mind, Entity<MindContainerComponent> container)
+        : base(mind, container)
     {
-        public MindRemovedMessage(Entity<MindComponent> mind, Entity<MindContainerComponent> container)
-            : base(mind, container)
-        {
-        }
     }
+}
 
-    /// <summary>
-    /// Event raised directed at a mind when it gets removed from a mind-container.
-    /// </summary>
-    public sealed class MindGotRemovedEvent : MindEvent
+/// <summary>
+/// Event raised directed at a mind when it gets removed from a mind-container.
+/// </summary>
+public sealed class MindGotRemovedEvent : MindEvent
+{
+    public MindGotRemovedEvent(Entity<MindComponent> mind, Entity<MindContainerComponent> container)
+        : base(mind, container)
     {
-        public MindGotRemovedEvent(Entity<MindComponent> mind, Entity<MindContainerComponent> container)
-            : base(mind, container)
-        {
-        }
     }
+}
 
-    /// <summary>
-    /// Event raised directed at a mind-container when a mind gets added.
-    /// </summary>
-    public sealed class MindAddedMessage : MindEvent
+/// <summary>
+/// Event raised directed at a mind-container when a mind gets added.
+/// </summary>
+public sealed class MindAddedMessage : MindEvent
+{
+    public MindAddedMessage(Entity<MindComponent> mind, Entity<MindContainerComponent> container)
+        : base(mind, container)
     {
-        public MindAddedMessage(Entity<MindComponent> mind, Entity<MindContainerComponent> container)
-            : base(mind, container)
-        {
-        }
     }
+}
 
-    /// <summary>
-    /// Event raised directed at a mind when it gets added to a mind-container.
-    /// </summary>
-    public sealed class MindGotAddedEvent : MindEvent
+/// <summary>
+/// Event raised directed at a mind when it gets added to a mind-container.
+/// </summary>
+public sealed class MindGotAddedEvent : MindEvent
+{
+    public MindGotAddedEvent(Entity<MindComponent> mind, Entity<MindContainerComponent> container)
+        : base(mind, container)
     {
-        public MindGotAddedEvent(Entity<MindComponent> mind, Entity<MindContainerComponent> container)
-            : base(mind, container)
-        {
-        }
     }
 }
diff --git a/Content.Shared/Mind/MindComponent.cs b/Content.Shared/Mind/MindComponent.cs
index e2ace2198b..0e10c30c62 100644
--- a/Content.Shared/Mind/MindComponent.cs
+++ b/Content.Shared/Mind/MindComponent.cs
@@ -1,109 +1,105 @@
-using Content.Shared.Actions;
 using Content.Shared.GameTicking;
 using Content.Shared.Mind.Components;
 using Robust.Shared.GameStates;
 using Robust.Shared.Network;
 using Robust.Shared.Player;
 
-namespace Content.Shared.Mind
+namespace Content.Shared.Mind;
+
+/// <summary>
+///     This component stores information about a player/mob mind. The component will be attached to a mind-entity
+///     which is stored in null-space. The entity that is currently "possessed" by the mind will have a
+///     <see cref="MindContainerComponent"/>.
+/// </summary>
+/// <remarks>
+///     Roles are attached as components on the mind-entity entity.
+///     Think of it like this: if a player is supposed to have their memories,
+///     their mind follows along.
+///
+///     Things such as respawning do not follow, because you're a new character.
+///     Getting borged, cloned, turned into a catbeast, etc... will keep it following you.
+///
+///     Minds are stored in null-space, and are thus generally not set to players unless that player is the owner
+///     of the mind. As a result it should be safe to network "secret" information like roles & objectives
+/// </remarks>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
+public sealed partial class MindComponent : Component
 {
+    [DataField, AutoNetworkedField]
+    public List<EntityUid> Objectives = new();
+
     /// <summary>
-    ///     This component stores information about a player/mob mind. The component will be attached to a mind-entity
-    ///     which is stored in null-space. The entity that is currently "possessed" by the mind will have a
-    ///     <see cref="MindContainerComponent"/>.
+    ///     The session ID of the player owning this mind.
     /// </summary>
-    /// <remarks>
-    ///     Roles are attached as components on the mind-entity entity.
-    ///     Think of it like this: if a player is supposed to have their memories,
-    ///     their mind follows along.
-    ///
-    ///     Things such as respawning do not follow, because you're a new character.
-    ///     Getting borged, cloned, turned into a catbeast, etc... will keep it following you.
-    ///
-    ///     Minds are stored in null-space, and are thus generally not set to players unless that player is the owner
-    ///     of the mind. As a result it should be safe to network "secret" information like roles & objectives
-    /// </remarks>
-    [RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
-    public sealed partial class MindComponent : Component
-    {
-        [DataField, AutoNetworkedField]
-        public List<EntityUid> Objectives = new();
-
-        /// <summary>
-        ///     The session ID of the player owning this mind.
-        /// </summary>
-        [DataField, AutoNetworkedField, Access(typeof(SharedMindSystem))]
-        public NetUserId? UserId { get; set; }
+    [DataField, AutoNetworkedField, Access(typeof(SharedMindSystem))]
+    public NetUserId? UserId { get; set; }
 
-        /// <summary>
-        ///     The session ID of the original owner, if any.
-        ///     May end up used for round-end information (as the owner may have abandoned Mind since)
-        /// </summary>
-        [DataField, AutoNetworkedField, Access(typeof(SharedMindSystem))]
-        public NetUserId? OriginalOwnerUserId { get; set; }
+    /// <summary>
+    ///     The session ID of the original owner, if any.
+    ///     May end up used for round-end information (as the owner may have abandoned Mind since)
+    /// </summary>
+    [DataField, AutoNetworkedField, Access(typeof(SharedMindSystem))]
+    public NetUserId? OriginalOwnerUserId { get; set; }
 
-        /// <summary>
-        ///     The first entity that this mind controlled. Used for round end information.
-        ///     Might be relevant if the player has ghosted since.
-        /// </summary>
-        [AutoNetworkedField]
-        public NetEntity? OriginalOwnedEntity; // TODO WeakEntityReference make this a Datafield again
-        // This is a net entity, because this field currently does not get set to null when this entity is deleted.
-        // This is a lazy way to ensure that people check that the entity still exists.
-        // TODO MIND Fix this properly by adding an OriginalMindContainerComponent or something like that.
+    /// <summary>
+    ///     The first entity that this mind controlled. Used for round end information.
+    ///     Might be relevant if the player has ghosted since.
+    /// </summary>
+    [AutoNetworkedField]
+    public NetEntity? OriginalOwnedEntity; // TODO WeakEntityReference make this a Datafield again
+    // This is a net entity, because this field currently does not get set to null when this entity is deleted.
+    // This is a lazy way to ensure that people check that the entity still exists.
+    // TODO MIND Fix this properly by adding an OriginalMindContainerComponent or something like that.
 
-        [ViewVariables]
-        public bool IsVisitingEntity => VisitingEntity != null;
+    [ViewVariables]
+    public bool IsVisitingEntity => VisitingEntity != null;
 
-        [DataField, AutoNetworkedField, Access(typeof(SharedMindSystem))]
-        public EntityUid? VisitingEntity { get; set; }
+    [DataField, AutoNetworkedField, Access(typeof(SharedMindSystem))]
+    public EntityUid? VisitingEntity { get; set; }
 
-        [ViewVariables]
-        public EntityUid? CurrentEntity => VisitingEntity ?? OwnedEntity;
+    [ViewVariables]
+    public EntityUid? CurrentEntity => VisitingEntity ?? OwnedEntity;
 
-        [DataField, AutoNetworkedField, ViewVariables(VVAccess.ReadWrite)]
-        public string? CharacterName { get; set; }
+    [DataField, AutoNetworkedField, ViewVariables(VVAccess.ReadWrite)]
+    public string? CharacterName { get; set; }
 
-        /// <summary>
-        ///     The time of death for this Mind.
-        ///     Can be null - will be null if the Mind is not considered "dead".
-        /// </summary>
-        [DataField]
-        public TimeSpan? TimeOfDeath { get; set; }
+    /// <summary>
+    ///     The time of death for this Mind.
+    ///     Can be null - will be null if the Mind is not considered "dead".
+    /// </summary>
+    [DataField]
+    public TimeSpan? TimeOfDeath { get; set; }
 
-        /// <summary>
-        ///     The entity currently owned by this mind.
-        ///     Can be null.
-        /// </summary>
-        [DataField, AutoNetworkedField, Access(typeof(SharedMindSystem))]
-        public EntityUid? OwnedEntity { get; set; }
+    /// <summary>
+    ///     The entity currently owned by this mind.
+    ///     Can be null.
+    /// </summary>
+    [DataField, AutoNetworkedField, Access(typeof(SharedMindSystem))]
+    public EntityUid? OwnedEntity { get; set; }
 
-        /// <summary>
-        ///     An enumerable over all the objective entities this mind has.
-        /// </summary>
-        [ViewVariables, Obsolete("Use Objectives field")]
-        public IEnumerable<EntityUid> AllObjectives => Objectives;
+    /// <summary>
+    ///     Prevents user from ghosting out
+    /// </summary>
+    [DataField]
+    public bool PreventGhosting { get; set; }
 
-        /// <summary>
-        ///     Prevents user from ghosting out
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("preventGhosting")]
-        public bool PreventGhosting { get; set; }
+    /// <summary>
+    ///     Prevents user from suiciding
+    /// </summary>
+    [DataField]
+    public bool PreventSuicide { get; set; }
 
-        /// <summary>
-        ///     Prevents user from suiciding
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("preventSuicide")]
-        public bool PreventSuicide { get; set; }
+    /// <summary>
+    ///     Mind Role Entities belonging to this Mind
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public List<EntityUid> MindRoles = new List<EntityUid>();
 
-        /// <summary>
-        ///     The session of the player owning this mind.
-        ///     Can be null, in which case the player is currently not logged in.
-        /// </summary>
-        [ViewVariables, Access(typeof(SharedMindSystem), typeof(SharedGameTicker))]
-        // TODO remove this after moving IPlayerManager functions to shared
-        public ICommonSession? Session { get; set; }
-    }
+    /// <summary>
+    ///     The session of the player owning this mind.
+    ///     Can be null, in which case the player is currently not logged in.
+    /// </summary>
+    [ViewVariables, Access(typeof(SharedMindSystem), typeof(SharedGameTicker))]
+    // TODO remove this after moving IPlayerManager functions to shared
+    public ICommonSession? Session { get; set; }
 }
diff --git a/Content.Shared/Mind/SharedMindSystem.cs b/Content.Shared/Mind/SharedMindSystem.cs
index 9454443eb3..5045c9a2aa 100644
--- a/Content.Shared/Mind/SharedMindSystem.cs
+++ b/Content.Shared/Mind/SharedMindSystem.cs
@@ -377,7 +377,7 @@ public bool TryGetObjectiveComp<T>(EntityUid mindId, [NotNullWhen(true)] out T?
         if (Resolve(mindId, ref mind))
         {
             var query = GetEntityQuery<T>();
-            foreach (var uid in mind.AllObjectives)
+            foreach (var uid in mind.Objectives)
             {
                 if (query.TryGetComponent(uid, out objective))
                 {
diff --git a/Content.Shared/Objectives/Systems/SharedObjectivesSystem.cs b/Content.Shared/Objectives/Systems/SharedObjectivesSystem.cs
index 8d2c4dcfeb..4024c6108b 100644
--- a/Content.Shared/Objectives/Systems/SharedObjectivesSystem.cs
+++ b/Content.Shared/Objectives/Systems/SharedObjectivesSystem.cs
@@ -40,7 +40,7 @@ public bool CanBeAssigned(EntityUid uid, EntityUid mindId, MindComponent mind, O
         if (comp.Unique)
         {
             var proto = _metaQuery.GetComponent(uid).EntityPrototype?.ID;
-            foreach (var objective in mind.AllObjectives)
+            foreach (var objective in mind.Objectives)
             {
                 if (_metaQuery.GetComponent(objective).EntityPrototype?.ID == proto)
                     return false;
diff --git a/Content.Shared/Renamable/Components/RenamableComponent.cs b/Content.Shared/Renamable/Components/RenamableComponent.cs
new file mode 100644
index 0000000000..1e1c0bd08b
--- /dev/null
+++ b/Content.Shared/Renamable/Components/RenamableComponent.cs
@@ -0,0 +1,17 @@
+using Content.Shared.Renamable.EntitySystems;
+using Robust.Shared.Serialization;
+
+
+namespace Content.Shared.Renamable.Components;
+
+[Serializable, NetSerializable]
+public enum SharedRenamableInterfaceKey
+{
+    Key
+}
+
+[RegisterComponent, Access(typeof(SharedRenamableSystem))]
+public sealed partial class RenamableComponent : Component
+{
+
+}
diff --git a/Content.Shared/Renamable/EntitySystems/SharedRenamableSystem.cs b/Content.Shared/Renamable/EntitySystems/SharedRenamableSystem.cs
new file mode 100644
index 0000000000..9f6a373125
--- /dev/null
+++ b/Content.Shared/Renamable/EntitySystems/SharedRenamableSystem.cs
@@ -0,0 +1,70 @@
+using System.Diagnostics;
+using Content.Shared.Database;
+using Content.Shared.NameIdentifier;
+using Content.Shared.Popups;
+using Content.Shared.Renamable.Components;
+using Content.Shared.Verbs;
+using Robust.Shared.Serialization;
+
+
+namespace Content.Shared.Renamable.EntitySystems;
+
+public partial class SharedRenamableSystem : EntitySystem
+{
+    [Dependency] private readonly IEntityManager _entManager = default!;
+    [Dependency] private readonly SharedUserInterfaceSystem _uiSystem = null!;
+    private SharedPopupSystem? _popup;
+    private MetaDataSystem _metaData = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<RenamableComponent, GetVerbsEvent<Verb>>(OnGetVerbs);
+        SubscribeLocalEvent<RenamableComponent, RenamableBuiMessage>(OnRename);
+
+        _popup = _entManager.System<SharedPopupSystem>();
+        _metaData = _entManager.System<MetaDataSystem>();
+    }
+
+    private void OnRename(Entity<RenamableComponent> entity, ref RenamableBuiMessage renameMessage)
+    {
+        _popup!.PopupPredicted(Loc.GetString("comp-renamable-rename", ("newname", renameMessage.Name)), entity, null);
+
+        var name = renameMessage.Name.Trim();
+        if (TryComp<NameIdentifierComponent>(entity, out var identifier))
+            name = $"{name} {identifier.FullIdentifier}";
+
+        var metaData = MetaData(entity);
+
+        // don't change the name if the value doesn't actually change
+        if (metaData.EntityName.Equals(name, StringComparison.InvariantCulture))
+            return;
+
+        _metaData.SetEntityName(entity, name, metaData);
+    }
+
+    private void OnGetVerbs(Entity<RenamableComponent> entity, ref GetVerbsEvent<Verb> args)
+    {
+        if (!args.CanAccess || !args.CanInteract || args.Hands == null)
+            return;
+
+        var entityUid = entity.Owner;
+        var user = args.User;
+        var renameVerb = new Verb
+        {
+            Text = Loc.GetString("verb-categories-rename"),
+            DoContactInteraction = true,
+            Act = () =>
+            {
+                _uiSystem.OpenUi(entityUid, SharedRenamableInterfaceKey.Key, user);
+            }
+        };
+        args.Verbs.Add(renameVerb);
+    }
+}
+
+[Serializable, NetSerializable]
+public sealed class RenamableBuiMessage(string name) : BoundUserInterfaceMessage
+{
+    public string Name = name;
+}
diff --git a/Content.Shared/Roles/AntagonistRoleComponent.cs b/Content.Shared/Roles/AntagonistRoleComponent.cs
deleted file mode 100644
index 748b18255a..0000000000
--- a/Content.Shared/Roles/AntagonistRoleComponent.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using JetBrains.Annotations;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Shared.Roles;
-
-public abstract partial class AntagonistRoleComponent : Component
-{
-    [DataField("prototype", required: true, customTypeSerializer: typeof(PrototypeIdSerializer<AntagPrototype>))]
-    public string? PrototypeId;
-}
-
-/// <summary>
-/// Mark the antagonist role component as being exclusive
-/// IE by default other antagonists should refuse to select the same entity for a different antag role
-/// </summary>
-[AttributeUsage(AttributeTargets.Class, Inherited = false)]
-[BaseTypeRequired(typeof(AntagonistRoleComponent))]
-public sealed partial class ExclusiveAntagonistAttribute : Attribute
-{
-}
diff --git a/Content.Shared/Roles/Jobs/JobComponent.cs b/Content.Shared/Roles/Jobs/JobRoleComponent.cs
similarity index 68%
rename from Content.Shared/Roles/Jobs/JobComponent.cs
rename to Content.Shared/Roles/Jobs/JobRoleComponent.cs
index 7191e8b397..228d4444fb 100644
--- a/Content.Shared/Roles/Jobs/JobComponent.cs
+++ b/Content.Shared/Roles/Jobs/JobRoleComponent.cs
@@ -4,10 +4,10 @@
 namespace Content.Shared.Roles.Jobs;
 
 /// <summary>
-///     Added to mind entities to hold the data for the player's current job.
+///     Added to mind role entities to mark them as a job role entity.
 /// </summary>
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-public sealed partial class JobComponent : Component
+public sealed partial class JobRoleComponent : BaseMindRoleComponent
 {
     [DataField(required: true), AutoNetworkedField]
     public ProtoId<JobPrototype>? Prototype;
diff --git a/Content.Shared/Roles/Jobs/SharedJobSystem.cs b/Content.Shared/Roles/Jobs/SharedJobSystem.cs
index fcf7605278..94447a5af4 100644
--- a/Content.Shared/Roles/Jobs/SharedJobSystem.cs
+++ b/Content.Shared/Roles/Jobs/SharedJobSystem.cs
@@ -13,10 +13,10 @@ namespace Content.Shared.Roles.Jobs;
 /// </summary>
 public abstract class SharedJobSystem : EntitySystem
 {
-    [Dependency] private readonly IPrototypeManager _prototypes = default!;
     [Dependency] private readonly SharedPlayerSystem _playerSystem = default!;
+    [Dependency] private readonly IPrototypeManager _prototypes = default!;
+    [Dependency] private readonly SharedRoleSystem _roles = default!;
 
-    [Dependency] private readonly IPrototypeManager _protoManager = default!;
     private readonly Dictionary<string, string> _inverseTrackerLookup = new();
 
     public override void Initialize()
@@ -37,7 +37,7 @@ private void SetupTrackerLookup()
         _inverseTrackerLookup.Clear();
 
         // This breaks if you have N trackers to 1 JobId but future concern.
-        foreach (var job in _protoManager.EnumeratePrototypes<JobPrototype>())
+        foreach (var job in _prototypes.EnumeratePrototypes<JobPrototype>())
         {
             _inverseTrackerLookup.Add(job.PlayTimeTracker, job.ID);
         }
@@ -50,7 +50,7 @@ private void SetupTrackerLookup()
     /// <returns></returns>
     public string GetJobPrototype(string trackerProto)
     {
-        DebugTools.Assert(_protoManager.HasIndex<PlayTimeTrackerPrototype>(trackerProto));
+        DebugTools.Assert(_prototypes.HasIndex<PlayTimeTrackerPrototype>(trackerProto));
         return _inverseTrackerLookup[trackerProto];
     }
 
@@ -60,7 +60,7 @@ public string GetJobPrototype(string trackerProto)
     public bool TryGetDepartment(string jobProto, [NotNullWhen(true)] out DepartmentPrototype? departmentPrototype)
     {
         // Not that many departments so we can just eat the cost instead of storing the inverse lookup.
-        var departmentProtos = _protoManager.EnumeratePrototypes<DepartmentPrototype>().ToList();
+        var departmentProtos = _prototypes.EnumeratePrototypes<DepartmentPrototype>().ToList();
         departmentProtos.Sort((x, y) => string.Compare(x.ID, y.ID, StringComparison.Ordinal));
 
         foreach (var department in departmentProtos)
@@ -85,7 +85,7 @@ public bool TryGetPrimaryDepartment(string jobProto, [NotNullWhen(true)] out Dep
     {
         // not sorting it since there should only be 1 primary department for a job.
         // this is enforced by the job tests.
-        var departmentProtos = _protoManager.EnumeratePrototypes<DepartmentPrototype>();
+        var departmentProtos = _prototypes.EnumeratePrototypes<DepartmentPrototype>();
 
         foreach (var department in departmentProtos)
         {
@@ -102,20 +102,44 @@ public bool TryGetPrimaryDepartment(string jobProto, [NotNullWhen(true)] out Dep
 
     public bool MindHasJobWithId(EntityUid? mindId, string prototypeId)
     {
-        return CompOrNull<JobComponent>(mindId)?.Prototype == prototypeId;
+
+        MindRoleComponent? comp = null;
+        if (mindId is null)
+            return false;
+
+        _roles.MindHasRole<JobRoleComponent>(mindId.Value, out var role);
+
+        if (role is null)
+            return false;
+
+        comp = role.Value.Comp;
+
+        return (comp.JobPrototype == prototypeId);
     }
 
     public bool MindTryGetJob(
         [NotNullWhen(true)] EntityUid? mindId,
-        [NotNullWhen(true)] out JobComponent? comp,
         [NotNullWhen(true)] out JobPrototype? prototype)
     {
-        comp = null;
         prototype = null;
+        MindTryGetJobId(mindId, out var protoId);
+
+        return (_prototypes.TryIndex<JobPrototype>(protoId, out prototype) || prototype is not null);
+    }
+
+    public bool MindTryGetJobId(
+        [NotNullWhen(true)] EntityUid? mindId,
+        out ProtoId<JobPrototype>? job)
+    {
+        job = null;
+
+        if (mindId is null)
+            return false;
+
+        if (_roles.MindHasRole<JobRoleComponent>(mindId.Value, out var role))
+            job = role.Value.Comp.JobPrototype;
 
-        return TryComp(mindId, out comp) &&
-               comp.Prototype != null &&
-               _prototypes.TryIndex(comp.Prototype, out prototype);
+        return (job is not null);
     }
 
     /// <summary>
@@ -124,7 +148,7 @@ public bool MindTryGetJob(
     /// </summary>
     public bool MindTryGetJobName([NotNullWhen(true)] EntityUid? mindId, out string name)
     {
-        if (MindTryGetJob(mindId, out _, out var prototype))
+        if (MindTryGetJob(mindId, out var prototype))
         {
             name = prototype.LocalizedName;
             return true;
@@ -151,7 +175,7 @@ public bool CanBeAntag(ICommonSession player)
         if (_playerSystem.ContentData(player) is not { Mind: { } mindId })
             return true;
 
-        if (!MindTryGetJob(mindId, out _, out var prototype))
+        if (!MindTryGetJob(mindId, out var prototype))
             return true;
 
         return prototype.CanBeAntag;
diff --git a/Content.Shared/Roles/MindGetAllRolesEvent.cs b/Content.Shared/Roles/MindGetAllRoleInfoEvent.cs
similarity index 79%
rename from Content.Shared/Roles/MindGetAllRolesEvent.cs
rename to Content.Shared/Roles/MindGetAllRoleInfoEvent.cs
index 6987873908..a2f2820b5c 100644
--- a/Content.Shared/Roles/MindGetAllRolesEvent.cs
+++ b/Content.Shared/Roles/MindGetAllRoleInfoEvent.cs
@@ -7,7 +7,7 @@ namespace Content.Shared.Roles;
 /// </summary>
 /// <param name="Roles">The list of roles on the player.</param>
 [ByRefEvent]
-public readonly record struct MindGetAllRolesEvent(List<RoleInfo> Roles);
+public readonly record struct MindGetAllRoleInfoEvent(List<RoleInfo> Roles);
 
 /// <summary>
 ///     Returned by <see cref="MindGetAllRolesEvent"/> to give some information about a player's role.
@@ -17,4 +17,4 @@ namespace Content.Shared.Roles;
 /// <param name="Antagonist">Whether or not this role makes this player an antagonist.</param>
 /// <param name="PlayTimeTrackerId">The <see cref="PlayTimeTrackerPrototype"/> id associated with the role.</param>
 /// <param name="Prototype">The prototype ID of the role</param>
-public readonly record struct RoleInfo(Component Component, string Name, bool Antagonist, string? PlayTimeTrackerId, string Prototype);
+public readonly record struct RoleInfo(string Name, bool Antagonist, string? PlayTimeTrackerId, string Prototype);
diff --git a/Content.Shared/Roles/MindRoleComponent.cs b/Content.Shared/Roles/MindRoleComponent.cs
new file mode 100644
index 0000000000..38b83a8b3f
--- /dev/null
+++ b/Content.Shared/Roles/MindRoleComponent.cs
@@ -0,0 +1,48 @@
+using Content.Shared.Mind;
+using JetBrains.Annotations;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Roles;
+
+/// <summary>
+/// This holds data for, and indicates, a Mind Role entity
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class MindRoleComponent : BaseMindRoleComponent
+{
+    /// <summary>
+    ///     Marks this Mind Role as Antagonist
+    ///     A single antag Mind Role is enough to make the owner mind count as Antagonist.
+    /// </summary>
+    [DataField]
+    public bool Antag { get; set; } = false;
+
+    /// <summary>
+    ///     True if this mindrole is an exclusive antagonist. Antag setting is not checked if this is True.
+    /// </summary>
+    [DataField]
+    public bool ExclusiveAntag { get; set; } = false;
+
+    /// <summary>
+    ///     The Mind that this role belongs to
+    /// </summary>
+    public Entity<MindComponent> Mind { get; set; }
+
+    /// <summary>
+    ///     The Antagonist prototype of this role
+    /// </summary>
+    [DataField]
+    public ProtoId<AntagPrototype>? AntagPrototype { get; set; }
+
+    /// <summary>
+    ///     The Job prototype of this role
+    /// </summary>
+    [DataField]
+    public ProtoId<JobPrototype>? JobPrototype { get; set; }
+}
+
+public abstract partial class BaseMindRoleComponent : Component
+{
+
+}
diff --git a/Content.Shared/Roles/SharedRoleSystem.cs b/Content.Shared/Roles/SharedRoleSystem.cs
index d5ac2e5923..1302fa87ce 100644
--- a/Content.Shared/Roles/SharedRoleSystem.cs
+++ b/Content.Shared/Roles/SharedRoleSystem.cs
@@ -1,87 +1,143 @@
-using System.Linq;
+using System.Diagnostics.CodeAnalysis;
 using Content.Shared.Administration.Logs;
+using Content.Shared.CCVar;
 using Content.Shared.Database;
+using Content.Shared.GameTicking;
 using Content.Shared.Mind;
 using Content.Shared.Roles.Jobs;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
+using Robust.Shared.Configuration;
+using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Utility;
 
 namespace Content.Shared.Roles;
 
 public abstract class SharedRoleSystem : EntitySystem
 {
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
-    [Dependency] private readonly IPrototypeManager _prototypes = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly SharedMindSystem _minds = default!;
-
-    // TODO please lord make role entities
-    private readonly HashSet<Type> _antagTypes = new();
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
+    [Dependency] private readonly IEntityManager _entityManager = default!;
+    [Dependency] private readonly SharedGameTicker _gameTicker = default!;
+    [Dependency] private readonly IPrototypeManager _prototypes = default!;
 
     public override void Initialize()
     {
-        // TODO make roles entities
-        SubscribeLocalEvent<JobComponent, MindGetAllRolesEvent>(OnJobGetAllRoles);
     }
 
-    private void OnJobGetAllRoles(EntityUid uid, JobComponent component, ref MindGetAllRolesEvent args)
+    /// <summary>
+    ///     Adds multiple mind roles to a mind
+    /// </summary>
+    /// <param name="mindId">The mind entity to add the role to</param>
+    /// <param name="roles">The list of mind roles to add</param>
+    /// <param name="mind">If the mind component is provided, it will be checked if it belongs to the mind entity</param>
+    /// <param name="silent">If true, no briefing will be generated upon receiving the mind role</param>
+    public void MindAddRoles(EntityUid mindId,
+        List<ProtoId<EntityPrototype>>? roles,
+        MindComponent? mind = null,
+        bool silent = false)
     {
-        var name = "game-ticker-unknown-role";
-        var prototype = "";
-        string? playTimeTracker = null;
-        if (component.Prototype != null && _prototypes.TryIndex(component.Prototype, out JobPrototype? job))
+        if (roles is null || roles.Count == 0)
+            return;
+
+        foreach (var proto in roles)
         {
-            name = job.Name;
-            prototype = job.ID;
-            playTimeTracker = job.PlayTimeTracker;
+            MindAddRole(mindId, proto, mind, silent);
         }
+    }
 
-        name = Loc.GetString(name);
-
-        args.Roles.Add(new RoleInfo(component, name, false, playTimeTracker, prototype));
+    /// <summary>
+    ///     Adds a mind role to a mind
+    /// </summary>
+    /// <param name="mindId">The mind entity to add the role to</param>
+    /// <param name="protoId">The mind role to add</param>
+    /// <param name="mind">If the mind component is provided, it will be checked if it belongs to the mind entity</param>
+    /// <param name="silent">If true, no briefing will be generated upon receiving the mind role</param>
+    public void MindAddRole(EntityUid mindId,
+        ProtoId<EntityPrototype> protoId,
+        MindComponent? mind = null,
+        bool silent = false)
+    {
+        if (protoId == "MindRoleJob")
+            MindAddJobRole(mindId, mind, silent, "");
+        else
+            MindAddRoleDo(mindId, protoId, mind, silent);
     }
 
-    protected void SubscribeAntagEvents<T>() where T : AntagonistRoleComponent
+    /// <summary>
+    /// Adds a Job mind role with the specified job prototype
+    /// </summary>
+    /// /// <param name="mindId">The mind entity to add the job role to</param>
+    /// <param name="mind">If the mind component is provided, it will be checked if it belongs to the mind entity</param>
+    /// <param name="silent">If true, no briefing will be generated upon receiving the mind role</param>
+    /// <param name="jobPrototype">The Job prototype for the new role</param>
+    public void MindAddJobRole(EntityUid mindId,
+        MindComponent? mind = null,
+        bool silent = false,
+        string? jobPrototype = null)
     {
-        SubscribeLocalEvent((EntityUid _, T component, ref MindGetAllRolesEvent args) =>
+        // Can't have someone get paid for two jobs now, can we
+        if (MindHasRole<JobRoleComponent>(mindId, out var jobRole)
+            && jobRole.Value.Comp.JobPrototype != jobPrototype)
         {
-            var name = "game-ticker-unknown-role";
-            var prototype = "";
-            if (component.PrototypeId != null && _prototypes.TryIndex(component.PrototypeId, out AntagPrototype? antag))
+            Resolve(mindId, ref mind);
+            if (mind is not null)
             {
-                name = antag.Name;
-                prototype = antag.ID;
+                _adminLogger.Add(LogType.Mind,
+                    LogImpact.Low,
+                    $"Job Role of {ToPrettyString(mind.OwnedEntity)} changed from '{jobRole.Value.Comp.JobPrototype}' to '{jobPrototype}'");
             }
-            name = Loc.GetString(name);
-
-            args.Roles.Add(new RoleInfo(component, name, true, null, prototype));
-        });
 
-        SubscribeLocalEvent((EntityUid _, T _, ref MindIsAntagonistEvent args) => { args.IsAntagonist = true; args.IsExclusiveAntagonist |= typeof(T).TryGetCustomAttribute<ExclusiveAntagonistAttribute>(out _); });
-        _antagTypes.Add(typeof(T));
+            jobRole.Value.Comp.JobPrototype = jobPrototype;
+        }
+        else
+            MindAddRoleDo(mindId, "MindRoleJob", mind, silent, jobPrototype);
     }
 
-    public void MindAddRoles(EntityUid mindId, ComponentRegistry components, MindComponent? mind = null, bool silent = false)
+    /// <summary>
+    ///     Creates a Mind Role
+    /// </summary>
+    private void MindAddRoleDo(EntityUid mindId,
+        ProtoId<EntityPrototype> protoId,
+        MindComponent? mind = null,
+        bool silent = false,
+        string? jobPrototype = null)
     {
         if (!Resolve(mindId, ref mind))
+        {
+            Log.Error($"Failed to add role {protoId} to mind {mindId} : Mind does not match provided mind component");
             return;
+        }
 
-        EntityManager.AddComponents(mindId, components);
         var antagonist = false;
-        foreach (var compReg in components.Values)
+
+        if (!_prototypes.TryIndex(protoId, out var protoEnt))
         {
-            var compType = compReg.Component.GetType();
+            Log.Error($"Failed to add role {protoId} to mind {mindId} : Role prototype does not exist");
+            return;
+        }
 
-            var comp = EntityManager.ComponentFactory.GetComponent(compType);
-            if (IsAntagonistRole(comp.GetType()))
-            {
-                antagonist = true;
-                break;
-            }
+        //TODO don't let a prototype being added a second time
+        //If that was somehow to occur, a second mindrole for that comp would be created
+        //Meaning any mind role checks could return wrong results, since they just return the first match they find
+
+        var mindRoleId = Spawn(protoId, MapCoordinates.Nullspace);
+        EnsureComp<MindRoleComponent>(mindRoleId);
+        var mindRoleComp = Comp<MindRoleComponent>(mindRoleId);
+
+        mindRoleComp.Mind = (mindId,mind);
+        if (jobPrototype is not null)
+        {
+            mindRoleComp.JobPrototype = jobPrototype;
+            EnsureComp<JobRoleComponent>(mindRoleId);
         }
 
+        if (mindRoleComp.Antag || mindRoleComp.ExclusiveAntag)
+            antagonist = true;
+
+        mind.MindRoles.Add(mindRoleId);
+
         var mindEv = new MindRoleAddedEvent(silent);
         RaiseLocalEvent(mindId, ref mindEv);
 
@@ -91,157 +147,330 @@ public void MindAddRoles(EntityUid mindId, ComponentRegistry components, MindCom
             RaiseLocalEvent(mind.OwnedEntity.Value, message, true);
         }
 
-        _adminLogger.Add(LogType.Mind, LogImpact.Low,
-            $"Role components {string.Join(components.Keys.ToString(), ", ")} added to mind of {_minds.MindOwnerLoggingString(mind)}");
+        var name = Loc.GetString(protoEnt.Name);
+        if (mind.OwnedEntity is not null)
+        {
+            _adminLogger.Add(LogType.Mind,
+                LogImpact.Low,
+                $"{name} added to mind of {ToPrettyString(mind.OwnedEntity)}");
+        }
+        else
+        {
+            //TODO: This is not tied to the player on the Admin Log filters.
+            //Probably only happens when Job Role is added on initial spawn, before the mind entity is put in a mob
+            _adminLogger.Add(LogType.Mind,
+                LogImpact.Low,
+                $"{name} added to {ToPrettyString(mindId)}");
+        }
     }
 
-    public void MindAddRole(EntityUid mindId, Component component, MindComponent? mind = null, bool silent = false)
+    /// <summary>
+    ///     Removes all instances of a specific role from this mind.
+    /// </summary>
+    /// <param name="mindId">The mind to remove the role from.</param>
+    /// <typeparam name="T">The type of the role to remove.</typeparam>
+    /// <exception cref="ArgumentException">Thrown if the mind does not exist or does not have this role.</exception>
+    /// <returns>Returns False if there was something wrong with the mind or the removal. True if successful</returns>>
+    public bool MindRemoveRole<T>(EntityUid mindId) where T : IComponent
     {
-        if (!Resolve(mindId, ref mind))
-            return;
+        if (!TryComp<MindComponent>(mindId, out var mind) )
+            throw new ArgumentException($"{mindId} does not exist or does not have mind component");
 
-        if (HasComp(mindId, component.GetType()))
+        var found = false;
+        var antagonist = false;
+        var delete = new List<EntityUid>();
+        foreach (var role in mind.MindRoles)
         {
-            throw new ArgumentException($"We already have this role: {component}");
+            if (!HasComp<T>(role))
+                continue;
+
+            var roleComp = Comp<MindRoleComponent>(role);
+            antagonist = roleComp.Antag;
+            _entityManager.DeleteEntity(role);
+
+            delete.Add(role);
+            found = true;
+
         }
 
-        EntityManager.AddComponent(mindId, component);
-        var antagonist = IsAntagonistRole(component.GetType());
+        foreach (var role in delete)
+        {
+            mind.MindRoles.Remove(role);
+        }
 
-        var mindEv = new MindRoleAddedEvent(silent);
-        RaiseLocalEvent(mindId, ref mindEv);
+        if (!found)
+        {
+            throw new ArgumentException($"{mindId} does not have this role: {typeof(T)}");
+        }
+
+        var message = new RoleRemovedEvent(mindId, mind, antagonist);
 
-        var message = new RoleAddedEvent(mindId, mind, antagonist, silent);
         if (mind.OwnedEntity != null)
         {
             RaiseLocalEvent(mind.OwnedEntity.Value, message, true);
         }
-
-        _adminLogger.Add(LogType.Mind, LogImpact.Low,
-            $"'Role {component}' added to mind of {_minds.MindOwnerLoggingString(mind)}");
+        _adminLogger.Add(LogType.Mind,
+            LogImpact.Low,
+            $"'Role {typeof(T).Name}' removed from mind of {ToPrettyString(mind.OwnedEntity)}");
+        return true;
     }
 
     /// <summary>
-    ///     Gives this mind a new role.
+    /// Finds and removes all mind roles of a specific type
     /// </summary>
-    /// <param name="mindId">The mind to add the role to.</param>
-    /// <param name="component">The role instance to add.</param>
-    /// <typeparam name="T">The role type to add.</typeparam>
-    /// <param name="silent">Whether or not the role should be added silently</param>
-    /// <returns>The instance of the role.</returns>
-    /// <exception cref="ArgumentException">
-    ///     Thrown if we already have a role with this type.
-    /// </exception>
-    public void MindAddRole<T>(EntityUid mindId, T component, MindComponent? mind = null, bool silent = false) where T : IComponent, new()
+    /// <param name="mindId">The mind entity</param>
+    /// <typeparam name="T">The type of the role to remove.</typeparam>
+    /// <returns>True if the role existed and was removed</returns>
+    public bool MindTryRemoveRole<T>(EntityUid mindId) where T : IComponent
     {
-        if (!Resolve(mindId, ref mind))
-            return;
-
-        if (HasComp<T>(mindId))
+        if (!MindHasRole<T>(mindId))
         {
-            throw new ArgumentException($"We already have this role: {typeof(T)}");
+            Log.Warning($"Failed to remove role {typeof(T)} from {mindId} : mind does not have role ");
+            return false;
         }
 
-        AddComp(mindId, component);
-        var antagonist = IsAntagonistRole<T>();
+        if (typeof(T) == typeof(MindRoleComponent))
+            return false;
 
-        var mindEv = new MindRoleAddedEvent(silent);
-        RaiseLocalEvent(mindId, ref mindEv);
+        return MindRemoveRole<T>(mindId);
+    }
 
-        var message = new RoleAddedEvent(mindId, mind, antagonist, silent);
-        if (mind.OwnedEntity != null)
+    /// <summary>
+    /// Finds the first mind role of a specific T type on a mind entity.
+    /// Outputs entity components for the mind role's MindRoleComponent and for T
+    /// </summary>
+    /// <param name="mindId">The mind entity</param>
+    /// <typeparam name="T">The type of the role to find.</typeparam>
+    /// <param name="role">The Mind Role entity component</param>
+    /// <param name="roleT">The Mind Role's entity component for T</param>
+    /// <returns>True if the role is found</returns>
+    public bool MindHasRole<T>(EntityUid mindId,
+        [NotNullWhen(true)] out Entity<MindRoleComponent>? role,
+        [NotNullWhen(true)] out Entity<T>? roleT) where T : IComponent
+    {
+        role = null;
+        roleT = null;
+
+        if (!TryComp<MindComponent>(mindId, out var mind))
+            return false;
+
+        var found = false;
+
+        foreach (var roleEnt in mind.MindRoles)
         {
-            RaiseLocalEvent(mind.OwnedEntity.Value, message, true);
+            if (!HasComp<T>(roleEnt))
+                continue;
+
+            role = (roleEnt,Comp<MindRoleComponent>(roleEnt));
+            roleT = (roleEnt,Comp<T>(roleEnt));
+            found = true;
+            break;
         }
 
-        _adminLogger.Add(LogType.Mind, LogImpact.Low,
-            $"'Role {typeof(T).Name}' added to mind of {_minds.MindOwnerLoggingString(mind)}");
+        return found;
     }
 
     /// <summary>
-    ///     Removes a role from this mind.
+    /// Finds the first mind role of a specific type on a mind entity.
+    /// Outputs an entity component for the mind role's MindRoleComponent
     /// </summary>
-    /// <param name="mindId">The mind to remove the role from.</param>
-    /// <typeparam name="T">The type of the role to remove.</typeparam>
-    /// <exception cref="ArgumentException">
-    ///     Thrown if we do not have this role.
-    /// </exception>
-    public void MindRemoveRole<T>(EntityUid mindId) where T : IComponent
+    /// <param name="mindId">The mind entity</param>
+    /// <param name="type">The Type to look for</param>
+    /// <param name="role">The output role</param>
+    /// <returns>True if the role is found</returns>
+    public bool MindHasRole(EntityUid mindId,
+        Type type,
+        [NotNullWhen(true)] out Entity<MindRoleComponent>? role)
     {
-        if (!RemComp<T>(mindId))
+        role = null;
+        // All MindRoles have this component, it would just return the first one.
+        // Order might not be what is expected.
+        // Better to report null
+        if (type == Type.GetType("MindRoleComponent"))
         {
-            throw new ArgumentException($"We do not have this role: {typeof(T)}");
+            Log.Error($"Something attempted to query mind role 'MindRoleComponent' on mind {mindId}. This component is present on every single mind role.");
+            return false;
         }
 
-        var mind = Comp<MindComponent>(mindId);
-        var antagonist = IsAntagonistRole<T>();
-        var message = new RoleRemovedEvent(mindId, mind, antagonist);
+        if (!TryComp<MindComponent>(mindId, out var mind))
+            return false;
 
-        if (mind.OwnedEntity != null)
+        var found = false;
+
+        foreach (var roleEnt in mind.MindRoles)
         {
-            RaiseLocalEvent(mind.OwnedEntity.Value, message, true);
+            if (!HasComp(roleEnt, type))
+                continue;
+
+            role = (roleEnt,Comp<MindRoleComponent>(roleEnt));
+            found = true;
+            break;
         }
-        _adminLogger.Add(LogType.Mind, LogImpact.Low,
-            $"'Role {typeof(T).Name}' removed from mind of {_minds.MindOwnerLoggingString(mind)}");
+
+        return found;
     }
 
-    public bool MindTryRemoveRole<T>(EntityUid mindId) where T : IComponent
+    /// <summary>
+    /// Finds the first mind role of a specific type on a mind entity.
+    /// Outputs an entity component for the mind role's MindRoleComponent
+    /// </summary>
+    /// <param name="mindId">The mind entity</param>
+    /// <param name="role">The Mind Role entity component</param>
+    /// <typeparam name="T">The type of the role to find.</typeparam>
+    /// <returns>True if the role is found</returns>
+    public bool MindHasRole<T>(EntityUid mindId,
+        [NotNullWhen(true)] out Entity<MindRoleComponent>? role) where T : IComponent
     {
-        if (!MindHasRole<T>(mindId))
-            return false;
-
-        MindRemoveRole<T>(mindId);
-        return true;
+        return MindHasRole<T>(mindId, out role, out _);
     }
 
+    /// <summary>
+    /// Finds the first mind role of a specific type on a mind entity.
+    /// </summary>
+    /// <param name="mindId">The mind entity</param>
+    /// <typeparam name="T">The type of the role to find.</typeparam>
+    /// <returns>True if the role is found</returns>
     public bool MindHasRole<T>(EntityUid mindId) where T : IComponent
     {
-        DebugTools.Assert(HasComp<MindComponent>(mindId));
-        return HasComp<T>(mindId);
+        return MindHasRole<T>(mindId, out _, out _);
     }
 
-    public List<RoleInfo> MindGetAllRoles(EntityUid mindId)
+    //TODO: Delete this later
+    /// <summary>
+    /// Returns the first mind role of a specific type
+    /// </summary>
+    /// <param name="mindId">The mind entity</param>
+    /// <returns>Entity Component of the mind role</returns>
+    [Obsolete("Use MindHasRole's output value")]
+    public Entity<MindRoleComponent>? MindGetRole<T>(EntityUid mindId) where T : IComponent
     {
-        DebugTools.Assert(HasComp<MindComponent>(mindId));
-        var ev = new MindGetAllRolesEvent(new List<RoleInfo>());
-        RaiseLocalEvent(mindId, ref ev);
-        return ev.Roles;
+        Entity<MindRoleComponent>? result = null;
+
+        var mind = Comp<MindComponent>(mindId);
+
+        foreach (var uid in mind.MindRoles)
+        {
+            if (HasComp<T>(uid) && TryComp<MindRoleComponent>(uid, out var comp))
+                result = (uid,comp);
+        }
+        return result;
     }
 
+    /// <summary>
+    /// Reads all Roles of a mind Entity and returns their data as RoleInfo
+    /// </summary>
+    /// <param name="mindId">The mind entity</param>
+    /// <returns>RoleInfo list</returns>
+    public List<RoleInfo> MindGetAllRoleInfo(EntityUid mindId)
+    {
+        var roleInfo = new List<RoleInfo>();
+
+        if (!TryComp<MindComponent>(mindId, out var mind))
+            return roleInfo;
+
+        foreach (var role in mind.MindRoles)
+        {
+            var valid = false;
+            var name = "game-ticker-unknown-role";
+            var prototype = "";
+           string? playTimeTracker = null;
+
+            var comp = Comp<MindRoleComponent>(role);
+            if (comp.AntagPrototype is not null)
+            {
+                prototype = comp.AntagPrototype;
+            }
+
+            if (comp.JobPrototype is not null && comp.AntagPrototype is null)
+            {
+                prototype = comp.JobPrototype;
+                if (_prototypes.TryIndex(comp.JobPrototype, out var job))
+                {
+                    playTimeTracker = job.PlayTimeTracker;
+                    name = job.Name;
+                    valid = true;
+                }
+                else
+                {
+                    Log.Error($" Mind Role Prototype '{role.Id}' contains invalid Job prototype: '{comp.JobPrototype}'");
+                }
+            }
+            else if (comp.AntagPrototype is not null && comp.JobPrototype is null)
+            {
+                prototype = comp.AntagPrototype;
+                if (_prototypes.TryIndex(comp.AntagPrototype, out var antag))
+                {
+                    name = antag.Name;
+                    valid = true;
+                }
+                else
+                {
+                    Log.Error($" Mind Role Prototype '{role.Id}' contains invalid Antagonist prototype: '{comp.AntagPrototype}'");
+                }
+            }
+            else if (comp.JobPrototype is not null && comp.AntagPrototype is not null)
+            {
+                Log.Error($" Mind Role Prototype '{role.Id}' contains both Job and Antagonist prototypes");
+            }
+
+            if (valid)
+                roleInfo.Add(new RoleInfo(name, comp.Antag || comp.ExclusiveAntag , playTimeTracker, prototype));
+        }
+        return roleInfo;
+    }
+
+    /// <summary>
+    /// Does this mind possess an antagonist role
+    /// </summary>
+    /// <param name="mindId">The mind entity</param>
+    /// <returns>True if the mind possesses any antag roles</returns>
     public bool MindIsAntagonist(EntityUid? mindId)
     {
-        if (mindId == null)
+        if (mindId is null)
+        {
+            Log.Warning($"Antagonist status of mind entity {mindId} could not be determined - mind entity not found");
             return false;
+        }
 
-        DebugTools.Assert(HasComp<MindComponent>(mindId));
-        var ev = new MindIsAntagonistEvent();
-        RaiseLocalEvent(mindId.Value, ref ev);
-        return ev.IsAntagonist;
+        return CheckAntagonistStatus(mindId.Value).Item1;
     }
 
     /// <summary>
     /// Does this mind possess an exclusive antagonist role
     /// </summary>
     /// <param name="mindId">The mind entity</param>
-    /// <returns>True if the mind possesses an exclusive antag role</returns>
+    /// <returns>True if the mind possesses any exclusive antag roles</returns>
     public bool MindIsExclusiveAntagonist(EntityUid? mindId)
     {
-        if (mindId == null)
+        if (mindId is null)
+        {
+            Log.Warning($"Antagonist status of mind entity {mindId} could not be determined - mind entity not found");
             return false;
+        }
 
-        var ev = new MindIsAntagonistEvent();
-        RaiseLocalEvent(mindId.Value, ref ev);
-        return ev.IsExclusiveAntagonist;
+        return CheckAntagonistStatus(mindId.Value).Item2;
     }
 
-    public bool IsAntagonistRole<T>()
-    {
-        return _antagTypes.Contains(typeof(T));
-    }
+   private (bool, bool) CheckAntagonistStatus(EntityUid mindId)
+   {
+       if (!TryComp<MindComponent>(mindId, out var mind))
+       {
+           Log.Warning($"Antagonist status of mind entity {mindId} could not be determined - mind component not found");
+           return (false, false);
+       }
 
-    public bool IsAntagonistRole(Type component)
-    {
-        return _antagTypes.Contains(component);
+        var antagonist = false;
+        var exclusiveAntag = false;
+        foreach (var role in mind.MindRoles)
+        {
+            var roleComp = Comp<MindRoleComponent>(role);
+            if (roleComp.Antag || exclusiveAntag)
+                antagonist = true;
+            if (roleComp.ExclusiveAntag)
+                exclusiveAntag = true;
+        }
+
+        return (antagonist, exclusiveAntag);
     }
 
     /// <summary>
diff --git a/Content.Shared/Silicons/Bots/PlantbotComponent.cs b/Content.Shared/Silicons/Bots/PlantbotComponent.cs
new file mode 100644
index 0000000000..5c665462d9
--- /dev/null
+++ b/Content.Shared/Silicons/Bots/PlantbotComponent.cs
@@ -0,0 +1,38 @@
+using Robust.Shared.Audio;
+
+namespace Content.Shared.Silicons.Bots;
+
+/// <summary>
+/// Used by the server for NPC Plantbot servicing.
+/// Currently no clientside prediction done, only exists in shared for emag handling.
+/// </summary>
+[RegisterComponent]
+[Access(typeof(PlantbotSystem))]
+public sealed partial class PlantbotComponent : Component
+{
+    /// <summary>
+    /// Sound played after watering a plantHolder.
+    /// </summary>
+    [DataField]
+    public SoundSpecifier WaterSound = new SoundPathSpecifier("/Audio/Effects/Fluids/watersplash.ogg");
+
+    /// <summary>
+    /// Sound played after weeding a plantHolder.
+    /// </summary>
+    [DataField]
+    public SoundSpecifier WeedSound = new SoundPathSpecifier("/Audio/Effects/plant_rustle.ogg");
+
+    /// <summary>
+    /// Sound played after draining a plantHolder.
+    /// </summary>
+    [DataField]
+    public SoundSpecifier RemoveWaterSound = new SoundPathSpecifier("/Audio/Items/drink.ogg");
+
+    [DataField]
+    public SoundSpecifier EmagSparkSound = new SoundCollectionSpecifier("sparks")
+    {
+        Params = AudioParams.Default.WithVolume(8f)
+    };
+
+    public bool IsEmagged = false;
+}
diff --git a/Content.Shared/Silicons/Bots/PlantbotSystem.cs b/Content.Shared/Silicons/Bots/PlantbotSystem.cs
new file mode 100644
index 0000000000..3f4e5ad23d
--- /dev/null
+++ b/Content.Shared/Silicons/Bots/PlantbotSystem.cs
@@ -0,0 +1,27 @@
+using Content.Shared.Emag.Systems;
+using Robust.Shared.Audio.Systems;
+
+namespace Content.Shared.Silicons.Bots;
+
+/// <summary>
+/// Handles emagging Plantbots
+/// </summary>
+public sealed class PlantbotSystem : EntitySystem
+{
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<PlantbotComponent, GotEmaggedEvent>(OnEmagged);
+    }
+
+    private void OnEmagged(EntityUid uid, PlantbotComponent comp, ref GotEmaggedEvent args)
+    {
+        _audio.PlayPredicted(comp.EmagSparkSound, uid, args.UserUid);
+
+        comp.IsEmagged = true;
+        args.Handled = true;
+    }
+}
diff --git a/Content.Shared/Stealth/Components/BreakStealthOnAttackComponent.cs b/Content.Shared/Stealth/Components/BreakStealthOnAttackComponent.cs
new file mode 100644
index 0000000000..ce92ee92c1
--- /dev/null
+++ b/Content.Shared/Stealth/Components/BreakStealthOnAttackComponent.cs
@@ -0,0 +1,6 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Stealth.Components;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class BreakStealthOnAttackComponent : Component { }
diff --git a/Content.Shared/Stealth/SharedStealthSystem.cs b/Content.Shared/Stealth/SharedStealthSystem.cs
index cdb1ef87ca..e66a36f741 100644
--- a/Content.Shared/Stealth/SharedStealthSystem.cs
+++ b/Content.Shared/Stealth/SharedStealthSystem.cs
@@ -1,7 +1,10 @@
 using Content.Shared.Examine;
+using Content.Shared.Interaction.Events;
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Stealth.Components;
+using Content.Shared.Throwing;
+using Content.Shared.Weapons.Ranged.Events;
 using Robust.Shared.GameStates;
 using Robust.Shared.Timing;
 
@@ -25,6 +28,9 @@ public override void Initialize()
         SubscribeLocalEvent<StealthComponent, ExamineAttemptEvent>(OnExamineAttempt);
         SubscribeLocalEvent<StealthComponent, ExaminedEvent>(OnExamined);
         SubscribeLocalEvent<StealthComponent, MobStateChangedEvent>(OnMobStateChanged);
+        SubscribeLocalEvent<BreakStealthOnAttackComponent, BeforeThrowEvent>(OnThrow);
+        SubscribeLocalEvent<BreakStealthOnAttackComponent, AttackAttemptEvent>(OnAttack);
+        SubscribeLocalEvent<BreakStealthOnAttackComponent, ShotAttemptedEvent>(OnShoot);
     }
 
     private void OnExamineAttempt(EntityUid uid, StealthComponent component, ExamineAttemptEvent args)
@@ -188,6 +194,19 @@ public float GetVisibility(EntityUid uid, StealthComponent? component = null)
         return Math.Clamp(component.LastVisibility + ev.FlatModifier, component.MinVisibility, component.MaxVisibility);
     }
 
+    private void OnThrow(EntityUid uid, BreakStealthOnAttackComponent stealth, BeforeThrowEvent args) => BreakStealth(uid);
+    private void OnAttack(EntityUid uid, BreakStealthOnAttackComponent stealth, AttackAttemptEvent args) => BreakStealth(uid);
+    private void OnShoot(EntityUid uid, BreakStealthOnAttackComponent stealth, ShotAttemptedEvent args) => BreakStealth(uid);
+
+    public void BreakStealth(EntityUid uid)
+    {
+        if (!TryComp(uid, out StealthComponent? stealth))
+            return;
+
+        BreakStealth(uid, stealth);
+    }
+    public void BreakStealth(EntityUid uid, StealthComponent stealth) => ModifyVisibility(uid, stealth.MaxVisibility, stealth);
+
     /// <summary>
     ///     Used to run through any stealth effecting components on the entity.
     /// </summary>
diff --git a/Content.Shared/Verbs/VerbCategory.cs b/Content.Shared/Verbs/VerbCategory.cs
index be35479a36..a32b2fa330 100644
--- a/Content.Shared/Verbs/VerbCategory.cs
+++ b/Content.Shared/Verbs/VerbCategory.cs
@@ -102,6 +102,8 @@ public VerbCategory(string text, SpriteSpecifier? sprite, bool iconsOnly = false
 
         public static readonly VerbCategory SelectFaction = new("verb-categories-select-faction");
 
+        public static readonly VerbCategory Rename = new("verb-categories-rename");
+
         public static readonly VerbCategory PowerLevel = new("verb-categories-power-level");
 
         public static readonly VerbCategory Interaction = new("verb-categories-interaction");
diff --git a/Content.Shared/WhiteDream/BloodCult/BloodCultist/BloodCultistRoleComponent.cs b/Content.Shared/WhiteDream/BloodCult/BloodCultist/BloodCultistRoleComponent.cs
index acbb92bba4..128ba148ec 100644
--- a/Content.Shared/WhiteDream/BloodCult/BloodCultist/BloodCultistRoleComponent.cs
+++ b/Content.Shared/WhiteDream/BloodCult/BloodCultist/BloodCultistRoleComponent.cs
@@ -3,4 +3,4 @@
 namespace Content.Shared.WhiteDream.BloodCult.BloodCultist;
 
 [RegisterComponent]
-public sealed partial class BloodCultistRoleComponent : AntagonistRoleComponent;
+public sealed partial class BloodCultistRoleComponent : BaseMindRoleComponent;
diff --git a/Content.Shared/Whitelist/EntityWhitelist.cs b/Content.Shared/Whitelist/EntityWhitelist.cs
index 3e4e2fecb2..cbe4633360 100644
--- a/Content.Shared/Whitelist/EntityWhitelist.cs
+++ b/Content.Shared/Whitelist/EntityWhitelist.cs
@@ -32,6 +32,12 @@ public sealed partial class EntityWhitelist
     [DataField] public string[]? Components;
     // TODO yaml validation
 
+    /// <summary>
+    ///     Mind Role Prototype names that are allowed in the whitelist.
+    /// </summary>
+    [DataField] public string[]? MindRoles;
+    // TODO yaml validation
+
     /// <summary>
     ///     Item sizes that are allowed in the whitelist.
     /// </summary>
diff --git a/Content.Shared/Whitelist/EntityWhitelistSystem.cs b/Content.Shared/Whitelist/EntityWhitelistSystem.cs
index f311946cf9..b09c9d3875 100644
--- a/Content.Shared/Whitelist/EntityWhitelistSystem.cs
+++ b/Content.Shared/Whitelist/EntityWhitelistSystem.cs
@@ -1,5 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using Content.Shared.Item;
+using Content.Shared.Roles;
 using Content.Shared.Tag;
 
 namespace Content.Shared.Whitelist;
@@ -23,15 +24,56 @@ public bool IsValid(EntityWhitelist list, [NotNullWhen(true)] EntityUid? uid)
         return uid != null && IsValid(list, uid.Value);
     }
 
+    /// <summary>
+    /// Checks whether a given entity is allowed by a whitelist and not blocked by a blacklist.
+    /// If a blacklist is provided and it matches then this returns false.
+    /// If a whitelist is provided and it does not match then this returns false.
+    /// If either list is null it does not get checked.
+    /// </summary>
+    public bool CheckBoth([NotNullWhen(true)] EntityUid? uid, EntityWhitelist? blacklist = null, EntityWhitelist? whitelist = null)
+    {
+        if (uid == null)
+            return false;
+
+        if (blacklist != null && IsValid(blacklist, uid))
+            return false;
+
+        return whitelist == null || IsValid(whitelist, uid);
+    }
+
     /// <summary>
     /// Checks whether a given entity satisfies a whitelist.
     /// </summary>
     public bool IsValid(EntityWhitelist list, EntityUid uid)
     {
         if (list.Components != null)
-            EnsureRegistrations(list);
+        {
+            if (list.Registrations == null)
+            {
+                var regs = StringsToRegs(list.Components);
+                list.Registrations = new List<ComponentRegistration>();
+                list.Registrations.AddRange(regs);
+            }
+        }
+
+        if (list.MindRoles != null)
+        {
+            var regs = StringsToRegs(list.MindRoles);
+            var roles = EntityManager.System<SharedRoleSystem>();
+
+            foreach (var role in regs)
+            {
+                if (roles.MindHasRole(uid, role.Type, out _))
+                {
+                    if (!list.RequireAll)
+                        return true;
+                }
+                else if (list.RequireAll)
+                    return false;
+            }
+        }
 
-        if (list.Registrations != null)
+        if (list.Registrations != null && list.Registrations.Count > 0)
         {
             foreach (var reg in list.Registrations)
             {
@@ -136,7 +178,7 @@ public bool IsBlacklistPassOrNull(EntityWhitelist? blacklist, EntityUid uid)
         return IsWhitelistPassOrNull(blacklist, uid);
     }
 
-    /// <summary>                                        
+    /// <summary>
     /// Helper function to determine if Blacklist is either null or the entity is not on the list
     /// Duplicate of equivalent Whitelist function
     /// </summary>
@@ -145,24 +187,27 @@ public bool IsBlacklistFailOrNull(EntityWhitelist? blacklist, EntityUid uid)
         return IsWhitelistFailOrNull(blacklist, uid);
     }
 
-    private void EnsureRegistrations(EntityWhitelist list)
+    private List<ComponentRegistration> StringsToRegs(string[]? input)
     {
-        if (list.Components == null)
-            return;
+        var list = new List<ComponentRegistration>();
+
+        if (input == null || input.Length == 0)
+            return list;
 
-        list.Registrations = new List<ComponentRegistration>();
-        foreach (var name in list.Components)
+        foreach (var name in input)
         {
             var availability = _factory.GetComponentAvailability(name);
             if (_factory.TryGetRegistration(name, out var registration)
                 && availability == ComponentAvailability.Available)
             {
-                list.Registrations.Add(registration);
+                list.Add(registration);
             }
             else if (availability == ComponentAvailability.Unknown)
             {
-                Log.Warning($"Unknown component name {name} passed to EntityWhitelist!");
+                Log.Error($"StringsToRegs failed: Unknown component name {name} passed to EntityWhitelist!");
             }
         }
+
+        return list;
     }
 }
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 6151848c9e..7e4f325230 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -11935,3 +11935,240 @@ Entries:
   id: 6869
   time: '2025-02-18T01:05:52.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/1730
+- author: VMSolidus
+  changes:
+    - type: Add
+      message: >-
+        Ported the Cybersun Stealthsuit from Goobstation, with some updates for
+        the EE Codebase.
+  id: 6870
+  time: '2025-02-20T03:41:28.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1807
+- author: GNUtopia
+  changes:
+    - type: Tweak
+      message: Made Muted give sign language
+    - type: Tweak
+      message: Blacklisted muted characters from taking sign language
+    - type: Fix
+      message: Blacklisted muted characters from taking Singer or Lyrebird
+  id: 6871
+  time: '2025-02-20T03:55:29.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1823
+- author: sleepyyapril
+  changes:
+    - type: Fix
+      message: Ported fix for high lighting quality
+  id: 6872
+  time: '2025-02-21T02:33:19.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1829
+- author: VMSolidus
+  changes:
+    - type: Fix
+      message: >-
+        Singularity shouldn't escape its containment anymore. If it's still
+        escaping containment, do me a favor and revert PR 1619 (Newtonian
+        Singularity)
+  id: 6873
+  time: '2025-02-21T08:01:55.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1830
+- author: Sarahon
+  changes:
+    - type: Tweak
+      message: Humans now have a larger variety of ears
+  id: 6874
+  time: '2025-02-21T14:26:05.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1818
+- author: VMSolidus
+  changes:
+    - type: Add
+      message: >-
+        Added "Blueshield primary weapon" loadout group. His primary selection
+        currently consists of the classic Chester rifle, an energy shield, and
+        an R25.
+  id: 6875
+  time: '2025-02-21T14:27:33.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1816
+- author: VMSolidus
+  changes:
+    - type: Add
+      message: >-
+        Added handgun manufacturing to Arsenal research. Most firearms made this
+        way require Aluminium mined from planets to manufacture.
+    - type: Add
+      message: 'The BRDI-R25 rifle can now be purchased via cargo. '
+  id: 6876
+  time: '2025-02-21T14:34:14.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1810
+- author: Timfa2112
+  changes:
+    - type: Tweak
+      message: Allow renaming robots and pAI
+  id: 6877
+  time: '2025-02-21T16:24:25.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1821
+- author: Timfa2112
+  changes:
+    - type: Add
+      message: Added Plantbot
+  id: 6878
+  time: '2025-02-21T16:46:25.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1831
+- author: EctoplasmIsGood
+  changes:
+    - type: Tweak
+      message: Advanced Industrial welder from 250 capacity to 500
+    - type: Tweak
+      message: Advanced Industrial welder from 1.3x speed to 1.5x speed
+    - type: Tweak
+      message: Experimental welder from 1000 capacity to 200
+    - type: Tweak
+      message: Experimental welder from 1u of welder fuel generated to 0.5u
+    - type: Tweak
+      message: Experimental welder from 1x speed to 2x speed
+  id: 6879
+  time: '2025-02-22T03:46:30.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1832
+- author: Timfa2112
+  changes:
+    - type: Tweak
+      message: >-
+        Weldbots can now fix specific structures, like windows and grounding
+        rods.
+  id: 6880
+  time: '2025-02-22T18:08:01.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1838
+- author: Timfa2112
+  changes:
+    - type: Tweak
+      message: >-
+        Tweaked Tricordrazine to heal MINOR amounts of radiation damage. This
+        includes Medibots. If it's more than a teeny tiny amount, go to medical!
+        This also alleviates the issue where the medibot keeps pestering you
+        about the 0.1 rad damage because it thinks it can heal it, while the
+        medicine it'll inject (before this change) didn't actually do anything.
+  id: 6881
+  time: '2025-02-24T00:21:05.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1840
+- author: Timfa2112
+  changes:
+    - type: Add
+      message: Added cloth wraps to hands loadouts
+  id: 6882
+  time: '2025-02-25T02:16:52.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1841
+- author: EctoplasmIsGood
+  changes:
+    - type: Tweak
+      message: Holoparasite melee damage from 20 blunt to 10 blunt
+    - type: Tweak
+      message: Holoparasite melee speed from 1.8 to 0.3
+  id: 6883
+  time: '2025-02-25T05:22:08.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1843
+- author: Diggy
+  changes:
+    - type: Tweak
+      message: Tweaked the nano bot trait value from 0,9 to 0,6.
+    - type: Fix
+      message: Bionic legs DO work now, yay.
+  id: 6884
+  time: '2025-02-25T14:39:19.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1833
+- author: LaryNevesPR
+  changes:
+    - type: Fix
+      message: Fixed tendons not causing damage! Careful!
+  id: 6885
+  time: '2025-02-25T22:06:27.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1835
+- author: Tonk
+  changes:
+    - type: Add
+      message: 'Tajarans now have separate eye, wrist, tattoo, and makeup markings '
+  id: 6886
+  time: '2025-02-27T00:03:30.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1834
+- author: Raikyr0
+  changes:
+    - type: Tweak
+      message: >-
+        Striking Calluses no longer require you to be one of 3 jobs and Human. 
+        Also increased the +1 damage to +2.
+    - type: Tweak
+      message: >-
+        Bionic Spinarette SHOULD no longer have a hunger penalty and costs
+        less. 
+    - type: Tweak
+      message: >-
+        Platelet Factories heal rate buffed from 0.07 to 0.35, airloss from 0.7
+        to 0.25 and healing cap increased from 200 to 400.
+    - type: Tweak
+      message: Decreased the cost of Thermal Vision to be in line with Night Vision.
+    - type: Tweak
+      message: IPC Platelet Factories healing cap increased from 200 to 250
+    - type: Tweak
+      message: Cyber-Eyes Omnihud now pickable by Command too.
+    - type: Fix
+      message: >-
+        Fixed name and description of Cyber-Eyes Modules for Night Vision and
+        Thermal Vision.
+    - type: Remove
+      message: Mind over Machine from Cyber-Eyes Modules.
+  id: 6887
+  time: '2025-02-27T02:27:48.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1828
+- author: ShirouAjisai
+  changes:
+    - type: Add
+      message: Added Shadowkin plushie to crates and stuff
+    - type: Tweak
+      message: Tweaked Shadowkin age brackets
+  id: 6888
+  time: '2025-02-27T03:39:43.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1684
+- author: Raikyr0
+  changes:
+    - type: Add
+      message: TraitAddTag Function
+  id: 6889
+  time: '2025-02-27T04:52:38.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1846
+- author: Raikyr0
+  changes:
+    - type: Add
+      message: Added SpiderCraft to Arachne
+  id: 6890
+  time: '2025-02-27T07:02:55.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1847
+- author: Timfa2112
+  changes:
+    - type: Add
+      message: >-
+        Added CentCom disabler as loadout option for the Nanotrasen
+        Representative.
+  id: 6891
+  time: '2025-02-27T18:48:23.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1845
+- author: Timfa2112
+  changes:
+    - type: Add
+      message: Port Plant Analyzer from botanySupremacist, who took it from ian321
+  id: 6892
+  time: '2025-03-01T17:15:38.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1849
+- author: VMSolidus
+  changes:
+    - type: Add
+      message: >-
+        A new Midround Antagonist has been added to the game. The "Solarian
+        Deserters" are a group of highly trained soldiers who haven't been paid
+        for far too long, whom have come to the station to loot it for
+        everything valuable. 
+    - type: Add
+      message: >-
+        Lore guidebook entry for the Solarian Alliance, a majorly antagonistic
+        faction. 
+  id: 6893
+  time: '2025-03-01T22:19:22.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1851
diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt
index d6ef2be39c..a7c4702877 100644
--- a/Resources/Credits/GitHub.txt
+++ b/Resources/Credits/GitHub.txt
@@ -1 +1 @@
-0x6273, 13spacemen, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 2digitman, 4310v343k, 4dplanner, 612git, 778b, Ablankmann, abregado, Absolute-Potato, Acruid, actioninja, actually-reb, ada-please, adamsong, Adeinitas, Admiral-Obvious-001, adrian, Adrian16199, Aerocrux, Aexolott, Aexxie, africalimedrop, afrokada, Agoichi, Ahion, Aidenkrz, Aikakakah, aitorlogedo, ajcm, AJCM-git, AjexRose, Alekshhh, alexkar598, AlexMorgan3817, alexumandxgabriel08x, Alithsko, ALMv1, AlphaQwerty, Altoids1, amylizzle, ancientpower, Andre19926, AndrewEyeke, angelofallars, Anzarot121, Appiah, ar4ill, ArchPigeon, ArchRBX, areitpog, Arendian, arimah, Arkanic, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, aspiringlich, astriloqua, avalon, avghdev, AzzyIsNotHere, BananaFlambe, BasedPugilist, BasedUser, beck-thompson, benev0, BGare, bhespiritu, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blitzthesquishy, bloodrizer, Bloody2372, blueDev2, BlueHNT, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, BombasterDS, boogiebogus, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, Bribrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, byondfuckery, c0rigin, c4llv07e, CaasGit, capnsockless, CaptainSqrBeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, CatTheSystem, Centronias, CerberusWolfie, chairbender, Charlese2, chavonadelal, Cheackraze, cheesePizza2, Chief-Engineer, christhirtle, chromiumboy, Chronophylos, Chubbygummibear, CilliePaint, civilCornball, Clement-O, clyf, Clyybber, CMDR-Piboy314, CodedCrow, Cohnway, cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, coolmankid12345, corentt, CormosLemming, CrafterKolyan, crazybrain23, creadth, CrigCrag, croilbird, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, DangerRevolution, daniel-cr, DanSAussieITS, Daracke, DarkenedSynergy, Darkenson, DawBla, Daxxi3, dch-GH, Deahaka, dean, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, Deeeeja, deepdarkdepths, degradka, Delete69, deltanedas, DeltaV-Bot, DerbyX, derek, dersheppard, dexlerxd, dffdff2423, dge21, diggy0, digitalic, DinoWattz, DisposableCrewmember42, DJB1gYAPPA, DjfjdfofdjfjD, DocNITE, DoctorBeard, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, dootythefrooty, Dorragon, Doru991, DoubleRiceEddiedd, DoutorWhite, drakewill-CRL, Drayff, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, dukevanity, Dutch-VanDerLinde, dvir001, dylanstrategie, Dynexust, Easypoller, eclips_e, EctoplasmIsGood, eden077, EEASAS, Efruit, efzapa, ElectroSR, elsie, elthundercloud, Emisse, emmafornash, EmoGarbage404, Endecc, eoineoineoin, Erisfiregamer1, ERORR404V1, Errant-4, esguard, estacaoespacialpirata, eugene, Evgencheg, ewokswagger, exincore, exp111, f0x-n3rd, FacePluslll, Fahasor, FairlySadPanda, Fansana, Feluk6174, fenndragon, ficcialfaint, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, FirinMaLazors, Fishfish458, fl-oz, Flareguy, FluffiestFloof, FluffMe, FluidRock, flybik, flyingkarii, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, Fouin, foxhorn, FoxxoTrystan, freeman2651, freeze2222, Froffy025, Fromoriss, froozigiusz, FrostMando, FryOfDestiny, FungiFellow, GalacticChimp, gamer3107, Gaxeer, gbasood, gcoremans, Geekyhobo, genderGeometries, GeneralGaws, Genkail, geraeumig, Ghagliiarghii, ghost581x, Git-Nivrak, gituhabu, GlassEclipse, gluesniffler, GNF54, GNUtopia, Golinth, GoodWheatley, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, greggthefather, GreyMario, GTRsound, Guess-My-Name, gusxyz, h3half, Haltell, Hanzdegloker, Hardly3D, harikattar, Hebi, Henry, HerCoyote23, hiucko, Hmeister-fake, Hmeister-real, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, hubismal, Hugal31, Huxellberger, Hyenh, i-justuser-i, iacore, IamVelcroboy, icekot8, icesickleone, Ichaie, iczero, iglov, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, indeano, Injazz, Insineer, IntegerTempest, Interrobang01, Intoxicating-Innocence, IProduceWidgets, ItsMeThom, Itzbenz, Jackal298, Jackrost, jacksonzck, Jackw2As, jamessimo, janekvap, Jark255, Jaskanbe, JasperJRoth, jerryimmouse, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, JoeHammad1844, JohnGinnane, johnku1, joshepvodka, Jrpl, jukereise, juliangiebel, juniwoofs, justart1m, JustCone14, justin, justintether, JustinTrotter, justtne, K-Dynamic, k3yw, Kadeo64, KaiShibaa, kalane15, kalanosh, Kanashi-Panda, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, Kimpes, KingFroozy, kira-er, Kirillcas, Kistras, Kit0vras, KittenColony, klaypexx, Kmc2000, Ko4ergaPunk, kognise, komunre, KonstantinAngelov, koteq, Kr8art, Krunklehorn, Kukutis96513, Kupie, kxvvv, Kyoth25f, kzhanik, lajolico, Lamrr, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leander-0, leonardo-dabepis, leonsfriedrich, LetterN, lettern, Level10Cybermancer, LEVELcat, lever1209, Lgibb18, LightVillet, liltenhead, LinkUyx, LittleBuilderJane, lizelive, lleftTheDragon, localcc, Lomcastar, lonoferars, LordCarve, LordEclipse, LovelyLophi, luckyshotpictures, LudwigVonChesterfield, Lukasz825700516, Lumminal, lunarcomets, luringens, lvvova1, Lyndomen, lzimann, lzk228, M3739, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, MagnusCrowe, malchanceux, MaloTV, ManelNavola, Mangohydra, marboww, Markek1, Matz05, max, MaxNox7, MehimoNemo, MeltedPixel, MemeProof, MendaxxDev, Menshin, Mephisto72, Mervill, metalgearsloth, mhamsterr, michaelcu, micheel665, Mike32oz, MilenVolf, milon, MilonPL, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MisterMecky, Mith-randalf, MjrLandWhale, MLGTASTICa, Mnemotechnician, moderatelyaware, mokiros, Moneyl, Monotheonist, Moomoobeef, moony, Morb0, mr-bo-jangles, Mr0maks, MrFippik, musicmanvr, MWKane, Myakot, Myctai, N3X15, nails-n-tape, Nairodian, Naive817, namespace-Memory, Nannek, NeLepus, neuPanda, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, NIXC, NkoKirkto, nmajask, noctyrnal, nok-ko, NonchalantNoob, NoobyLegion, not-gavnaed, notafet, notquitehadouken, noudoit, noverd, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, nyeogmi, Nylux, Nyranu, och-och, OCOtheOmega, OctoRocket, OldDanceJacket, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, paigemaeforrest, pali6, Pangogie, panzer-iv1, paolordls, partyaddict, patrikturi, PaulRitter, Peptide90, peptron1, PeterFuto, PetMudstone, pewter-wiz, Phantom-Lily, PHCodes, Phill101, phunnyguy, pigeonpeas, PilgrimViis, Pill-U, Piras314, Pireax, pissdemon, PixelTheKermit, PJB3005, Plasmaguy, PlasmaRaptor, plinyvic, Plykiya, pofitlo, pointer-to-null, poklj, PolterTzi, PoorMansDreams, potato1234x, PotentiallyTom, ProfanedBane, PROG-MohamedDwidar, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykzz, PuceTint, PuroSlavKing, PursuitInAshes, Putnam3145, qrtDaniil, quatre, QuietlyWhisper, qwerltaz, Radezolid, RadioMull, Radosvik, Radrark, RadsammyT, Rainbeon, Rainfey, Raitononai, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, Redfire1331, RedFoxIV, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, Remuchi, rene-descartes2021, Renlou, retequizzle, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, Rinkashikachi, RobbyTheFish, Rockdtben, Rohesie, rok-povsic, rolfero, RomanNovo, rosieposieeee, Rosycup, router, RumiTiger, S1ss3l, Saakra, saga3152, Salex08, sam, Samsterious, SaphireLattice, SapphicOverload, sapphirescript, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, scrato, Scribbles0, scuffedjays, ScumbagDog, Segonist, sephtasm, Serkket, sewerpig, ShadowCommander, shadowtheprotogen546, shadowwailker, shaeone, shampunj, shariathotpatrol, ShatteredSwords, SignalWalker, siigiil, SimpleStation14, Simyon264, sirdragooon, Sirionaut, SixplyDev, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, SleepyScarecrow, sleepyyapril, Slyfox333, snebl, sniperchance, Snowni, snowsignal, SonicHDC, Sornarok, SoulFN, SoulSloth, Soundwavesghost, southbridge-fur, SpaceManiac, SpaceRox1244, SpaceyLady, spartak, SpartanKadence, Spatison, SpeltIncorrectyl, spess-empyrean, SphiraI, SplinterGP, spoogemonster, sporekto, Squishy77, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, Stealthbomber16, stellar-novas, Stop-Signs, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, Strol20, StStevens, Subversionary, sunbear-dev, superjj18, Supernorn, suraru, SweptWasTaken, SX-7, Sybil, SYNCHRONIC, Szunti, TadJohnson00, takemysoult, TaralGit, Taran, Tayrtahn, tday93, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, TGRCdev, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, TheCze, TheDarkElites, thedraccx, TheEmber, TheIntoxicatedCat, thekilk, themias, theomund, TherapyGoth, TheShuEd, thevinter, ThunderBear2006, Timemaster99, Timfa2112, timothyteakettle, TimrodDX, tin-man-tim, Tirochora, Titian3, tk-a369, tkdrg, Tmanzxd, tmtmtl30, toasterpm87, TokenStyle, Tollhouse, tom-leys, tomasalves8, Tomeno, Tonydatguy, topy, tornado-technology, Tornado-Technology, tosatur, TotallyLemon, trashalice, truepaintgit, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, twoducksonnaplane, Tyler-IN, Tyzemol, UbaserB, ubis1, UBlueberry, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unkn0wnGh0st333, unusualcrow, Uriende, UristMcDorf, user424242420, v0idRift, Vaaankas, valentfingerov, Varen, VasilisThePikachu, veliebm, VelonacepsCalyxEggs, veprolet, Veritius, Vermidia, vero5123, Verslebas, VigersRay, violet754, Visne, vlados1408, VMSolidus, volotomite, volundr-, Voomra, Vordenburg, vulppine, wafehling, Warentan, WarMechanic, Watermelon914, waylon531, weaversam8, wertanchik, whateverusername0, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, wrexbe, WTCWR68, xkreksx, xqzpop7, xRiriq, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, Yousifb26, yunii, YuriyKiss, yuriykiss, zach-hill, Zadeon, zamp, Zandario, Zap527, Zealith-Gamer, zelezniciar1, ZelteHonor, zero, ZeroDiamond, zerorulez, ZeWaka, zionnBE, ZNixian, ZoldorfTheWizard, Zymem, zzylex
+0x6273, 13spacemen, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 2digitman, 4310v343k, 4dplanner, 612git, 778b, Ablankmann, abregado, Absolute-Potato, Acruid, actioninja, actually-reb, ada-please, adamsong, Adeinitas, Admiral-Obvious-001, adrian, Adrian16199, Aerocrux, Aexolott, Aexxie, africalimedrop, afrokada, Agoichi, Ahion, Aidenkrz, Aikakakah, aitorlogedo, ajcm, AJCM-git, AjexRose, Alekshhh, alexkar598, AlexMorgan3817, alexumandxgabriel08x, Alithsko, ALMv1, AlphaQwerty, Altoids1, amylizzle, ancientpower, Andre19926, AndrewEyeke, angelofallars, Anzarot121, Appiah, ar4ill, ArchPigeon, ArchRBX, areitpog, Arendian, arimah, Arkanic, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, AruMoon, as334, AsikKEsel, asperger-sind, aspiringlich, aspiringLich, astriloqua, avalon, avghdev, AzzyIsNotHere, BananaFlambe, BasedPugilist, BasedUser, beck-thompson, benev0, BGare, bhespiritu, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blitzthesquishy, bloodrizer, Bloody2372, blueDev2, BlueHNT, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, BombasterDS, boogiebogus, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, Bribrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, byondfuckery, c0rigin, c4llv07e, CaasGit, capnsockless, CaptainSqrBeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, CatTheSystem, Centronias, CerberusWolfie, chairbender, Charlese2, chavonadelal, Cheackraze, cheesePizza2, Chief-Engineer, christhirtle, chromiumboy, Chronophylos, Chubbygummibear, CilliePaint, civilCornball, Clement-O, clyf, Clyybber, CMDR-Piboy314, CodedCrow, Cohnway, cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, coolmankid12345, corentt, CormosLemming, CrafterKolyan, crazybrain23, creadth, CrigCrag, croilbird, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, DangerRevolution, daniel-cr, DanSAussieITS, Daracke, DarkenedSynergy, Darkenson, DawBla, Daxxi3, dch-GH, Deahaka, dean, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, Deeeeja, deepdarkdepths, degradka, Delete69, deltanedas, DeltaV-Bot, DerbyX, derek, dersheppard, dexlerxd, dffdff2423, dge21, diggy0, digitalic, DinoWattz, DisposableCrewmember42, DJB1gYAPPA, DjfjdfofdjfjD, DocNITE, DoctorBeard, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, dootythefrooty, Dorragon, Doru991, DoubleRiceEddiedd, DoutorWhite, drakewill-CRL, Drayff, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, dukevanity, Dutch-VanDerLinde, dvir001, dylanstrategie, Dynexust, Easypoller, eclips_e, EctoplasmIsGood, eden077, EEASAS, Efruit, efzapa, ElectroSR, elsie, elthundercloud, Emisse, emmafornash, EmoGarbage404, Endecc, eoineoineoin, Erisfiregamer1, ERORR404V1, Errant-4, esguard, estacaoespacialpirata, eugene, Evgencheg, ewokswagger, exincore, exp111, f0x-n3rd, FacePluslll, Fahasor, FairlySadPanda, Fansana, Feluk6174, fenndragon, ficcialfaint, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, FirinMaLazors, Fishfish458, fl-oz, Flareguy, FluffiestFloof, FluffMe, FluidRock, flybik, flyingkarii, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, Fouin, foxhorn, FoxxoTrystan, freeman2651, freeze2222, Froffy025, Fromoriss, froozigiusz, FrostMando, FryOfDestiny, FungiFellow, GalacticChimp, gamer3107, Gaxeer, gbasood, gcoremans, Geekyhobo, genderGeometries, GeneralGaws, Genkail, geraeumig, Ghagliiarghii, ghost581x, Git-Nivrak, gituhabu, GlassEclipse, gluesniffler, GNF54, GNUtopia, Golinth, GoodWheatley, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, greggthefather, GreyMario, GTRsound, Guess-My-Name, gusxyz, h3half, Haltell, Hanzdegloker, Hardly3D, harikattar, Hebi, Henry, HerCoyote23, hiucko, Hmeister-fake, Hmeister-real, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, hubismal, Hugal31, Huxellberger, Hyenh, i-justuser-i, iacore, IamVelcroboy, icekot8, icesickleone, Ichaie, iczero, iglov, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, indeano, Injazz, Insineer, IntegerTempest, Interrobang01, Intoxicating-Innocence, IProduceWidgets, ItsMeThom, Itzbenz, Jackal298, Jackrost, jacksonzck, Jackw2As, jamessimo, janekvap, Jark255, Jaskanbe, JasperJRoth, jerryimmouse, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, JohnGinnane, johnku1, joshepvodka, Jrpl, jukereise, juliangiebel, juniwoofs, justart1m, JustCone14, justin, justintether, JustinTrotter, justtne, K-Dynamic, k3yw, Kadeo64, KaiShibaa, kalane15, kalanosh, Kanashi-Panda, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, Kimpes, KingFroozy, kira-er, Kirillcas, Kistras, Kit0vras, KittenColony, klaypexx, Kmc2000, Ko4ergaPunk, kognise, komunre, KonstantinAngelov, koteq, Kr8art, Krunklehorn, Kukutis96513, Kupie, kxvvv, Kyoth25f, kzhanik, lajolico, Lamrr, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leander-0, leonardo-dabepis, leonsfriedrich, lettern, LetterN, Level10Cybermancer, LEVELcat, lever1209, Lgibb18, LightVillet, liltenhead, LinkUyx, LittleBuilderJane, lizelive, lleftTheDragon, localcc, Lomcastar, lonoferars, LordCarve, LordEclipse, LovelyLophi, luckyshotpictures, LudwigVonChesterfield, Lukasz825700516, Lumminal, lunarcomets, luringens, lvvova1, Lyndomen, lzimann, lzk228, M3739, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, MagnusCrowe, malchanceux, MaloTV, ManelNavola, Mangohydra, marboww, Markek1, Matz05, max, MaxNox7, MehimoNemo, MeltedPixel, MemeProof, MendaxxDev, Menshin, Mephisto72, Mervill, metalgearsloth, mhamsterr, michaelcu, micheel665, Mike32oz, MilenVolf, milon, MilonPL, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MisterMecky, Mith-randalf, MjrLandWhale, MLGTASTICa, Mnemotechnician, moderatelyaware, mokiros, Moneyl, Monotheonist, Moomoobeef, moony, Morb0, mr-bo-jangles, Mr0maks, MrFippik, musicmanvr, MWKane, Myakot, Myctai, N3X15, nails-n-tape, Nairodian, Naive817, namespace-Memory, Nannek, NeLepus, neuPanda, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, NIXC, NkoKirkto, nmajask, noctyrnal, nok-ko, NonchalantNoob, NoobyLegion, not-gavnaed, notafet, notquitehadouken, noudoit, noverd, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, nyeogmi, Nylux, Nyranu, och-och, OCOtheOmega, OctoRocket, OldDanceJacket, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, paigemaeforrest, pali6, Pangogie, panzer-iv1, paolordls, partyaddict, patrikturi, PaulRitter, Peptide90, peptron1, PeterFuto, PetMudstone, pewter-wiz, Phantom-Lily, PHCodes, Phill101, phunnyguy, pigeonpeas, PilgrimViis, Pill-U, Piras314, Pireax, pissdemon, PixelTheKermit, PJB3005, Plasmaguy, PlasmaRaptor, plinyvic, Plykiya, plyushsune, pofitlo, pointer-to-null, poklj, PolterTzi, PoorMansDreams, potato1234x, PotentiallyTom, ProfanedBane, PROG-MohamedDwidar, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykzz, PuceTint, PuroSlavKing, PursuitInAshes, Putnam3145, qrtDaniil, quatre, QuietlyWhisper, qwerltaz, Radezolid, RadioMull, Radosvik, Radrark, RadsammyT, Rainbeon, Rainfey, Raitononai, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, Redfire1331, RedFoxIV, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, Remuchi, rene-descartes2021, Renlou, retequizzle, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, Rinkashikachi, RobbyTheFish, Rockdtben, Rohesie, rok-povsic, rolfero, RomanNovo, rosieposieeee, Rosycup, router, RumiTiger, S1ss3l, Saakra, saga3152, Salex08, sam, Samsterious, SaphireLattice, SapphicOverload, sapphirescript, sarahon, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, scrato, Scribbles0, scuffedjays, ScumbagDog, Segonist, sephtasm, Serkket, sewerpig, ShadowCommander, shadowtheprotogen546, shadowwailker, shaeone, shampunj, shariathotpatrol, ShatteredSwords, SignalWalker, siigiil, SimpleStation14, Simyon264, sirdragooon, Sirionaut, SixplyDev, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, SleepyScarecrow, sleepyyapril, Slyfox333, snebl, sniperchance, Snowni, snowsignal, SonicHDC, Sornarok, SoulFN, SoulSloth, Soundwavesghost, southbridge-fur, sowelipililimute, SpaceManiac, SpaceRox1244, SpaceyLady, spartak, SpartanKadence, Spatison, SpeltIncorrectyl, spess-empyrean, SphiraI, SplinterGP, spoogemonster, sporekto, Squishy77, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, Stealthbomber16, stellar-novas, Stop-Signs, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, Strol20, StStevens, Subversionary, sunbear-dev, superjj18, Supernorn, suraru, SweptWasTaken, SX-7, Sybil, SYNCHRONIC, Szunti, TadJohnson00, takemysoult, TaralGit, Taran, Tayrtahn, tday93, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, TGRCdev, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, TheCze, TheDarkElites, thedraccx, TheEmber, TheIntoxicatedCat, thekilk, themias, theomund, TherapyGoth, TheShuEd, thevinter, ThunderBear2006, Timemaster99, Timfa2112, timothyteakettle, TimrodDX, tin-man-tim, Tirochora, Titian3, tk-a369, tkdrg, Tmanzxd, tmtmtl30, toasterpm87, Toby222, TokenStyle, Tollhouse, tom-leys, tomasalves8, Tomeno, Tonydatguy, topy, tornado-technology, Tornado-Technology, tosatur, TotallyLemon, trashalice, truepaintgit, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, twoducksonnaplane, Tyler-IN, Tyzemol, UbaserB, ubis1, UBlueberry, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unkn0wnGh0st333, unusualcrow, Uriende, UristMcDorf, user424242420, v0idRift, Vaaankas, valentfingerov, Varen, VasilisThePikachu, veliebm, VelonacepsCalyxEggs, veprolet, VerinSenpai, Veritius, Vermidia, vero5123, Verslebas, VigersRay, violet754, Visne, vlados1408, VMSolidus, volotomite, volundr-, Voomra, Vordenburg, vulppine, wafehling, Warentan, WarMechanic, Watermelon914, waylon531, weaversam8, wertanchik, whateverusername0, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, wrexbe, WTCWR68, xkreksx, xqzpop7, xRiriq, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, Yousifb26, yunii, YuriyKiss, yuriykiss, zach-hill, Zadeon, zamp, Zandario, Zap527, Zealith-Gamer, zelezniciar1, ZelteHonor, zero, ZeroDiamond, zerorulez, ZeWaka, zionnBE, ZNixian, ZoldorfTheWizard, Zymem, zzylex
diff --git a/Resources/Locale/en-US/_EE/prototypes/roles/antags.ftl b/Resources/Locale/en-US/_EE/prototypes/roles/antags.ftl
new file mode 100644
index 0000000000..5b6dfd09e2
--- /dev/null
+++ b/Resources/Locale/en-US/_EE/prototypes/roles/antags.ftl
@@ -0,0 +1,10 @@
+# For Sol Alliance Navy Deserters
+ghost-role-information-deserter-name = Solarian Navy Deserter
+ghost-role-information-deserter-description = "I've fucking had it with the quartermaster not giving me my damn paycheck! Let's take one of the dropships for a joyride and go looting to pay ourselves."
+ghost-role-information-deserter-rules =
+    You are not a terrorist, but you're not exactly a great person either. Do whatever it takes to "Get back what the navy owed us".
+    Taking hostages and making unreasonable demands is highly encouraged. Live out your space pirate fantasy here.
+    Don't go out of your way to cause mass destruction, since turning the station to slag will also deny you your payday.
+roles-antag-sol-alliance-navy-deserter = Solarian Navy Deserter
+roles-antag-sol-alliance-navy-deserter-objective = Fill your dropship with as much valuable loot as possible, while living to brag about it at the next freeport.
+id-card-access-level-sol-alliance-navy = SAN
diff --git a/Resources/Locale/en-US/_Goobstation/store/uplink-catalog.ftl b/Resources/Locale/en-US/_Goobstation/store/uplink-catalog.ftl
index f94d63469d..938fc5e82a 100644
--- a/Resources/Locale/en-US/_Goobstation/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/_Goobstation/store/uplink-catalog.ftl
@@ -5,3 +5,6 @@ uplink-mech-teleporter-heavy-desc = Contains a heavily armored Cybersun mech wit
 
 uplink-mech-teleporter-assault-name = Assault Mech teleporter
 uplink-mech-teleporter-assault-desc = Contains a lightly armored Cybersun mech with an integrated chainsword, LBX AC 10 "Scattershot", SRM-8 Light Missile Rack and P-X Tesla Cannon.
+
+uplink-hardsuit-cybersun-stealth-name = CSA-91x "Èguǐ" tacsuit
+uplink-hardsuit-cybersun-stealth-desc = A rare prototype tacsuit that features metamaterial plating which warps light around it to produce an "Invisibility cloak" effect.
diff --git a/Resources/Locale/en-US/botany/components/plant-analyzer-component.ftl b/Resources/Locale/en-US/botany/components/plant-analyzer-component.ftl
new file mode 100644
index 0000000000..5bfffaf154
--- /dev/null
+++ b/Resources/Locale/en-US/botany/components/plant-analyzer-component.ftl
@@ -0,0 +1,105 @@
+plant-analyzer-component-no-seed = no plant found
+
+plant-analyzer-component-health = Health:
+plant-analyzer-component-age = Age:
+plant-analyzer-component-water = Water:
+plant-analyzer-component-nutrition = Nutrition:
+plant-analyzer-component-toxins = Toxins:
+plant-analyzer-component-pests = Pests:
+plant-analyzer-component-weeds = Weeds:
+
+plant-analyzer-component-alive = [color=green]ALIVE[color]
+plant-analyzer-component-dead = [color=red]DEAD[color]
+plant-analyzer-component-unviable = [color=red]UNVIABLE[color]
+plant-analyzer-component-mutating = [color=#00ff5f]MUTATING[color]
+plant-analyzer-component-kudzu = [color=red]KUDZU[color]
+
+plant-analyzer-soil = There is some [color=white]{$chemicals}[/color] in this {$holder} that {$count ->
+    [one]has
+    *[other]have
+} not been absorbed.
+plant-analyzer-soil-empty = There are no unabsorbed chemicals in this {$holder}.
+
+plant-analyzer-component-environemt = This [color=green]{$seedName}[/color] requires an atmosphere at a pressure level of [color=lightblue]{$kpa}kPa ± {$kpaTolerance}kPa[/color], temperature of [color=lightsalmon]{$temp}°k ± {$tempTolerance}°k[/color] and a light level of [color=white]{$lightLevel} ± {$lightTolerance}[/color].
+plant-analyzer-component-environemt-void = This [color=green]{$seedName}[/color] has to be grown [bolditalic]in the vacuum of space[/bolditalic] at a light level of [color=white]{$lightLevel} ± {$lightTolerance}[/color].
+plant-analyzer-component-environemt-gas = This [color=green]{$seedName}[/color] requires an atmosphere containing [bold]{$gases}[/bold] at a pressure level of [color=lightblue]{$kpa}kPa ± {$kpaTolerance}kPa[/color], temperature of [color=lightsalmon]{$temp}°k ± {$tempTolerance}°k[/color] and a light level of [color=white]{$lightLevel} ± {$lightTolerance}[/color].
+
+plant-analyzer-produce-plural = {MAKEPLURAL($thing)}
+plant-analyzer-output = {$yield ->
+    [0]{$gasCount ->
+        [0]The only thing it seems to do is consume water and nutrients.
+        *[other]The only thing it seems to do is turn water and nutrients into [bold]{$gases}[/bold].
+    }
+    *[other]It has [color=lightgreen]{$yield} {$potency}[/color]{$seedless ->
+        [true]{" "}but [color=red]seedless[/color]
+        *[false]{$nothing}
+    }{" "}{$yield ->
+        [one]flower
+        *[other]flowers
+    }{" "}that{$gasCount ->
+        [0]{$nothing}
+        *[other]{$yield ->
+            [one]{" "}emits
+            *[other]{" "}emit
+        }{" "}[bold]{$gases}[/bold] and
+    }{" "}will turn into{$yield ->
+        [one]{" "}{INDEFINITE($firstProduce)} [color=#a4885c]{$produce}[/color]
+        *[other]{" "}[color=#a4885c]{$producePlural}[/color]
+    }.{$chemCount ->
+        [0]{$nothing}
+        *[other]{" "}There are trace amounts of [color=white]{$chemicals}[/color] in its stem.
+    }
+}
+
+plant-analyzer-potency-tiny = tiny
+plant-analyzer-potency-small = small
+plant-analyzer-potency-below-average = below-average sized
+plant-analyzer-potency-average = average sized
+plant-analyzer-potency-above-average = above-average sized
+plant-analyzer-potency-large = rather large
+plant-analyzer-potency-huge = huge
+plant-analyzer-potency-gigantic = gigantic
+plant-analyzer-potency-ludicrous = ludicrously large
+plant-analyzer-potency-immeasurable = immeasurably large
+
+plant-analyzer-print = Print
+plant-analyzer-printout-missing = N/A
+plant-analyzer-printout = [color=#9FED58][head=2]Plant Analyzer Report[/head][/color]{$nl
+    }──────────────────────────────{$nl
+    }[bullet/] Species: {$seedName}{$nl
+    }{$indent}[bullet/] Viable: {$viable ->
+        [no][color=red]No[/color]
+        [yes][color=green]Yes[/color]
+        *[other]{LOC("plant-analyzer-printout-missing")}
+    }{$nl
+    }{$indent}[bullet/] Endurance: {$endurance}{$nl
+    }{$indent}[bullet/] Lifespan: {$lifespan}{$nl
+    }{$indent}[bullet/] Product: [color=#a4885c]{$produce}[/color]{$nl
+    }{$indent}[bullet/] Kudzu: {$kudzu ->
+        [no][color=green]No[/color]
+        [yes][color=red]Yes[/color]
+        *[other]{LOC("plant-analyzer-printout-missing")}
+    }{$nl
+    }[bullet/] Growth profile:{$nl
+    }{$indent}[bullet/] Water: [color=cyan]{$water}[/color]{$nl
+    }{$indent}[bullet/] Nutrition: [color=orange]{$nutrients}[/color]{$nl
+    }{$indent}[bullet/] Toxins: [color=yellowgreen]{$toxins}[/color]{$nl
+    }{$indent}[bullet/] Pests: [color=magenta]{$pests}[/color]{$nl
+    }{$indent}[bullet/] Weeds: [color=red]{$weeds}[/color]{$nl
+    }[bullet/] Environmental profile:{$nl
+    }{$indent}[bullet/] Composition: [bold]{$gasesIn}[/bold]{$nl
+    }{$indent}[bullet/] Pressure: [color=lightblue]{$kpa}kPa ± {$kpaTolerance}kPa[/color]{$nl
+    }{$indent}[bullet/] Temperature: [color=lightsalmon]{$temp}°k ± {$tempTolerance}°k[/color]{$nl
+    }{$indent}[bullet/] Light: [color=gray][bold]{$lightLevel} ± {$lightTolerance}[/bold][/color]{$nl
+    }[bullet/] Flowers: {$yield ->
+        [-1]{LOC("plant-analyzer-printout-missing")}
+        [0][color=red]0[/color]
+        *[other][color=lightgreen]{$yield} {$potency}[/color]
+    }{$nl
+    }[bullet/] Seeds: {$seeds ->
+        [no][color=red]No[/color]
+        [yes][color=green]Yes[/color]
+        *[other]{LOC("plant-analyzer-printout-missing")}
+    }{$nl
+    }[bullet/] Chemicals: [color=gray][bold]{$chemicals}[/bold][/color]{$nl
+    }[bullet/] Emissions: [bold]{$gasesOut}[/bold]
diff --git a/Resources/Locale/en-US/botany/plant-analyzer.ftl b/Resources/Locale/en-US/botany/plant-analyzer.ftl
new file mode 100644
index 0000000000..47ec9beff9
--- /dev/null
+++ b/Resources/Locale/en-US/botany/plant-analyzer.ftl
@@ -0,0 +1,4 @@
+plant-analyzer-printer-not-ready = Printer is not ready yet.
+plant-analyzer-window-scan-mode-active = Active
+plant-analyzer-window-scan-mode-inactive = Inactive
+plant-analyzer-window-entity-unknown-text = Unknown
diff --git a/Resources/Locale/en-US/game-ticking/game-presets/preset-nukeops.ftl b/Resources/Locale/en-US/game-ticking/game-presets/preset-nukeops.ftl
index 1a4fcafbf8..06f8aeb565 100644
--- a/Resources/Locale/en-US/game-ticking/game-presets/preset-nukeops.ftl
+++ b/Resources/Locale/en-US/game-ticking/game-presets/preset-nukeops.ftl
@@ -4,6 +4,7 @@ nukeops-description = Nuclear operatives have targeted the station. Try to keep
 nukeops-welcome =
     You are a nuclear operative. Your goal is to blow up {$station}, and ensure that it is nothing but a pile of rubble. Your bosses, the Syndicate, have provided you with the tools you'll need for the task.
     Operation {$name} is a go ! Death to Nanotrasen!
+nukeops-briefing = Your objectives are simple. Deliver the payload and make sure it detonates. Begin mission.
 
 nukeops-opsmajor = [color=crimson]Syndicate major victory![/color]
 nukeops-opsminor = [color=crimson]Syndicate minor victory![/color]
diff --git a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
index 95fe03c2b9..efe06f34d0 100644
--- a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
+++ b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
@@ -60,6 +60,7 @@ petting-failure-shadow = You're trying to pet {THE($target)}, but your hand pass
 petting-success-honkbot = You pet {THE($target)} on {POSS-ADJ($target)} slippery metal head.
 petting-success-mimebot = You pet {THE($target)} on {POSS-ADJ($target)} cold metal head.
 petting-success-cleanbot = You pet {THE($target)} on {POSS-ADJ($target)} damp metal head.
+petting-success-plantbot = You pet {THE($target)} on {POSS-ADJ($target)} muddy metal head.
 petting-success-medibot = You pet {THE($target)} on {POSS-ADJ($target)} sterile metal head.
 petting-success-weldbot = You pet {THE($target)} on {POSS-ADJ($target)} stained metal head.
 petting-success-firebot = You pet {THE($target)} on {POSS-ADJ($target)} warm metal head.
@@ -79,6 +80,7 @@ petting-success-disablerbot = You pet {THE($target)} on {POSS-ADJ($target)} prot
 
 petting-failure-honkbot = You reach out to pet {THE($target)}, but {SUBJECT($target)} honks in refusal!
 petting-failure-cleanbot = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} busy mopping!
+petting-failure-plantbot = You reach out to pet {THE($target)}, but {POSS-ADJ($target)} clippers nearly snip your fingers off!
 petting-failure-mimebot = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} busy miming!
 petting-failure-medibot = You reach out to pet {THE($target)}, but {POSS-ADJ($target)} syringe nearly stabs your hand!
 petting-failure-weldbot = You reach out to pet {THE($target)}, but {POSS-ADJ($target)} welder nearly burns your hand!
diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl
index 600369f596..dd5b2f17bf 100644
--- a/Resources/Locale/en-US/job/job-names.ftl
+++ b/Resources/Locale/en-US/job/job-names.ftl
@@ -24,6 +24,7 @@ job-name-engineer = Station Engineer
 job-name-atmostech = Atmospheric Technician
 job-name-hop = Head of Personnel
 job-name-captain = Captain
+job-name-ntrep = Nanotrasen Representative
 job-name-serviceworker = Service Worker
 job-name-centcomoff = CentCom Official
 job-name-reporter = Reporter
diff --git a/Resources/Locale/en-US/loadouts/generic/items.ftl b/Resources/Locale/en-US/loadouts/generic/items.ftl
index 72d8275022..a8b103b9c0 100644
--- a/Resources/Locale/en-US/loadouts/generic/items.ftl
+++ b/Resources/Locale/en-US/loadouts/generic/items.ftl
@@ -44,6 +44,7 @@ loadout-name-LoadoutItemLighterFlippo = flippo lighter (colorable)
 loadout-name-LoadoutItemDrinkShinyFlask = shiny flask (colorable)
 loadout-name-LoadoutItemDrinkLithiumFlask = lithium flask (colorable)
 loadout-name-LoadoutItemDrinkVacuumFlask = vacuum flask (colorable)
+loadout-name-LoadoutItemShadowkinPlush = shadowkin plushie
 
 loadout-name-LoadoutItemPetMouse = pet mouse (colorable)
 loadout-name-LoadoutItemPetHamster = pet hamster (colorable)
diff --git a/Resources/Locale/en-US/loadouts/itemgroups.ftl b/Resources/Locale/en-US/loadouts/itemgroups.ftl
index e35316e661..2b6492620c 100644
--- a/Resources/Locale/en-US/loadouts/itemgroups.ftl
+++ b/Resources/Locale/en-US/loadouts/itemgroups.ftl
@@ -87,6 +87,7 @@ character-item-group-LoadoutHeadOfPersonnelUniforms = Head of Personnel Uniforms
 character-item-group-LoadoutBlueshieldOfficerBackpacks = Blueshield Officer Backpacks
 character-item-group-LoadoutBlueshieldOfficerVests = Blueshield Officer Vests
 character-item-group-LoadoutBlueshieldOfficerUniforms = Blueshield Officer Uniforms
+character-item-group-LoadoutBlueshieldOfficerPrimary = Blueshield Officer Primary Weapon
 
 # Dignitary - Magistrate
 character-item-group-LoadoutMagistrateHead = Magistrate Headgear
@@ -96,7 +97,8 @@ character-item-group-LoadoutMagistrateUniforms = Magistrate Uniforms
 
 # Dignitary - Nanotrasen Representative
 character-item-group-LoadoutNanorepBackpacks = Nanotrasen Representative Backpacks
-character-tiem-group-LoadoutNanorepUniforms = Nanotrasen Representative Uniforms
+character-item-group-LoadoutNanorepUniforms = Nanotrasen Representative Uniforms
+character-item-group-LoadoutNanotrasenRepresentativeWeapon = Nanotrasen Representative Weapons
 
 # Engineering
 character-item-group-LoadoutEngineeringBackpacks = Engineering Backpacks
diff --git a/Resources/Locale/en-US/npc/plantbot.ftl b/Resources/Locale/en-US/npc/plantbot.ftl
new file mode 100644
index 0000000000..a7a9cbd47d
--- /dev/null
+++ b/Resources/Locale/en-US/npc/plantbot.ftl
@@ -0,0 +1,2 @@
+plantbot-add-water = Adding water.
+plantbot-remove-weeds = Removing weeds.
diff --git a/Resources/Locale/en-US/prototypes/entities/clothing/head/hardsuit-helmets.ftl b/Resources/Locale/en-US/prototypes/entities/clothing/head/hardsuit-helmets.ftl
index 17b41b7001..2918cabb4d 100644
--- a/Resources/Locale/en-US/prototypes/entities/clothing/head/hardsuit-helmets.ftl
+++ b/Resources/Locale/en-US/prototypes/entities/clothing/head/hardsuit-helmets.ftl
@@ -75,6 +75,8 @@ ent-ClothingHeadHelmetHardsuitCybersun = CSA-80UA helmet
     .desc = An incredibly sturdy looking helmet designed for the Guan Yu tacsuit.
 ent-ClothingHeadHelmetHardsuitJuggernautReverseEngineered = CSA-80UA helmet
     .desc = An incredibly sturdy looking helmet designed for the Guan Yu tacsuit. This one has been painted blue.
+ent-ClothingHeadHelmetHardsuitCybersunStealth = CSA-91x helmet
+    .desc = A moderately protective sealed helmet designed for the èguǐ tacsuit. It features "Cloaking" metamaterials.
 ent-ClothingHeadHelmetHardsuitWizard = WZD-84 helmet
     .desc = A bizarre, gem-encrusted helmet from unknown origins. It provides some protection to its wearer without restricting their movements.
 ent-ClothingHeadHelmetHardsuitLing = organic space helmet
diff --git a/Resources/Locale/en-US/prototypes/entities/clothing/outerClothing/hardsuits.ftl b/Resources/Locale/en-US/prototypes/entities/clothing/outerClothing/hardsuits.ftl
index 5d7b55c163..224774322e 100644
--- a/Resources/Locale/en-US/prototypes/entities/clothing/outerClothing/hardsuits.ftl
+++ b/Resources/Locale/en-US/prototypes/entities/clothing/outerClothing/hardsuits.ftl
@@ -102,6 +102,9 @@ ent-ClothingOuterHardsuitJuggernaut = CSA-80UA - "Guan Yu" tacsuit
 ent-ClothingOuterHardsuitJuggernautReverseEngineered = CSA-80UA - "Guan Yu" tacsuit
     .desc = The pride and joy of the Cybersun-Armaments Corporation, named after an ancient Sol' War God. Commonly known throughout the galaxy as a "Juggernaut".
         Matching its bulky appearance, it protects against all forms of damage. It feels VERY heavy.
+ent-ClothingOuterHardsuitCybersunStealth = CSA-91x "Èguǐ" tacsuit
+    .desc = A rare prototype tacsuit that features metamaterial plating which warps light around it to produce an "Invisibility cloak" effect.
+    Unfortunately, it accomplishes this by trading a lot of protections that one would normally expect from a typical tacsuit.
 ent-ClothingOuterHardsuitWizard = WZD-84 - "Mana" tacsuit
     .desc = A bizarre gem-encrusted hardsuit. Famously used by members of the Wizard Federation in their operations.
     Contrary to it's appearance, it can protect its wearer from space and considerable amounts of physical trauma, it feels somewhat light.
diff --git a/Resources/Locale/en-US/prototypes/roles/antags.ftl b/Resources/Locale/en-US/prototypes/roles/antags.ftl
index 1e057738e3..ba43d4ff85 100644
--- a/Resources/Locale/en-US/prototypes/roles/antags.ftl
+++ b/Resources/Locale/en-US/prototypes/roles/antags.ftl
@@ -33,3 +33,6 @@ roles-antag-space-ninja-objective = Use your stealth to sabotage the station, no
 
 roles-antag-thief-name = Thief
 roles-antag-thief-objective = Add some NT property to your personal collection without using violence.
+
+roles-antag-dragon-name = Space Dragon
+roles-antag-dragon-objective = Create a carp army to take over this quadrant.
diff --git a/Resources/Locale/en-US/renamable/renamable-component.ftl b/Resources/Locale/en-US/renamable/renamable-component.ftl
new file mode 100644
index 0000000000..9509f18a98
--- /dev/null
+++ b/Resources/Locale/en-US/renamable/renamable-component.ftl
@@ -0,0 +1,7 @@
+### Interaction Messages
+
+# Shown when renaming something
+comp-renamable-rename = Renamed to {$newname}
+
+renamable-ui-header = Rename
+renamable-current-name-label = Current name:
diff --git a/Resources/Locale/en-US/traits/traits.ftl b/Resources/Locale/en-US/traits/traits.ftl
index 8a7a86d778..5c144d6cc7 100644
--- a/Resources/Locale/en-US/traits/traits.ftl
+++ b/Resources/Locale/en-US/traits/traits.ftl
@@ -383,7 +383,7 @@ trait-description-StrikingCalluses =
     Striking Calluses consist of bony dermal deposits grafted into a user's hands, either inside the palm
     for "Tiger Style" fighting, or just below the knuckles for those who favor traditional boxing.
     Owners of prosthetic or bionic limbs would instead have a hard plastic shell over their knuckles.
-    These enhancements increase your unarmed strike damage by 1 point base, but do not confer
+    These enhancements increase your unarmed strike damage by 2 point base, but do not confer
     any benefits to any form of armed melee.
 
 trait-name-Spinarette = Bionic Spinarette
@@ -391,8 +391,7 @@ trait-description-Spinarette =
     This vatgrown organ-- trademarked and patented by the Cybersun Corporation, is marketed as a highly
     utilitarian enhancement, and sold in clinics all across known space. It consists of a nodule that is traditionally
     implanted right below the wrist, which absorbs bodily lipids to convert into all natural silk. A small opening
-    in the palm allows the user to 'spin' this thread. Users of this enhancement typically require twice as much food
-    as a standard Sol Human, owing to the high metabolic cost of artificial Sericulture.
+    in the palm allows the user to 'spin' this thread.
 
 trait-name-AddictionNicotine = Nicotine Addiction
 trait-description-AddictionNicotine =
@@ -530,13 +529,13 @@ trait-description-BrittleBoneDisease =
     Also known as "brittle bone disease", people with this genetic disorder have bones that are easily broken,
     often simply by moving. This trait reduces your threshold for critical injury by 50 points.
 
-trait-name-LightAmplification = CyberEyes Module: Light Amplification
+trait-name-LightAmplification = Cyber-Eyes: Light Amplification Module
 trait-description-LightAmplification =
-    Your CyberEyes have been enhanced with a light amplifier module, enabling the user to toggle between standard sight and "Night Vision" mode.
+    Your Cyber-Eyes have been enhanced with a light amplifier module, enabling the user to toggle between standard sight and "Night Vision" mode.
 
-trait-name-ThermographicVision = CyberEyes Module: Thermographic Scanner
+trait-name-ThermographicVision = Cyber-Eyes: Thermographic Scanner Module
 trait-description-ThermographicVision =
-    Your CyberEyes have been enhanced with a Thermographic Scanner. When enabled, it captures a snapshot of the user's surroundings, while highlighting all
+    Your Cyber-Eyes have been enhanced with a Thermographic Scanner. When enabled, it captures a snapshot of the user's surroundings, while highlighting all
     biological life forms. It can even detect individuals through the walls of a station.
 
 trait-name-ShadowkinBlackeye = Blackeye
@@ -588,4 +587,4 @@ trait-description-LightAmplificationModule =
 trait-name-ThermographicVisionModule = I.P.C Eye Module: Thermographic Scanner
 trait-description-ThermographicVisionModule =
     Your vision has been enhanced with a Thermographic Scanner. When enabled, it captures a snapshot of the user's surroundings, while highlighting all
-    biological life forms. It can even detect individuals through the walls of a station.
\ No newline at end of file
+    biological life forms. It can even detect individuals through the walls of a station.
diff --git a/Resources/Locale/en-US/verbs/verb-system.ftl b/Resources/Locale/en-US/verbs/verb-system.ftl
index d579f045c5..42b9c53e90 100644
--- a/Resources/Locale/en-US/verbs/verb-system.ftl
+++ b/Resources/Locale/en-US/verbs/verb-system.ftl
@@ -27,6 +27,7 @@ verb-categories-timer = Set Delay
 verb-categories-lever = Lever
 verb-categories-select-type = Select Type
 verb-categories-select-faction = Select Faction
+verb-categories-rename = Rename
 verb-categories-fax = Set Destination
 verb-categories-power-level = Power Level
 verb-categories-interaction = Interact
diff --git a/Resources/Maps/Deep-Space-Central-Command.yml b/Resources/Maps/Deep-Space-Central-Command.yml
index 134ff6b3d8..1b42e2f32a 100644
--- a/Resources/Maps/Deep-Space-Central-Command.yml
+++ b/Resources/Maps/Deep-Space-Central-Command.yml
@@ -4599,8 +4599,6 @@ entities:
       pos: -27.5,0.5
       parent: 2
     - type: DeviceNetwork
-      configurators:
-      - invalid
       deviceLists:
       - 166
   - uid: 311
@@ -4609,8 +4607,6 @@ entities:
       pos: -25.5,0.5
       parent: 2
     - type: DeviceNetwork
-      configurators:
-      - invalid
       deviceLists:
       - 166
   - uid: 312
@@ -29678,8 +29674,6 @@ entities:
       pos: -26.5,-0.5
       parent: 2
     - type: DeviceNetwork
-      configurators:
-      - invalid
       deviceLists:
       - 166
   - uid: 4046
@@ -29688,8 +29682,6 @@ entities:
       pos: -26.5,1.5
       parent: 2
     - type: DeviceNetwork
-      configurators:
-      - invalid
       deviceLists:
       - 166
   - uid: 4047
@@ -44886,9 +44878,6 @@ entities:
     - type: Transform
       pos: 1.5,45.5
       parent: 2
-    - type: DisposalUnit
-      recentlyEjected:
-      - invalid
   - uid: 5678
     components:
     - type: Transform
@@ -46805,16 +46794,16 @@ entities:
       parent: 2
     - type: Paper
       content: >
-        [color=#228B22]◥[bold]N[/bold]◣ [bold]Central Command[/bold][/color]  
+        [color=#228B22]◥[bold]N[/bold]◣ [bold]Central Command[/bold][/color]
 
-        [color=#228B22]‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾[/color]  
+        [color=#228B22]‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾[/color]
 
-        [head=2]Incident Report[/head]  
+        [head=2]Incident Report[/head]
 
 
         (* = A Required Field)
 
-        [head=3]Incident Details[/head]  
+        [head=3]Incident Details[/head]
 
         *[bold]Report ID:[/bold]
 
@@ -46827,17 +46816,17 @@ entities:
         *[bold]Vessel/Station Involved:[/bold]
 
 
-        *[head=3]Summary[/head]  
+        *[head=3]Summary[/head]
 
         [color=#AAAAAA][Insert detailed description of the incident, including key events, observations, and outcomes.][/color]
 
 
-        *[head=3]Actions Taken[/head]  
+        *[head=3]Actions Taken[/head]
 
         [color=#AAAAAA][Describe any actions taken to address the incident, including commands issued, personnel dispatched, or equipment used.][/color]
 
 
-        [head=3]Recommendations[/head]  
+        [head=3]Recommendations[/head]
 
         [color=#AAAAAA][Provide recommendations or requests for further action or investigation.][/color]
 
diff --git a/Resources/Maps/Shuttles/ShuttleEvent/SANDropship.yml b/Resources/Maps/Shuttles/ShuttleEvent/SANDropship.yml
new file mode 100644
index 0000000000..1f625f006c
--- /dev/null
+++ b/Resources/Maps/Shuttles/ShuttleEvent/SANDropship.yml
@@ -0,0 +1,2643 @@
+meta:
+  format: 6
+  postmapinit: false
+tilemap:
+  0: Space
+  89: FloorMS13MetalIndustrial
+  108: FloorMS13TileNavy
+  109: FloorMS13TileNavyFull
+  110: FloorMS13TileNavyLarge
+  160: FloorReinforced
+  215: Lattice
+  253: Plating
+entities:
+- proto: ""
+  entities:
+  - uid: 1
+    components:
+    - type: MetaData
+      name: SAN Shuttle
+    - type: Transform
+      pos: -0.6171875,1.6265492
+      parent: invalid
+    - type: MapGrid
+      chunks:
+        0,0:
+          ind: 0,0
+          tiles: 1wAAAAAA1wAAAAAA/QAAAAAA1wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        0,-1:
+          ind: 0,-1
+          tiles: /QAAAAAA/QAAAAAA1wAAAAAAAAAAAAAA1wAAAAAA/QAAAAAA/QAAAAAA1wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoAAAAAAAoAAAAAAA/QAAAAAAAAAAAAAA/QAAAAAA/QAAAAAA/QAAAAAA/QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/QAAAAAA/QAAAAAA/QAAAAAAAAAAAAAAoAAAAAAAWQAAAAAA/QAAAAAA/QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAA/QAAAAAA/QAAAAAA/QAAAAAA/QAAAAAAWQAAAAAA/QAAAAAA/QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbQAAAAAAbgAAAAAA/QAAAAAAWQAAAAAA/QAAAAAA/QAAAAAA/QAAAAAA/QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbQAAAAAAbgAAAAAAWQAAAAAAWQAAAAAA/QAAAAAA/QAAAAAA/QAAAAAA/QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbQAAAAAAbgAAAAAA/QAAAAAAWQAAAAAA/QAAAAAA/QAAAAAA1wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbQAAAAAAbgAAAAAA/QAAAAAA/QAAAAAA/QAAAAAA1wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbQAAAAAAbgAAAAAA/QAAAAAA/QAAAAAA1wAAAAAA1wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAA/QAAAAAA/QAAAAAA/QAAAAAA1wAAAAAA1wAAAAAA/QAAAAAA1wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbgAAAAAAbgAAAAAA/QAAAAAA/QAAAAAA1wAAAAAA/QAAAAAA/QAAAAAA/QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbgAAAAAAbgAAAAAA/QAAAAAA/QAAAAAA/QAAAAAA/QAAAAAAWQAAAAAA/QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAA/QAAAAAA/QAAAAAA/QAAAAAA/QAAAAAA/QAAAAAA/QAAAAAA/QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAbAAAAAAA/QAAAAAA/QAAAAAA1wAAAAAA1wAAAAAA/QAAAAAA1wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAbAAAAAAA/QAAAAAA/QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoAAAAAAAoAAAAAAA/QAAAAAA/QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        -1,0:
+          ind: -1,0
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA1wAAAAAA/QAAAAAA1wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        -1,-1:
+          ind: -1,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA1wAAAAAA/QAAAAAA/QAAAAAA1wAAAAAAAAAAAAAA1wAAAAAA/QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/QAAAAAA/QAAAAAA/QAAAAAA/QAAAAAAAAAAAAAA/QAAAAAAoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/QAAAAAA/QAAAAAAWQAAAAAAoAAAAAAAAAAAAAAA/QAAAAAA/QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/QAAAAAA/QAAAAAAWQAAAAAA/QAAAAAA/QAAAAAA/QAAAAAA/QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/QAAAAAA/QAAAAAA/QAAAAAA/QAAAAAAWQAAAAAA/QAAAAAAbgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/QAAAAAA/QAAAAAA/QAAAAAA/QAAAAAAWQAAAAAAWQAAAAAAbgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA1wAAAAAA/QAAAAAA/QAAAAAAWQAAAAAA/QAAAAAAbgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA1wAAAAAA/QAAAAAA/QAAAAAA/QAAAAAAbgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA1wAAAAAA1wAAAAAA/QAAAAAA/QAAAAAAbgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA1wAAAAAA/QAAAAAA1wAAAAAA1wAAAAAA/QAAAAAA/QAAAAAA/QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/QAAAAAA/QAAAAAA/QAAAAAA1wAAAAAA/QAAAAAA/QAAAAAAbgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/QAAAAAAWQAAAAAA/QAAAAAA/QAAAAAA/QAAAAAA/QAAAAAAbgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/QAAAAAA/QAAAAAA/QAAAAAA/QAAAAAA/QAAAAAA/QAAAAAA/QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA1wAAAAAA/QAAAAAA1wAAAAAA1wAAAAAA/QAAAAAA/QAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/QAAAAAA/QAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/QAAAAAA/QAAAAAAoAAAAAAA
+          version: 6
+    - type: Broadphase
+    - type: Physics
+      bodyStatus: InAir
+      angularDamping: 0.05
+      linearDamping: 0.05
+      fixedRotation: False
+      bodyType: Dynamic
+    - type: Fixtures
+      fixtures: {}
+    - type: OccluderTree
+    - type: SpreaderGrid
+    - type: Shuttle
+    - type: GridPathfinding
+    - type: Gravity
+      gravityShakeSound: !type:SoundPathSpecifier
+        path: /Audio/Effects/alert.ogg
+    - type: DecalGrid
+      chunkCollection:
+        version: 2
+        nodes: []
+    - type: GridAtmosphere
+      version: 2
+      data:
+        tiles:
+          0,0:
+            0: 11
+          -1,0:
+            0: 10
+          0,-1:
+            1: 33584
+          0,-4:
+            1: 4867
+            0: 4
+          -1,-4:
+            1: 2056
+            0: 5
+          0,-3:
+            1: 15355
+          -1,-3:
+            1: 35562
+          0,-2:
+            1: 13075
+          -1,-2:
+            1: 34824
+            0: 273
+          -1,-1:
+            1: 10368
+            0: 16
+          1,-2:
+            0: 435
+            1: 16448
+          1,-1:
+            0: 176
+            1: 64
+          1,-4:
+            0: 9
+            1: 41478
+          1,-3:
+            0: 9216
+          -2,-4:
+            0: 2
+            1: 43020
+          -2,-2:
+            0: 168
+            1: 16448
+          -2,-1:
+            0: 160
+            1: 64
+          -2,-3:
+            0: 33792
+        uniqueMixes:
+        - volume: 2500
+          immutable: True
+          moles:
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 21.824879
+          - 82.10312
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        chunkSize: 4
+    - type: GasTileOverlay
+    - type: RadiationGridResistance
+- proto: AirAlarm
+  entities:
+  - uid: 226
+    components:
+    - type: Transform
+      pos: -0.5,-6.5
+      parent: 1
+    - type: DeviceList
+      devices:
+      - 236
+      - 234
+      - 235
+      - 237
+- proto: AirCanister
+  entities:
+  - uid: 228
+    components:
+    - type: Transform
+      anchored: True
+      pos: -0.5,-5.5
+      parent: 1
+    - type: Physics
+      angularDamping: 0
+      linearDamping: 0
+      bodyType: Static
+- proto: AirlockExternal
+  entities:
+  - uid: 208
+    components:
+    - type: Transform
+      pos: 0.5,-12.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 215
+- proto: AirlockGlassShuttleSyndicate
+  entities:
+  - uid: 96
+    components:
+    - type: Transform
+      pos: 0.5,-15.5
+      parent: 1
+  - uid: 404
+    components:
+    - type: Transform
+      pos: 1.5,-15.5
+      parent: 1
+  - uid: 405
+    components:
+    - type: Transform
+      pos: -0.5,-15.5
+      parent: 1
+- proto: AirlockSyndicate
+  entities:
+  - uid: 58
+    components:
+    - type: Transform
+      pos: 0.5,-6.5
+      parent: 1
+  - uid: 206
+    components:
+    - type: MetaData
+      name: vacsuit storage
+    - type: Transform
+      pos: -1.5,-10.5
+      parent: 1
+  - uid: 207
+    components:
+    - type: MetaData
+      name: arms storage
+    - type: Transform
+      pos: 2.5,-10.5
+      parent: 1
+- proto: APCBasic
+  entities:
+  - uid: 280
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-5.5
+      parent: 1
+- proto: BlastDoor
+  entities:
+  - uid: 195
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-14.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 214
+  - uid: 196
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-14.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 214
+  - uid: 197
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-14.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 214
+- proto: BlastDoorOpen
+  entities:
+  - uid: 88
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-0.5
+      parent: 1
+  - uid: 193
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-0.5
+      parent: 1
+  - uid: 194
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-0.5
+      parent: 1
+- proto: BoxHandcuff
+  entities:
+  - uid: 406
+    components:
+    - type: Transform
+      pos: 3.6820488,-10.727015
+      parent: 1
+    - type: Physics
+      angularDamping: 0
+      linearDamping: 0
+- proto: C4
+  entities:
+  - uid: 402
+    components:
+    - type: Transform
+      pos: 1.6878899,-5.1635914
+      parent: 1
+    - type: Physics
+      angularDamping: 0
+      linearDamping: 0
+- proto: CableApcExtension
+  entities:
+  - uid: 219
+    components:
+    - type: Transform
+      pos: -3.5,-4.5
+      parent: 1
+  - uid: 221
+    components:
+    - type: Transform
+      pos: -5.5,-3.5
+      parent: 1
+  - uid: 281
+    components:
+    - type: Transform
+      pos: -2.5,-4.5
+      parent: 1
+  - uid: 294
+    components:
+    - type: Transform
+      pos: 6.5,-5.5
+      parent: 1
+  - uid: 297
+    components:
+    - type: Transform
+      pos: -5.5,-5.5
+      parent: 1
+  - uid: 298
+    components:
+    - type: Transform
+      pos: -5.5,-4.5
+      parent: 1
+  - uid: 309
+    components:
+    - type: Transform
+      pos: 3.5,-4.5
+      parent: 1
+  - uid: 315
+    components:
+    - type: Transform
+      pos: 2.5,-5.5
+      parent: 1
+  - uid: 316
+    components:
+    - type: Transform
+      pos: 1.5,-5.5
+      parent: 1
+  - uid: 317
+    components:
+    - type: Transform
+      pos: 0.5,-5.5
+      parent: 1
+  - uid: 318
+    components:
+    - type: Transform
+      pos: 0.5,-4.5
+      parent: 1
+  - uid: 319
+    components:
+    - type: Transform
+      pos: 0.5,-3.5
+      parent: 1
+  - uid: 320
+    components:
+    - type: Transform
+      pos: 0.5,-2.5
+      parent: 1
+  - uid: 321
+    components:
+    - type: Transform
+      pos: 0.5,-1.5
+      parent: 1
+  - uid: 322
+    components:
+    - type: Transform
+      pos: 0.5,-0.5
+      parent: 1
+  - uid: 323
+    components:
+    - type: Transform
+      pos: 0.5,-6.5
+      parent: 1
+  - uid: 324
+    components:
+    - type: Transform
+      pos: 0.5,-7.5
+      parent: 1
+  - uid: 325
+    components:
+    - type: Transform
+      pos: 0.5,-8.5
+      parent: 1
+  - uid: 326
+    components:
+    - type: Transform
+      pos: 0.5,-9.5
+      parent: 1
+  - uid: 327
+    components:
+    - type: Transform
+      pos: 0.5,-10.5
+      parent: 1
+  - uid: 328
+    components:
+    - type: Transform
+      pos: 0.5,-11.5
+      parent: 1
+  - uid: 329
+    components:
+    - type: Transform
+      pos: 0.5,-12.5
+      parent: 1
+  - uid: 330
+    components:
+    - type: Transform
+      pos: 0.5,-13.5
+      parent: 1
+  - uid: 331
+    components:
+    - type: Transform
+      pos: 0.5,-14.5
+      parent: 1
+  - uid: 332
+    components:
+    - type: Transform
+      pos: 0.5,-15.5
+      parent: 1
+  - uid: 333
+    components:
+    - type: Transform
+      pos: -0.5,-10.5
+      parent: 1
+  - uid: 334
+    components:
+    - type: Transform
+      pos: -1.5,-10.5
+      parent: 1
+  - uid: 335
+    components:
+    - type: Transform
+      pos: -2.5,-10.5
+      parent: 1
+  - uid: 336
+    components:
+    - type: Transform
+      pos: 1.5,-10.5
+      parent: 1
+  - uid: 337
+    components:
+    - type: Transform
+      pos: 2.5,-10.5
+      parent: 1
+  - uid: 338
+    components:
+    - type: Transform
+      pos: 3.5,-10.5
+      parent: 1
+  - uid: 339
+    components:
+    - type: Transform
+      pos: 4.5,-10.5
+      parent: 1
+  - uid: 340
+    components:
+    - type: Transform
+      pos: 4.5,-11.5
+      parent: 1
+  - uid: 341
+    components:
+    - type: Transform
+      pos: 5.5,-11.5
+      parent: 1
+  - uid: 342
+    components:
+    - type: Transform
+      pos: 6.5,-11.5
+      parent: 1
+  - uid: 343
+    components:
+    - type: Transform
+      pos: 6.5,-12.5
+      parent: 1
+  - uid: 344
+    components:
+    - type: Transform
+      pos: 6.5,-13.5
+      parent: 1
+  - uid: 345
+    components:
+    - type: Transform
+      pos: 6.5,-14.5
+      parent: 1
+  - uid: 346
+    components:
+    - type: Transform
+      pos: 5.5,-14.5
+      parent: 1
+  - uid: 347
+    components:
+    - type: Transform
+      pos: 4.5,-14.5
+      parent: 1
+  - uid: 348
+    components:
+    - type: Transform
+      pos: 4.5,-13.5
+      parent: 1
+  - uid: 349
+    components:
+    - type: Transform
+      pos: 4.5,-12.5
+      parent: 1
+  - uid: 350
+    components:
+    - type: Transform
+      pos: -3.5,-10.5
+      parent: 1
+  - uid: 351
+    components:
+    - type: Transform
+      pos: -3.5,-11.5
+      parent: 1
+  - uid: 352
+    components:
+    - type: Transform
+      pos: -4.5,-11.5
+      parent: 1
+  - uid: 353
+    components:
+    - type: Transform
+      pos: -5.5,-11.5
+      parent: 1
+  - uid: 354
+    components:
+    - type: Transform
+      pos: -5.5,-12.5
+      parent: 1
+  - uid: 355
+    components:
+    - type: Transform
+      pos: -5.5,-13.5
+      parent: 1
+  - uid: 356
+    components:
+    - type: Transform
+      pos: -5.5,-14.5
+      parent: 1
+  - uid: 357
+    components:
+    - type: Transform
+      pos: -4.5,-14.5
+      parent: 1
+  - uid: 358
+    components:
+    - type: Transform
+      pos: -3.5,-14.5
+      parent: 1
+  - uid: 359
+    components:
+    - type: Transform
+      pos: -3.5,-13.5
+      parent: 1
+  - uid: 360
+    components:
+    - type: Transform
+      pos: -3.5,-12.5
+      parent: 1
+  - uid: 361
+    components:
+    - type: Transform
+      pos: 3.5,-5.5
+      parent: 1
+  - uid: 362
+    components:
+    - type: Transform
+      pos: -4.5,-4.5
+      parent: 1
+  - uid: 363
+    components:
+    - type: Transform
+      pos: 4.5,-4.5
+      parent: 1
+  - uid: 365
+    components:
+    - type: Transform
+      pos: 2.5,-4.5
+      parent: 1
+  - uid: 377
+    components:
+    - type: Transform
+      pos: -0.5,-4.5
+      parent: 1
+  - uid: 378
+    components:
+    - type: Transform
+      pos: -1.5,-4.5
+      parent: 1
+  - uid: 379
+    components:
+    - type: Transform
+      pos: -2.5,-4.5
+      parent: 1
+  - uid: 380
+    components:
+    - type: Transform
+      pos: -3.5,-4.5
+      parent: 1
+  - uid: 383
+    components:
+    - type: Transform
+      pos: -4.5,-4.5
+      parent: 1
+  - uid: 384
+    components:
+    - type: Transform
+      pos: 5.5,-4.5
+      parent: 1
+  - uid: 385
+    components:
+    - type: Transform
+      pos: 3.5,-4.5
+      parent: 1
+  - uid: 386
+    components:
+    - type: Transform
+      pos: 6.5,-4.5
+      parent: 1
+  - uid: 387
+    components:
+    - type: Transform
+      pos: 4.5,-4.5
+      parent: 1
+  - uid: 388
+    components:
+    - type: Transform
+      pos: 6.5,-3.5
+      parent: 1
+  - uid: 394
+    components:
+    - type: Transform
+      pos: -0.5,-2.5
+      parent: 1
+  - uid: 395
+    components:
+    - type: Transform
+      pos: -1.5,-2.5
+      parent: 1
+  - uid: 396
+    components:
+    - type: Transform
+      pos: -1.5,-1.5
+      parent: 1
+  - uid: 397
+    components:
+    - type: Transform
+      pos: -1.5,-0.5
+      parent: 1
+  - uid: 398
+    components:
+    - type: Transform
+      pos: 1.5,-2.5
+      parent: 1
+  - uid: 399
+    components:
+    - type: Transform
+      pos: 2.5,-2.5
+      parent: 1
+  - uid: 400
+    components:
+    - type: Transform
+      pos: 2.5,-1.5
+      parent: 1
+  - uid: 401
+    components:
+    - type: Transform
+      pos: 2.5,-0.5
+      parent: 1
+- proto: Cablecuffs
+  entities:
+  - uid: 275
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.6836097,-5.290907
+      parent: 1
+  - uid: 276
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.4961097,-5.244032
+      parent: 1
+- proto: CableHV
+  entities:
+  - uid: 46
+    components:
+    - type: Transform
+      pos: -5.5,-13.5
+      parent: 1
+  - uid: 66
+    components:
+    - type: Transform
+      pos: -2.5,-11.5
+      parent: 1
+  - uid: 72
+    components:
+    - type: Transform
+      pos: -1.5,-10.5
+      parent: 1
+  - uid: 81
+    components:
+    - type: Transform
+      pos: 0.5,-9.5
+      parent: 1
+  - uid: 82
+    components:
+    - type: Transform
+      pos: -3.5,-11.5
+      parent: 1
+  - uid: 84
+    components:
+    - type: Transform
+      pos: 0.5,-10.5
+      parent: 1
+  - uid: 86
+    components:
+    - type: Transform
+      pos: -2.5,-10.5
+      parent: 1
+  - uid: 87
+    components:
+    - type: Transform
+      pos: -4.5,-13.5
+      parent: 1
+  - uid: 101
+    components:
+    - type: Transform
+      pos: 6.5,-13.5
+      parent: 1
+  - uid: 106
+    components:
+    - type: Transform
+      pos: -4.5,-12.5
+      parent: 1
+  - uid: 113
+    components:
+    - type: Transform
+      pos: -4.5,-11.5
+      parent: 1
+  - uid: 117
+    components:
+    - type: Transform
+      pos: 5.5,-12.5
+      parent: 1
+  - uid: 118
+    components:
+    - type: Transform
+      pos: 5.5,-11.5
+      parent: 1
+  - uid: 119
+    components:
+    - type: Transform
+      pos: 5.5,-13.5
+      parent: 1
+  - uid: 122
+    components:
+    - type: Transform
+      pos: 1.5,-10.5
+      parent: 1
+  - uid: 133
+    components:
+    - type: Transform
+      pos: -0.5,-10.5
+      parent: 1
+  - uid: 278
+    components:
+    - type: Transform
+      pos: 2.5,-10.5
+      parent: 1
+  - uid: 299
+    components:
+    - type: Transform
+      pos: 0.5,-7.5
+      parent: 1
+  - uid: 300
+    components:
+    - type: Transform
+      pos: -2.5,-4.5
+      parent: 1
+  - uid: 301
+    components:
+    - type: Transform
+      pos: 0.5,-6.5
+      parent: 1
+  - uid: 302
+    components:
+    - type: Transform
+      pos: 0.5,-5.5
+      parent: 1
+  - uid: 303
+    components:
+    - type: Transform
+      pos: 0.5,-4.5
+      parent: 1
+  - uid: 304
+    components:
+    - type: Transform
+      pos: 1.5,-4.5
+      parent: 1
+  - uid: 305
+    components:
+    - type: Transform
+      pos: 2.5,-4.5
+      parent: 1
+  - uid: 306
+    components:
+    - type: Transform
+      pos: 3.5,-4.5
+      parent: 1
+  - uid: 307
+    components:
+    - type: Transform
+      pos: 0.5,-8.5
+      parent: 1
+  - uid: 389
+    components:
+    - type: Transform
+      pos: 3.5,-10.5
+      parent: 1
+  - uid: 390
+    components:
+    - type: Transform
+      pos: 3.5,-11.5
+      parent: 1
+  - uid: 391
+    components:
+    - type: Transform
+      pos: 4.5,-11.5
+      parent: 1
+- proto: CableMV
+  entities:
+  - uid: 313
+    components:
+    - type: Transform
+      pos: 2.5,-4.5
+      parent: 1
+  - uid: 314
+    components:
+    - type: Transform
+      pos: 2.5,-5.5
+      parent: 1
+- proto: ChairPilotSeat
+  entities:
+  - uid: 89
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-9.5
+      parent: 1
+  - uid: 90
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-8.5
+      parent: 1
+  - uid: 91
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-9.5
+      parent: 1
+  - uid: 92
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-8.5
+      parent: 1
+  - uid: 93
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-7.5
+      parent: 1
+  - uid: 99
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-7.5
+      parent: 1
+  - uid: 134
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-2.5
+      parent: 1
+- proto: ComputerComms
+  entities:
+  - uid: 136
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-2.5
+      parent: 1
+- proto: ComputerIFF
+  entities:
+  - uid: 131
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-2.5
+      parent: 1
+- proto: ComputerShuttle
+  entities:
+  - uid: 135
+    components:
+    - type: Transform
+      pos: 0.5,-1.5
+      parent: 1
+- proto: DecorFloorFood1
+  entities:
+  - uid: 76
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-11.5
+      parent: 1
+    - type: Fixtures
+      fixtures: {}
+- proto: DecorFloorFood4
+  entities:
+  - uid: 78
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-10.5
+      parent: 1
+    - type: Fixtures
+      fixtures: {}
+- proto: DecorFloorFood6
+  entities:
+  - uid: 132
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-9.5
+      parent: 1
+    - type: Fixtures
+      fixtures: {}
+- proto: Doorjack
+  entities:
+  - uid: 102
+    components:
+    - type: Transform
+      pos: 3.5337243,-9.2386
+      parent: 1
+- proto: FireAlarm
+  entities:
+  - uid: 227
+    components:
+    - type: Transform
+      pos: 1.5,-6.5
+      parent: 1
+    - type: DeviceList
+      devices:
+      - 211
+      - 210
+      - 209
+      - 140
+      - 139
+- proto: Firelock
+  entities:
+  - uid: 210
+    components:
+    - type: Transform
+      pos: 0.5,-6.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 227
+  - uid: 211
+    components:
+    - type: Transform
+      pos: 0.5,-3.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 227
+- proto: FirelockEdge
+  entities:
+  - uid: 139
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-11.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 227
+  - uid: 140
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-11.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 227
+  - uid: 209
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-11.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 227
+- proto: FoodPacketCheesieTrash
+  entities:
+  - uid: 103
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.8447063,-11.472694
+      parent: 1
+- proto: FoodPacketEnergyTrash
+  entities:
+  - uid: 77
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.8506062,-7.703654
+      parent: 1
+  - uid: 79
+    components:
+    - type: Transform
+      pos: 1.3349812,-1.9614663
+      parent: 1
+- proto: FoodPlateTrash
+  entities:
+  - uid: 75
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5634563,-11.941444
+      parent: 1
+- proto: GasPassiveVent
+  entities:
+  - uid: 257
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-15.5
+      parent: 1
+  - uid: 268
+    components:
+    - type: Transform
+      pos: 0.5,-13.5
+      parent: 1
+- proto: GasPipeBend
+  entities:
+  - uid: 229
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-4.5
+      parent: 1
+  - uid: 232
+    components:
+    - type: Transform
+      pos: 0.5,-2.5
+      parent: 1
+  - uid: 250
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-10.5
+      parent: 1
+  - uid: 251
+    components:
+    - type: Transform
+      pos: 2.5,-10.5
+      parent: 1
+  - uid: 252
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-15.5
+      parent: 1
+  - uid: 260
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-11.5
+      parent: 1
+  - uid: 264
+    components:
+    - type: Transform
+      pos: 1.5,-11.5
+      parent: 1
+  - uid: 265
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-14.5
+      parent: 1
+  - uid: 266
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-14.5
+      parent: 1
+- proto: GasPipeStraight
+  entities:
+  - uid: 231
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-3.5
+      parent: 1
+  - uid: 238
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-5.5
+      parent: 1
+  - uid: 239
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-6.5
+      parent: 1
+  - uid: 240
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-7.5
+      parent: 1
+  - uid: 243
+    components:
+    - type: Transform
+      pos: 1.5,-3.5
+      parent: 1
+  - uid: 244
+    components:
+    - type: Transform
+      pos: 1.5,-4.5
+      parent: 1
+  - uid: 245
+    components:
+    - type: Transform
+      pos: 1.5,-5.5
+      parent: 1
+  - uid: 246
+    components:
+    - type: Transform
+      pos: 1.5,-6.5
+      parent: 1
+  - uid: 247
+    components:
+    - type: Transform
+      pos: 1.5,-7.5
+      parent: 1
+  - uid: 248
+    components:
+    - type: Transform
+      pos: 1.5,-8.5
+      parent: 1
+  - uid: 249
+    components:
+    - type: Transform
+      pos: 1.5,-9.5
+      parent: 1
+  - uid: 253
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-11.5
+      parent: 1
+  - uid: 254
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-12.5
+      parent: 1
+  - uid: 255
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-13.5
+      parent: 1
+  - uid: 256
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-14.5
+      parent: 1
+  - uid: 258
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-12.5
+      parent: 1
+  - uid: 261
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-9.5
+      parent: 1
+  - uid: 262
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-10.5
+      parent: 1
+  - uid: 263
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-12.5
+      parent: 1
+- proto: GasPipeTJunction
+  entities:
+  - uid: 230
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-4.5
+      parent: 1
+  - uid: 241
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-8.5
+      parent: 1
+  - uid: 259
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-11.5
+      parent: 1
+  - uid: 267
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-14.5
+      parent: 1
+- proto: GasPort
+  entities:
+  - uid: 130
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-5.5
+      parent: 1
+- proto: GasPressurePump
+  entities:
+  - uid: 269
+    components:
+    - type: MetaData
+      name: repressurization pump
+    - type: Transform
+      pos: -0.5,-13.5
+      parent: 1
+  - uid: 270
+    components:
+    - type: MetaData
+      name: depressurization pump
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-13.5
+      parent: 1
+- proto: GasVentPump
+  entities:
+  - uid: 233
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-2.5
+      parent: 1
+  - uid: 234
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-4.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 226
+  - uid: 235
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-8.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 226
+- proto: GasVentScrubber
+  entities:
+  - uid: 236
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-5.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 226
+  - uid: 237
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-9.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 226
+  - uid: 242
+    components:
+    - type: Transform
+      pos: 1.5,-2.5
+      parent: 1
+- proto: GeneratorRTG
+  entities:
+  - uid: 47
+    components:
+    - type: Transform
+      pos: 5.5,-12.5
+      parent: 1
+  - uid: 382
+    components:
+    - type: Transform
+      pos: -4.5,-12.5
+      parent: 1
+- proto: GeneratorWallmountAPU
+  entities:
+  - uid: 45
+    components:
+    - type: Transform
+      pos: -5.5,-13.5
+      parent: 1
+  - uid: 49
+    components:
+    - type: Transform
+      pos: 6.5,-13.5
+      parent: 1
+- proto: GravityGeneratorMini
+  entities:
+  - uid: 85
+    components:
+    - type: Transform
+      pos: 6.5,-4.5
+      parent: 1
+- proto: GrenadeFlashBang
+  entities:
+  - uid: 277
+    components:
+    - type: Transform
+      pos: 1.4492347,-5.4080944
+      parent: 1
+- proto: Grille
+  entities:
+  - uid: 36
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-0.5
+      parent: 1
+  - uid: 37
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-0.5
+      parent: 1
+  - uid: 38
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-0.5
+      parent: 1
+- proto: GrilleDiagonal
+  entities:
+  - uid: 39
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,0.5
+      parent: 1
+  - uid: 40
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-1.5
+      parent: 1
+  - uid: 41
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-1.5
+      parent: 1
+  - uid: 42
+    components:
+    - type: Transform
+      pos: 1.5,0.5
+      parent: 1
+- proto: Gyroscope
+  entities:
+  - uid: 83
+    components:
+    - type: Transform
+      pos: -5.5,-4.5
+      parent: 1
+- proto: HighSecSANLocked
+  entities:
+  - uid: 57
+    components:
+    - type: Transform
+      pos: 0.5,-3.5
+      parent: 1
+  - uid: 67
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-13.5
+      parent: 1
+  - uid: 155
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-4.5
+      parent: 1
+  - uid: 162
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-13.5
+      parent: 1
+  - uid: 212
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-4.5
+      parent: 1
+- proto: MagazineBoxPistol
+  entities:
+  - uid: 61
+    components:
+    - type: Transform
+      pos: 3.4165368,-9.472975
+      parent: 1
+- proto: MagazineBoxPistolRubber
+  entities:
+  - uid: 48
+    components:
+    - type: Transform
+      pos: 3.6977868,-9.566725
+      parent: 1
+- proto: MagazinePistolSubMachineGun
+  entities:
+  - uid: 274
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5429847,-4.681532
+      parent: 1
+- proto: MagazinePistolSubMachineGunRubber
+  entities:
+  - uid: 273
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.6836097,-4.869032
+      parent: 1
+- proto: N14DecorFloorGlass5
+  entities:
+  - uid: 80
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-11.5
+      parent: 1
+    - type: Fixtures
+      fixtures: {}
+- proto: PlastitaniumWindow
+  entities:
+  - uid: 6
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-0.5
+      parent: 1
+  - uid: 7
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-0.5
+      parent: 1
+  - uid: 8
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-0.5
+      parent: 1
+- proto: PlastitaniumWindowDiagonal
+  entities:
+  - uid: 2
+    components:
+    - type: Transform
+      pos: 1.5,0.5
+      parent: 1
+  - uid: 3
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,0.5
+      parent: 1
+  - uid: 4
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-1.5
+      parent: 1
+  - uid: 5
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-1.5
+      parent: 1
+- proto: PoweredLEDSmallLight
+  entities:
+  - uid: 289
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-5.5
+      parent: 1
+  - uid: 290
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-2.5
+      parent: 1
+- proto: PoweredlightGreen
+  entities:
+  - uid: 286
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-6.5
+      parent: 1
+- proto: PoweredlightRed
+  entities:
+  - uid: 287
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-6.5
+      parent: 1
+- proto: PoweredSmallLight
+  entities:
+  - uid: 282
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-13.5
+      parent: 1
+  - uid: 283
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-13.5
+      parent: 1
+  - uid: 285
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-13.5
+      parent: 1
+  - uid: 288
+    components:
+    - type: Transform
+      pos: 1.5,-7.5
+      parent: 1
+  - uid: 291
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-10.5
+      parent: 1
+  - uid: 292
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-10.5
+      parent: 1
+  - uid: 293
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-11.5
+      parent: 1
+  - uid: 295
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-4.5
+      parent: 1
+  - uid: 393
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-4.5
+      parent: 1
+- proto: Rack
+  entities:
+  - uid: 200
+    components:
+    - type: Transform
+      pos: 3.5,-9.5
+      parent: 1
+  - uid: 201
+    components:
+    - type: Transform
+      pos: 3.5,-11.5
+      parent: 1
+- proto: SignalButton
+  entities:
+  - uid: 213
+    components:
+    - type: MetaData
+      name: cockpit blast shields
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-3.5
+      parent: 1
+  - uid: 214
+    components:
+    - type: MetaData
+      name: external blast doors
+    - type: Transform
+      pos: 1.5,-12.5
+      parent: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        195:
+        - Pressed: Toggle
+        196:
+        - Pressed: Toggle
+        197:
+        - Pressed: Toggle
+  - uid: 215
+    components:
+    - type: MetaData
+      name: external bolts
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-12.5
+      parent: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        208:
+        - Pressed: DoorBolt
+  - uid: 218
+    components:
+    - type: MetaData
+      name: cockpit bolts
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-3.5
+      parent: 1
+- proto: SpawnPointGhostSANDeserter
+  entities:
+  - uid: 407
+    components:
+    - type: Transform
+      pos: -0.5,-9.5
+      parent: 1
+  - uid: 408
+    components:
+    - type: Transform
+      pos: 1.5,-7.5
+      parent: 1
+  - uid: 409
+    components:
+    - type: Transform
+      pos: 0.5,-4.5
+      parent: 1
+- proto: SubstationWallBasic
+  entities:
+  - uid: 279
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-4.5
+      parent: 1
+- proto: SuitStorageBasic
+  entities:
+  - uid: 198
+    components:
+    - type: Transform
+      pos: -2.5,-9.5
+      parent: 1
+  - uid: 199
+    components:
+    - type: Transform
+      pos: -2.5,-11.5
+      parent: 1
+- proto: SuitStorageShanlin
+  entities:
+  - uid: 137
+    components:
+    - type: Transform
+      pos: -0.5,-4.5
+      parent: 1
+- proto: TableReinforced
+  entities:
+  - uid: 271
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-4.5
+      parent: 1
+  - uid: 272
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-5.5
+      parent: 1
+- proto: Thruster
+  entities:
+  - uid: 44
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-0.5
+      parent: 1
+  - uid: 50
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,-6.5
+      parent: 1
+  - uid: 51
+    components:
+    - type: Transform
+      pos: 6.5,-2.5
+      parent: 1
+  - uid: 54
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,-6.5
+      parent: 1
+  - uid: 65
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-0.5
+      parent: 1
+  - uid: 112
+    components:
+    - type: Transform
+      pos: -5.5,-2.5
+      parent: 1
+  - uid: 169
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,-15.5
+      parent: 1
+  - uid: 170
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-15.5
+      parent: 1
+  - uid: 171
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-15.5
+      parent: 1
+  - uid: 172
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,-15.5
+      parent: 1
+  - uid: 174
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-12.5
+      parent: 1
+  - uid: 175
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-12.5
+      parent: 1
+- proto: ToolboxSyndicateFilled
+  entities:
+  - uid: 403
+    components:
+    - type: Transform
+      pos: 3.561351,-10.418608
+      parent: 1
+    - type: Physics
+      angularDamping: 0
+      linearDamping: 0
+- proto: WallPlastitanium
+  entities:
+  - uid: 9
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,0.5
+      parent: 1
+  - uid: 10
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-0.5
+      parent: 1
+  - uid: 11
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-1.5
+      parent: 1
+  - uid: 12
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,0.5
+      parent: 1
+  - uid: 13
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-0.5
+      parent: 1
+  - uid: 14
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-1.5
+      parent: 1
+  - uid: 16
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-1.5
+      parent: 1
+  - uid: 17
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-1.5
+      parent: 1
+  - uid: 18
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-2.5
+      parent: 1
+  - uid: 19
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-3.5
+      parent: 1
+  - uid: 20
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-2.5
+      parent: 1
+  - uid: 21
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-3.5
+      parent: 1
+  - uid: 22
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-3.5
+      parent: 1
+  - uid: 23
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-2.5
+      parent: 1
+  - uid: 24
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-3.5
+      parent: 1
+  - uid: 25
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-3.5
+      parent: 1
+  - uid: 26
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-4.5
+      parent: 1
+  - uid: 27
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-5.5
+      parent: 1
+  - uid: 28
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-6.5
+      parent: 1
+  - uid: 29
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-6.5
+      parent: 1
+  - uid: 30
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-6.5
+      parent: 1
+  - uid: 31
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-6.5
+      parent: 1
+  - uid: 32
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-5.5
+      parent: 1
+  - uid: 33
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-4.5
+      parent: 1
+  - uid: 34
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-2.5
+      parent: 1
+  - uid: 35
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-3.5
+      parent: 1
+  - uid: 52
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-5.5
+      parent: 1
+  - uid: 55
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-7.5
+      parent: 1
+  - uid: 56
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-7.5
+      parent: 1
+  - uid: 62
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-5.5
+      parent: 1
+  - uid: 68
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-7.5
+      parent: 1
+  - uid: 69
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-8.5
+      parent: 1
+  - uid: 71
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-5.5
+      parent: 1
+  - uid: 94
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-8.5
+      parent: 1
+  - uid: 95
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-9.5
+      parent: 1
+  - uid: 97
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-8.5
+      parent: 1
+  - uid: 98
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-9.5
+      parent: 1
+  - uid: 100
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-4.5
+      parent: 1
+  - uid: 104
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-8.5
+      parent: 1
+  - uid: 105
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-4.5
+      parent: 1
+  - uid: 107
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-5.5
+      parent: 1
+  - uid: 109
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-6.5
+      parent: 1
+  - uid: 110
+    components:
+    - type: Transform
+      pos: 3.5,-4.5
+      parent: 1
+  - uid: 111
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-3.5
+      parent: 1
+  - uid: 114
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-7.5
+      parent: 1
+  - uid: 115
+    components:
+    - type: Transform
+      pos: 3.5,-8.5
+      parent: 1
+  - uid: 116
+    components:
+    - type: Transform
+      pos: 4.5,-8.5
+      parent: 1
+  - uid: 121
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-5.5
+      parent: 1
+  - uid: 123
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-6.5
+      parent: 1
+  - uid: 124
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-4.5
+      parent: 1
+  - uid: 125
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-3.5
+      parent: 1
+  - uid: 126
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-9.5
+      parent: 1
+  - uid: 127
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-9.5
+      parent: 1
+  - uid: 128
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-11.5
+      parent: 1
+  - uid: 129
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-11.5
+      parent: 1
+  - uid: 141
+    components:
+    - type: Transform
+      pos: -1.5,-11.5
+      parent: 1
+  - uid: 142
+    components:
+    - type: Transform
+      pos: -1.5,-12.5
+      parent: 1
+  - uid: 143
+    components:
+    - type: Transform
+      pos: -0.5,-12.5
+      parent: 1
+  - uid: 144
+    components:
+    - type: Transform
+      pos: 2.5,-11.5
+      parent: 1
+  - uid: 145
+    components:
+    - type: Transform
+      pos: 2.5,-12.5
+      parent: 1
+  - uid: 146
+    components:
+    - type: Transform
+      pos: 1.5,-12.5
+      parent: 1
+  - uid: 147
+    components:
+    - type: Transform
+      pos: -1.5,-13.5
+      parent: 1
+  - uid: 148
+    components:
+    - type: Transform
+      pos: -1.5,-14.5
+      parent: 1
+  - uid: 149
+    components:
+    - type: Transform
+      pos: 2.5,-13.5
+      parent: 1
+  - uid: 150
+    components:
+    - type: Transform
+      pos: 2.5,-14.5
+      parent: 1
+  - uid: 151
+    components:
+    - type: Transform
+      pos: 4.5,-9.5
+      parent: 1
+  - uid: 152
+    components:
+    - type: Transform
+      pos: 5.5,-9.5
+      parent: 1
+  - uid: 153
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-10.5
+      parent: 1
+  - uid: 154
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-10.5
+      parent: 1
+  - uid: 156
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-12.5
+      parent: 1
+  - uid: 157
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-12.5
+      parent: 1
+  - uid: 158
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-11.5
+      parent: 1
+  - uid: 159
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-11.5
+      parent: 1
+  - uid: 160
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-12.5
+      parent: 1
+  - uid: 161
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-12.5
+      parent: 1
+  - uid: 163
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-14.5
+      parent: 1
+  - uid: 164
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,-14.5
+      parent: 1
+  - uid: 173
+    components:
+    - type: Transform
+      pos: -6.5,-13.5
+      parent: 1
+  - uid: 176
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,-14.5
+      parent: 1
+  - uid: 177
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-11.5
+      parent: 1
+  - uid: 178
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-11.5
+      parent: 1
+  - uid: 179
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -6.5,-14.5
+      parent: 1
+  - uid: 180
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-11.5
+      parent: 1
+  - uid: 181
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-11.5
+      parent: 1
+  - uid: 182
+    components:
+    - type: Transform
+      pos: -6.5,-10.5
+      parent: 1
+  - uid: 183
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-12.5
+      parent: 1
+  - uid: 184
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-13.5
+      parent: 1
+  - uid: 185
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-14.5
+      parent: 1
+  - uid: 186
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-14.5
+      parent: 1
+  - uid: 187
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-10.5
+      parent: 1
+  - uid: 188
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-10.5
+      parent: 1
+  - uid: 189
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-14.5
+      parent: 1
+  - uid: 190
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-14.5
+      parent: 1
+  - uid: 191
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-12.5
+      parent: 1
+  - uid: 192
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-13.5
+      parent: 1
+  - uid: 204
+    components:
+    - type: Transform
+      pos: 6.5,-10.5
+      parent: 1
+  - uid: 205
+    components:
+    - type: Transform
+      pos: -5.5,-10.5
+      parent: 1
+  - uid: 216
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-15.5
+      parent: 1
+  - uid: 217
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-15.5
+      parent: 1
+  - uid: 220
+    components:
+    - type: Transform
+      pos: 7.5,-10.5
+      parent: 1
+  - uid: 222
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-4.5
+      parent: 1
+  - uid: 224
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-4.5
+      parent: 1
+  - uid: 284
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-3.5
+      parent: 1
+  - uid: 310
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-3.5
+      parent: 1
+  - uid: 311
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-3.5
+      parent: 1
+  - uid: 312
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-5.5
+      parent: 1
+  - uid: 366
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-3.5
+      parent: 1
+  - uid: 372
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-3.5
+      parent: 1
+  - uid: 374
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-5.5
+      parent: 1
+  - uid: 375
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-3.5
+      parent: 1
+  - uid: 376
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-5.5
+      parent: 1
+  - uid: 392
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-13.5
+      parent: 1
+- proto: WallPlastitaniumDiagonal
+  entities:
+  - uid: 15
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,0.5
+      parent: 1
+  - uid: 43
+    components:
+    - type: Transform
+      pos: -2.5,0.5
+      parent: 1
+  - uid: 53
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-6.5
+      parent: 1
+  - uid: 60
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-6.5
+      parent: 1
+  - uid: 64
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,-5.5
+      parent: 1
+  - uid: 108
+    components:
+    - type: Transform
+      pos: -3.5,-7.5
+      parent: 1
+  - uid: 120
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-7.5
+      parent: 1
+  - uid: 165
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,-15.5
+      parent: 1
+  - uid: 166
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,-15.5
+      parent: 1
+  - uid: 167
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-15.5
+      parent: 1
+  - uid: 168
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-15.5
+      parent: 1
+  - uid: 202
+    components:
+    - type: Transform
+      pos: -4.5,-8.5
+      parent: 1
+  - uid: 203
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-8.5
+      parent: 1
+  - uid: 223
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-2.5
+      parent: 1
+  - uid: 296
+    components:
+    - type: Transform
+      pos: -5.5,-9.5
+      parent: 1
+  - uid: 308
+    components:
+    - type: Transform
+      pos: -3.5,-2.5
+      parent: 1
+  - uid: 364
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-2.5
+      parent: 1
+  - uid: 367
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-2.5
+      parent: 1
+  - uid: 368
+    components:
+    - type: Transform
+      pos: -6.5,-2.5
+      parent: 1
+  - uid: 369
+    components:
+    - type: Transform
+      pos: 5.5,-2.5
+      parent: 1
+  - uid: 370
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,-6.5
+      parent: 1
+  - uid: 371
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-5.5
+      parent: 1
+  - uid: 373
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-6.5
+      parent: 1
+  - uid: 381
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-9.5
+      parent: 1
+- proto: WallWeaponCapacitorRecharger
+  entities:
+  - uid: 63
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-11.5
+      parent: 1
+  - uid: 73
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-9.5
+      parent: 1
+  - uid: 74
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-10.5
+      parent: 1
+- proto: WeaponDisablerSMG
+  entities:
+  - uid: 59
+    components:
+    - type: Transform
+      pos: 3.5225673,-11.660795
+      parent: 1
+  - uid: 70
+    components:
+    - type: Transform
+      pos: 3.4991298,-11.473295
+      parent: 1
+- proto: WeaponSubMachineGunC20r
+  entities:
+  - uid: 138
+    components:
+    - type: Transform
+      pos: 1.6367347,-4.306532
+      parent: 1
+- proto: WeaponTurretSAN
+  entities:
+  - uid: 225
+    components:
+    - type: Transform
+      pos: 0.5,0.5
+      parent: 1
+...
diff --git a/Resources/Maps/pebble.yml b/Resources/Maps/pebble.yml
index 834c39e37b..a7e5ad2617 100644
--- a/Resources/Maps/pebble.yml
+++ b/Resources/Maps/pebble.yml
@@ -6581,12 +6581,6 @@ entities:
     - type: Transform
       pos: -14.5,9.5
       parent: 2
-    - type: Door
-      secondsUntilStateChange: -6886.2603
-      state: Opening
-    - type: DeviceLinkSource
-      lastSignals:
-        DoorStatus: True
 - proto: AirlockMedicalGlassLocked
   entities:
   - uid: 10736
@@ -47692,13 +47686,6 @@ entities:
     - type: Transform
       pos: 16.5,4.5
       parent: 2
-- proto: GlassBoxLaserFilled
-  entities:
-  - uid: 9383
-    components:
-    - type: Transform
-      pos: -10.5,-28.5
-      parent: 2
 - proto: GlimmerProber
   entities:
   - uid: 7005
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml b/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml
index 6341042bf8..ad9146f3aa 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml
@@ -57,3 +57,13 @@
   cost: 5200
   category: cargoproduct-category-name-armory
   group: market
+
+- type: cargoProduct
+  id: ArmoryBRDIR25
+  icon:
+    sprite: _EE/Objects/Weapons/Guns/SMGs/BRDI_R25.rsi
+    state: icon
+  product: CrateArmoryBRDIR25
+  cost: 12000
+  category: cargoproduct-category-name-armory
+  group: market
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/armory.yml b/Resources/Prototypes/Catalog/Fills/Crates/armory.yml
index d5aab23717..c618443998 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/armory.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/armory.yml
@@ -69,3 +69,16 @@
       amount: 2
     - id: MagazinePistol
       amount: 4
+
+- type: entity
+  id: CrateArmoryBRDIR25
+  parent: CrateWeaponSecure
+  name: BRDI-R25 crate
+  description: Contains two integrally suppressed bullpup rifles. Imported from Biesel Republic Defense Industries. Requires Armory access to open.
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponSubMachineGunBRDIR25
+      amount: 2
+    - id: MagazineCaselessRifle
+      amount: 4
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml b/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml
index 5b6a602de2..330eaeace2 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml
@@ -313,6 +313,9 @@
     - id: PlushieThrongler
       prob: 0.0005
       orGroup: Plushies
+    - id: PlushieShadowkin
+      prob: 0.01
+      orGroup: Plushies
     #useful
     - id: AmeJar
       prob: 0.01
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
index d40773108d..cfe65601c8 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
@@ -10,6 +10,7 @@
     - id: PlushieNuke
     - id: PlushieSlime
     - id: PlushieSnake
+    - id: PlushieShadowkin
     - !type:GroupSelector
       children:
       - id: PlushieLizard
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
index f2b1b4b1f5..f7f69adc14 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -309,3 +309,16 @@
     contents:
     - id: WeaponLaserCarbine
       amount: 3
+
+- type: entity
+  id: GunSafeRifleBRDIR25
+  suffix: BRDI-R25
+  parent: GunSafe
+  name: BRDI-R25 safe
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponSubMachineGunBRDIR25
+      amount: 2
+    - id: MagazineCaselessRifle
+      amount: 4
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
index ba386a83ac..57b111dcc0 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
@@ -130,6 +130,7 @@
         prob: 0.3
       - id: ClothingBeltPlant
       - id: PlantBag ##Some maps don't have nutrivend
+      - id: PlantAnalyzer
       - id: BoxMouthSwab
       - id: Dropper
       - id: HandLabeler
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
index 7ad481c68b..f3f9925f1e 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
@@ -319,3 +319,26 @@
         - id: OxygenTankFilled
         - id: ClothingOuterHardsuitWizard
         - id: ClothingMaskBreath
+
+# Cybersun Armoring Corporation
+- type: entity
+  id: SuitStorageShanlin
+  parent: SuitStorageBase
+  suffix: CSA-51a
+  components:
+    - type: StorageFill
+      contents:
+          - id: OxygenTankFilled
+          - id: ClothingOuterHardsuitShanlinUnpainted
+          - id: ClothingMaskBreath
+
+- type: entity
+  id: SuitStorageShiwei
+  parent: SuitStorageBase
+  suffix: CSA-54UA
+  components:
+    - type: StorageFill
+      contents:
+          - id: OxygenTankFilled
+          - id: ClothingOuterHardsuitShiweiUnpainted
+          - id: ClothingMaskBreath
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml
index 18f3a81ddb..2292582aac 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml
@@ -7,6 +7,7 @@
     HydroponicsToolScythe: 3
     HydroponicsToolHatchet: 3
     Dropper: 3
+    PlantAnalyzer: 4
     PlantBag: 3
     PlantBGoneSpray: 20
     WeedSpray: 20
@@ -18,5 +19,8 @@
     DiseaseSwab: 20
     #TO DO:
     #plant analyzer
+  contrabandInventory:
+    UnstableMutagenChemistryBottle: 1
+    Joint: 1
   emaggedInventory:
     Left4ZedChemistryBottle: 1
diff --git a/Resources/Prototypes/CharacterItemGroups/Generic/gloveGroup.yml b/Resources/Prototypes/CharacterItemGroups/Generic/gloveGroup.yml
index 802590accd..737e5da8d7 100644
--- a/Resources/Prototypes/CharacterItemGroups/Generic/gloveGroup.yml
+++ b/Resources/Prototypes/CharacterItemGroups/Generic/gloveGroup.yml
@@ -19,3 +19,5 @@
       id: LoadoutHandsGlovesEnviroglovesColor
     - type: loadout
       id: LoadoutHandsGlovesEnviroglovesEvening
+    - type: loadout
+      id: LoadoutHandsClothWrap
diff --git a/Resources/Prototypes/CharacterItemGroups/Generic/mindormachine.yml b/Resources/Prototypes/CharacterItemGroups/Generic/mindormachine.yml
index 90ed595bac..1a15991da5 100644
--- a/Resources/Prototypes/CharacterItemGroups/Generic/mindormachine.yml
+++ b/Resources/Prototypes/CharacterItemGroups/Generic/mindormachine.yml
@@ -43,17 +43,3 @@
       id: DermalArmor
     - type: trait
       id: CyberEyes
-    - type: trait
-      id: FlareShielding
-    - type: trait
-      id: CyberEyesSecurity
-    - type: trait
-      id: CyberEyesMedical
-    - type: trait
-      id: CyberEyesDiagnostic
-    - type: trait
-      id: CyberEyesOmni
-    - type: trait
-      id: LightAmplification
-    - type: trait
-      id: ThermographicVision
diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/blueshield_officer.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/blueshield_officer.yml
index f900bfe3b5..a782cf4a66 100644
--- a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/blueshield_officer.yml
+++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/blueshield_officer.yml
@@ -9,6 +9,63 @@
     - type: loadout
       id: LoadoutClothingDuffelBlueshield
 
+#- type: characterItemGroup
+#  id: LoadoutJOBBelt
+#  maxItems: 1
+#  items:
+#
+#- type: characterItemGroup
+#  id: LoadoutJOBEars
+#  maxItems: 1
+#  items:
+
+- type: characterItemGroup
+  id: LoadoutBlueshieldOfficerPrimary
+  maxItems: 1
+  items:
+    - type: loadout
+      id: LoadoutBSORifleChester
+    - type: loadout
+      id: LoadoutBSOEnergyShield
+    - type: loadout
+      id: LoadoutBSORifleBRDIR25
+
+#- type: characterItemGroup
+#  id: LoadoutJOBEyes
+#  maxItems: 1
+#  items:
+#
+#- type: characterItemGroup
+#  id: LoadoutJOBGloves
+#  maxItems: 1
+#  items:
+
+- type: characterItemGroup
+  id: LoadoutBlueshieldOfficerHats
+  maxItems: 1
+  items:
+    - type: loadout
+      id: LoadoutClothingBlueshieldBeretNavy
+    - type: loadout
+      id: LoadoutClothingBlueshieldBeretOfficer
+    - type: loadout
+      id: LoadoutClothingBlueshieldCowboyHat
+
+#- type: characterItemGroup
+#  id: LoadoutJOBId
+#  maxItems: 1
+#  items:
+#
+#- type: characterItemGroup
+#  id: LoadoutJOBNeck
+#  maxItems: 1
+#  items:
+#
+#- type: characterItemGroup
+#  id: LoadoutJOBMask
+#  maxItems: 1
+#  items:
+
 - type: characterItemGroup
   id: LoadoutBlueshieldOfficerVests
   maxItems: 1
@@ -28,6 +85,11 @@
     - type: loadout
       id: LoadoutClothingBlueshieldArmoredCoat
 
+#- type: characterItemGroup
+#  id: LoadoutJOBShoes
+#  maxItems: 1
+#  items:
+
 - type: characterItemGroup
   id: LoadoutBlueshieldOfficerUniforms
   maxItems: 1
@@ -36,14 +98,3 @@
       id: LoadoutClothingUniformJumpskirtBlueshieldOfficer
     - type: loadout
       id: LoadoutClothingUniformJumpsuitBlueshieldOfficer
-
-- type: characterItemGroup
-  id: LoadoutBlueshieldOfficerHats
-  maxItems: 1
-  items:
-    - type: loadout
-      id: LoadoutClothingBlueshieldBeretNavy
-    - type: loadout
-      id: LoadoutClothingBlueshieldBeretOfficer
-    - type: loadout
-      id: LoadoutClothingBlueshieldCowboyHat
diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/nanorep.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/nanorep.yml
index 6864346e3f..abdb0d64cb 100644
--- a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/nanorep.yml
+++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/nanorep.yml
@@ -12,4 +12,11 @@
     - type: loadout
       id: LoadoutClothingUniformJumpskirtNanotrasenRepresentative
     - type: loadout
-      id: LoadoutClothingUniformJumpsuitNanotrasenRepresentative
\ No newline at end of file
+      id: LoadoutClothingUniformJumpsuitNanotrasenRepresentative
+
+- type: characterItemGroup
+  id: LoadoutNanotrasenRepresentativeWeapon
+  maxItems: 1
+  items:
+    - type: loadout
+      id: LoadoutNanotrasenRepresentativeDisabler
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml
index a10980faaa..7edefc3964 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml
@@ -780,6 +780,9 @@
     - id: PlushieMothBartender
       prob: 0.5
       orGroup: Plushie
+    - id: PlushieShadowkin
+      prob: 0.5
+      orGroup: Plushie
 
 # Random snacks, replaces MailChocolate (lousy animal organs)
 - type: entity
diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Windows/tinted_windows.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Windows/tinted_windows.yml
index fdaa60b4d7..77eb472dce 100644
--- a/Resources/Prototypes/DeltaV/Entities/Structures/Windows/tinted_windows.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Structures/Windows/tinted_windows.yml
@@ -14,6 +14,7 @@
   - type: Tag
     tags:
       - ForceNoFixRotations
+      - WeldbotFixableStructure
   - type: Icon
     sprite: Structures/Windows/directional.rsi
     state: tinted_window
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
index 396d331074..467a3136c5 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -43,12 +43,6 @@
         - TrayScanner
         - GasAnalyzer
         - HandLabeler
-        - RemoteSignaller
-        - RemoteSignallerAdvanced
-        - AnomalyScanner
-        - AnomalyLocatorUnpowered
-        - AnomalyLocatorWideUnpowered
-        - NodeScanner
   - type: ItemMapper
     mapLayers:
       drill:
@@ -354,7 +348,7 @@
   - type: Storage
     whitelist:
       tags:
-        # - PlantAnalyzer
+        - PlantAnalyzer
         - PlantSampleTaker
         - BotanyShovel
         - BotanyHoe
@@ -374,10 +368,10 @@
         whitelist:
           tags:
           - BotanyHatchet
-      # hydro:
-      #   whitelist:
-      #     tags:
-      #     - PlantAnalyzer # Dunno what to put here, should be aight.
+      hydro:
+        whitelist:
+          tags:
+          - PlantAnalyzer
       hoe:
         whitelist:
           tags:
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
index 62c9e48ca6..6e48d19fed 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
@@ -71,6 +71,7 @@
         - PlushieJester
         - PlushieHarpy
         - PlushieMort
+        - PlushieShadowkin
       chance: 0.5
       offset: 0.2
 
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/bots.yml b/Resources/Prototypes/Entities/Markers/Spawners/bots.yml
index c5241673a1..dd9857a417 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/bots.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/bots.yml
@@ -53,3 +53,17 @@
   - type: ConditionalSpawner
     prototypes:
       - MobBatonBot
+
+- type: entity
+  name: plantbot spawner
+  id: SpawnMobPlantbot
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: green
+      - sprite: Mobs/Silicon/Bots/plantbot.rsi
+        state: plantbot
+  - type: ConditionalSpawner
+    prototypes:
+      - MobPlantbot
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
index f9bc96fba6..4015a8c112 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
@@ -109,18 +109,41 @@
         state: radiation
 
 - type: entity
+  categories: [ HideSpawnMenu, Spawner ]
+  parent: SpawnPointLoneNukeOperative
+  id: SpawnPointNukeopsCommander
+  components:
+  - type: GhostRole
+    name: roles-antag-nuclear-operative-commander-name
+    description: roles-antag-nuclear-operative-commander-objective
+
+- type: entity
+  categories: [ HideSpawnMenu, Spawner ]
+  parent: SpawnPointLoneNukeOperative
+  id: SpawnPointNukeopsMedic
+  components:
+  - type: GhostRole
+    name: roles-antag-nuclear-operative-agent-name
+    description: roles-antag-nuclear-operative-agent-objective
+
+- type: entity
+  categories: [ HideSpawnMenu, Spawner ]
+  parent: SpawnPointLoneNukeOperative
+  id: SpawnPointNukeopsOperative
+  components:
+  - type: GhostRole
+    name: roles-antag-nuclear-operative-name
+    description: roles-antag-nuclear-operative-objective
+
+- type: entity
+  categories: [ HideSpawnMenu, Spawner ]
   parent: BaseAntagSpawner
   id: SpawnPointGhostDragon
-  categories: [ HideSpawnMenu, Spawner ]
-  name: ghost role spawn point
-  suffix: dragon
   components:
   - type: GhostRole
     name: ghost-role-information-space-dragon-name
     description: ghost-role-information-space-dragon-description
     rules: ghost-role-component-default-rules
-  - type: GhostRoleMobSpawner
-    prototype: MobDragon
   - type: Sprite
     layers:
     - state: green
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/face.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/face.yml
index 042726ad11..b5ae0fe111 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/face.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/face.yml
@@ -2,7 +2,7 @@
   id: FaceBindi
   bodyPart: Face
   markingCategory: Face
-  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia]
+  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia, Tajaran, Tajaran]
   coloring:
     default:
       type:
@@ -16,7 +16,7 @@
   id: FaceFullblush
   bodyPart: Face
   markingCategory: Face
-  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Vulpkanin, Arachne, Lamia]
+  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Vulpkanin, Arachne, Lamia, Tajaran]
   coloring:
     default:
       type:
@@ -30,7 +30,7 @@
   id: FaceCheekspotRight
   bodyPart: Face
   markingCategory: Face
-  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia]
+  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia, Tajaran]
   coloring:
     default:
       type:
@@ -44,7 +44,7 @@
   id: FaceCheekspotLeft
   bodyPart: Face
   markingCategory: Face
-  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia]
+  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia, Tajaran]
   coloring:
     default:
       type:
@@ -58,7 +58,7 @@
   id: FaceChesireRight
   bodyPart: Face
   markingCategory: Face
-  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Arachne, Lamia]
+  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Arachne, Lamia, Tajaran]
   coloring:
     default:
       type:
@@ -72,7 +72,7 @@
   id: FaceChesireLeft
   bodyPart: Face
   markingCategory: Face
-  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Arachne, Lamia]
+  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Arachne, Lamia, Tajaran]
   coloring:
     default:
       type:
@@ -86,7 +86,7 @@
   id: FaceCrowRight
   bodyPart: Face
   markingCategory: Face
-  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia]
+  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia, Tajaran]
   coloring:
     default:
       type:
@@ -100,7 +100,7 @@
   id: FaceCrowLeft
   bodyPart: Face
   markingCategory: Face
-  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia]
+  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia, Tajaran]
   coloring:
     default:
       type:
@@ -114,7 +114,7 @@
   id: FaceEarRight
   bodyPart: Face
   markingCategory: Face
-  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Arachne, Lamia]
+  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Arachne, Lamia, Tajaran]
   coloring:
     default:
       type:
@@ -128,7 +128,7 @@
   id: FaceEarLeft
   bodyPart: Face
   markingCategory: Face
-  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Arachne, Lamia]
+  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Arachne, Lamia, Tajaran]
   coloring:
     default:
       type:
@@ -142,7 +142,7 @@
   id: FaceEyebrowRight
   bodyPart: Face
   markingCategory: Face
-  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia]
+  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia, Tajaran]
   coloring:
     default:
       type:
@@ -157,7 +157,7 @@
   id: FaceEyebrowLeft
   bodyPart: Face
   markingCategory: Face
-  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia]
+  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia, Tajaran]
   coloring:
     default:
       type:
@@ -172,7 +172,7 @@
   id: FaceEyebrows
   bodyPart: Face
   markingCategory: Face
-  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia]
+  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia, Tajaran]
   coloring:
     default:
       type:
@@ -186,7 +186,7 @@
   id: FaceEyecornerRight
   bodyPart: Face
   markingCategory: Face
-  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia]
+  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia, Tajaran]
   coloring:
     default:
       type:
@@ -200,7 +200,7 @@
   id: FaceEyecornerLeft
   bodyPart: Face
   markingCategory: Face
-  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia]
+  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia, Tajaran]
   coloring:
     default:
       type:
@@ -214,7 +214,7 @@
   id: FaceEyelashRight
   bodyPart: Face
   markingCategory: Face
-  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia]
+  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia, Tajaran]
   coloring:
     default:
       type:
@@ -228,7 +228,7 @@
   id: FaceEyelashLeft
   bodyPart: Face
   markingCategory: Face
-  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia]
+  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia, Tajaran]
   coloring:
     default:
       type:
@@ -242,7 +242,7 @@
   id: FaceEyestripe
   bodyPart: Face
   markingCategory: Face
-  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Arachne, Lamia]
+  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Arachne, Lamia, Tajaran]
   coloring:
     default:
       type:
@@ -256,7 +256,7 @@
   id: FaceLipcornerRight
   bodyPart: Face
   markingCategory: Face
-  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia]
+  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia, Tajaran]
   coloring:
     default:
       type:
@@ -270,7 +270,7 @@
   id: FaceLipcornerLeft
   bodyPart: Face
   markingCategory: Face
-  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia]
+  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia, Tajaran]
   coloring:
     default:
       type:
@@ -284,7 +284,7 @@
   id: FaceGlabella
   bodyPart: Face
   markingCategory: Face
-  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia]
+  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia, Tajaran]
   coloring:
     default:
       type:
@@ -298,7 +298,7 @@
   id: FaceLowercheekRight
   bodyPart: Face
   markingCategory: Face
-  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia]
+  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia, Tajaran]
   coloring:
     default:
       type:
@@ -312,7 +312,7 @@
   id: FaceLowercheekLeft
   bodyPart: Face
   markingCategory: Face
-  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia]
+  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia, Tajaran]
   coloring:
     default:
       type:
@@ -326,7 +326,7 @@
   id: FaceNosetape
   bodyPart: Face
   markingCategory: Face
-  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Arachne, Lamia]
+  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Arachne, Lamia, Tajaran]
   coloring:
     default:
       type:
@@ -340,7 +340,7 @@
   id: FaceNosetip
   bodyPart: Face
   markingCategory: Face
-  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Arachne, Lamia]
+  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Arachne, Lamia, Tajaran]
   coloring:
     default:
       type:
@@ -355,7 +355,7 @@
   id: FaceNosestripe
   bodyPart: Face
   markingCategory: Face
-  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Arachne, Lamia]
+  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Arachne, Lamia, Tajaran]
   coloring:
     default:
       type:
@@ -369,7 +369,7 @@
   id: FaceUnibrow
   bodyPart: Face
   markingCategory: Face
-  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia]
+  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia, Tajaran]
   coloring:
     default:
       type:
@@ -383,7 +383,7 @@
   id: FaceNeckSlim
   bodyPart: Face
   markingCategory: Face
-  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia]
+  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia, Tajaran]
   followSkinColor: true
   sprites:
   - sprite: Mobs/Customization/face.rsi
@@ -393,7 +393,7 @@
   id: FaceNeckWide
   bodyPart: Face
   markingCategory: Face
-  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia]
+  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia, Tajaran]
   followSkinColor: true
   sprites:
   - sprite: Mobs/Customization/face.rsi
@@ -403,7 +403,7 @@
   id: FaceNeckSlimThick
   bodyPart: Face
   markingCategory: Face
-  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia]
+  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia, Tajaran]
   followSkinColor: true
   sprites:
   - sprite: Mobs/Customization/face.rsi
@@ -413,7 +413,7 @@
   id: FaceNeckWideThick
   bodyPart: Face
   markingCategory: Face
-  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia]
+  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia, Tajaran]
   followSkinColor: true
   sprites:
   - sprite: Mobs/Customization/face.rsi
@@ -423,7 +423,7 @@
   id: IronJaw
   bodyPart: Face
   markingCategory: Face
-  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Arachne, Lamia]
+  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Arachne, Lamia, Tajaran]
   coloring:
     default:
       type:
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/makeup.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/makeup.yml
index ec954a5655..b6b3f803a6 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/makeup.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/makeup.yml
@@ -2,7 +2,7 @@
   id: MakeupLips
   bodyPart: Face
   markingCategory: Face
-  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Arachne, Lamia] # Delta V - Felinid, Oni, Harpy
+  speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Arachne, Lamia, Tajaran] # Delta V - Felinid, Oni, Harpy
   coloring:
     default:
       type:
@@ -16,7 +16,7 @@
   id: MakeupBlush
   bodyPart: Face
   markingCategory: Face
-  speciesRestriction: [Dwarf, Human, Reptilian, SlimePerson, Felinid, Oni, Vulpkanin, Harpy, Arachne, Lamia] # Delta V - Felinid, Oni, Vulpkanin, Harpy
+  speciesRestriction: [Dwarf, Human, Reptilian, SlimePerson, Felinid, Oni, Vulpkanin, Harpy, Arachne, Lamia, Tajaran] # Delta V - Felinid, Oni, Vulpkanin, Harpy
   coloring:
     default:
       type:
@@ -30,7 +30,7 @@
   id: MakeupNailPolishRight
   bodyPart: RHand
   markingCategory: RightHand
-  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Arachne, Lamia] # Delta V - Felinid, Oni, Vulpkanin
+  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Arachne, Lamia, Tajaran] # Delta V - Felinid, Oni, Vulpkanin
   coloring:
     default:
       type:
@@ -44,7 +44,7 @@
   id: MakeupNailPolishLeft
   bodyPart: LHand
   markingCategory: LeftHand
-  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Arachne, Lamia] # Delta V - Felinid, Oni, Vulpkanin
+  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Arachne, Lamia, Tajaran] # Delta V - Felinid, Oni, Vulpkanin
   coloring:
     default:
       type:
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/pointy_ears.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/pointy_ears.yml
index 9f58b1aa08..bc738fa9d3 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/pointy_ears.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/pointy_ears.yml
@@ -3,7 +3,7 @@
   bodyPart: HeadSide
   markingCategory: HeadSide
   forcedColoring: true
-  speciesRestriction: [Oni, Harpy, Arachne, Lamia]
+  speciesRestriction: [Oni, Harpy, Arachne, Lamia, Human]
   sprites:
   - sprite: Mobs/Customization/pointy_ears.rsi
     state: pointy_ears_standard
@@ -13,7 +13,7 @@
   bodyPart: HeadSide
   markingCategory: HeadSide
   forcedColoring: true
-  speciesRestriction: [Oni, Harpy, Arachne, Lamia]
+  speciesRestriction: [Oni, Harpy, Arachne, Lamia, Human]
   sprites:
   - sprite: Mobs/Customization/pointy_ears.rsi
     state: pointy_ears_wide
@@ -23,7 +23,7 @@
   bodyPart: HeadSide
   markingCategory: HeadSide
   forcedColoring: true
-  speciesRestriction: [Oni, Harpy, Arachne, Lamia]
+  speciesRestriction: [Oni, Harpy, Arachne, Lamia, Human]
   sprites:
   - sprite: Mobs/Customization/pointy_ears.rsi
     state: pointy_ears_small
@@ -33,7 +33,7 @@
   bodyPart: HeadSide
   markingCategory: HeadSide
   forcedColoring: true
-  speciesRestriction: [Oni, Harpy, Arachne, Lamia]
+  speciesRestriction: [Oni, Harpy, Arachne, Lamia, Human]
   sprites:
   - sprite: Mobs/Customization/pointy_ears.rsi
     state: pointy_ears_upwards
@@ -43,7 +43,7 @@
   bodyPart: HeadSide
   markingCategory: HeadSide
   forcedColoring: true
-  speciesRestriction: [Oni, Harpy, Arachne, Lamia]
+  speciesRestriction: [Oni, Harpy, Arachne, Lamia, Human]
   sprites:
   - sprite: Mobs/Customization/pointy_ears.rsi
     state: pointy_ears_tall
@@ -53,7 +53,7 @@
   bodyPart: HeadSide
   markingCategory: HeadSide
   forcedColoring: true
-  speciesRestriction: [Oni, Harpy, Arachne, Lamia]
+  speciesRestriction: [Oni, Harpy, Arachne, Lamia, Human]
   sprites:
   - sprite: Mobs/Customization/pointy_ears.rsi
     state: pointy_ears_slanted
@@ -63,7 +63,7 @@
   bodyPart: HeadSide
   markingCategory: HeadSide
   forcedColoring: true
-  speciesRestriction: [Oni, Harpy, Arachne, Lamia]
+  speciesRestriction: [Oni, Harpy, Arachne, Lamia, Human]
   sprites:
   - sprite: Mobs/Customization/pointy_ears.rsi
     state: pointy_ears_thin
@@ -73,7 +73,7 @@
   bodyPart: HeadSide
   markingCategory: HeadSide
   forcedColoring: true
-  speciesRestriction: [Oni, Harpy, Arachne, Lamia]
+  speciesRestriction: [Oni, Harpy, Arachne, Lamia, Human]
   sprites:
   - sprite: Mobs/Customization/pointy_ears.rsi
     state: pointy_ears_large
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml
index 8428a217c1..01dce0105e 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml
@@ -2,7 +2,7 @@
   id: TattooHiveChest
   bodyPart: Chest
   markingCategory: Chest
-  speciesRestriction: [Human, Dwarf, Felinid, Oni, Shadowkin, Arachne, Lamia] # Delta V - Felinid, Oni
+  speciesRestriction: [Human, Dwarf, Felinid, Oni, Shadowkin, Arachne, Lamia, Tajaran] # Delta V - Felinid, Oni
   coloring:
     default:
       type:
@@ -16,7 +16,7 @@
   id: TattooNightlingChest
   bodyPart: Chest
   markingCategory: Chest
-  speciesRestriction: [Human, Dwarf, Felinid, Oni, Shadowkin, Arachne, Lamia] # Delta V - Felinid, Oni
+  speciesRestriction: [Human, Dwarf, Felinid, Oni, Shadowkin, Arachne, Lamia, Tajaran] # Delta V - Felinid, Oni
   coloring:
     default:
       type:
@@ -44,7 +44,7 @@
   id: TattooSilverburghLeftLeg
   bodyPart: LLeg
   markingCategory: LeftLeg
-  speciesRestriction: [Human, Dwarf, Felinid, Oni, Shadowkin] # Delta V - Felinid, Oni
+  speciesRestriction: [Human, Dwarf, Felinid, Oni, Shadowkin, Tajaran] # Delta V - Felinid, Oni
   coloring:
     default:
       type:
@@ -58,7 +58,7 @@
   id: TattooSilverburghRightLeg
   bodyPart: RLeg
   markingCategory: RightLeg
-  speciesRestriction: [Human, Dwarf, Felinid, Oni, Shadowkin] # Delta V - Felinid, Oni
+  speciesRestriction: [Human, Dwarf, Felinid, Oni, Shadowkin, Tajaran] # Delta V - Felinid, Oni
   coloring:
     default:
       type:
@@ -72,7 +72,7 @@
   id: TattooCampbellLeftArm
   bodyPart: LArm
   markingCategory: LeftArm
-  speciesRestriction: [Human, Dwarf, Felinid, Oni, Shadowkin, Arachne, Lamia] # Delta V - Felinid, Oni
+  speciesRestriction: [Human, Dwarf, Felinid, Oni, Shadowkin, Arachne, Lamia, Tajaran] # Delta V - Felinid, Oni
   coloring:
     default:
       type:
@@ -86,7 +86,7 @@
   id: TattooCampbellRightArm
   bodyPart: RArm
   markingCategory: RightArm
-  speciesRestriction: [Human, Dwarf, Felinid, Oni, Shadowkin, Arachne, Lamia] # Delta V - Felinid, Oni
+  speciesRestriction: [Human, Dwarf, Felinid, Oni, Shadowkin, Arachne, Lamia, Tajaran] # Delta V - Felinid, Oni
   coloring:
     default:
       type:
@@ -100,7 +100,7 @@
   id: TattooCampbellLeftLeg
   bodyPart: LLeg
   markingCategory: LeftLeg
-  speciesRestriction: [Human, Dwarf, Felinid, Oni, Shadowkin] # Delta V - Felinid, Oni
+  speciesRestriction: [Human, Dwarf, Felinid, Oni, Shadowkin, Tajaran] # Delta V - Felinid, Oni
   coloring:
     default:
       type:
@@ -114,7 +114,7 @@
   id: TattooCampbellRightLeg
   bodyPart: RLeg
   markingCategory: RightLeg
-  speciesRestriction: [Human, Dwarf, Felinid, Oni, Shadowkin] # Delta V - Felinid, Oni
+  speciesRestriction: [Human, Dwarf, Felinid, Oni, Shadowkin, Tajaran] # Delta V - Felinid, Oni
   coloring:
     default:
       type:
@@ -128,7 +128,7 @@
   id: TattooEyeRight
   bodyPart: Eyes
   markingCategory: Head
-  speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf, Felinid, Oni, Harpy, Lamia, Plasmaman] # Delta V - Felinid, Oni, Harpy
+  speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf, Felinid, Oni, Harpy, Lamia, Plasmaman, Tajaran] # Delta V - Felinid, Oni, Harpy
   coloring:
     default:
       type:
@@ -142,7 +142,7 @@
   id: TattooEyeLeft
   bodyPart: Eyes
   markingCategory: Head
-  speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf, Felinid, Oni, Harpy, Lamia, Plasmaman] # Delta V - Felinid, Oni, Harpy
+  speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf, Felinid, Oni, Harpy, Lamia, Plasmama, Tajaran] # Delta V - Felinid, Oni, Harpy
   coloring:
     default:
       type:
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/wrist.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/wrist.yml
index 01bd1cf85a..b5382064ed 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/wrist.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/wrist.yml
@@ -2,7 +2,7 @@
   id: WristBraceletRight
   bodyPart: RHand
   markingCategory: RightHand
-  speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Diona, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Lamia]
+  speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Diona, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Lamia, Tajaran]
   coloring:
     default:
       type:
@@ -17,7 +17,7 @@
   id: WristBraceletLeft
   bodyPart: LHand
   markingCategory: LeftHand
-  speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Lamia]
+  speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Lamia, Tajaran]
   coloring:
     default:
       type:
@@ -31,7 +31,7 @@
   id: WristBraceletArmRight
   bodyPart: RArm
   markingCategory: RightArm
-  speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Diona, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Lamia]
+  speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Diona, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Lamia, Tajaran]
   coloring:
     default:
       type:
@@ -45,7 +45,7 @@
   id: WristBraceletArmLeft
   bodyPart: LArm
   markingCategory: LeftArm
-  speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Lamia]
+  speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Lamia, Tajaran]
   coloring:
     default:
       type:
@@ -59,7 +59,7 @@
   id: WristWatchRight
   bodyPart: RHand
   markingCategory: RightHand
-  speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Diona, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Lamia]
+  speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Diona, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Lamia, Tajaran]
   coloring:
     default:
       type:
@@ -73,7 +73,7 @@
   id: WristWatchLeft
   bodyPart: LHand
   markingCategory: LeftHand
-  speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Lamia]
+  speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Lamia, Tajaran]
   coloring:
     default:
       type:
@@ -87,7 +87,7 @@
   id: WristWatchSilverRight
   bodyPart: RHand
   markingCategory: RightHand
-  speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Diona, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Lamia]
+  speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Diona, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Lamia, Tajaran]
   coloring:
     default:
       type:
@@ -101,7 +101,7 @@
   id: WristWatchSilverLeft
   bodyPart: LHand
   markingCategory: LeftHand
-  speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Lamia]
+  speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Lamia, Tajaran]
   coloring:
     default:
       type:
@@ -115,7 +115,7 @@
   id: WristWatchGoldRight
   bodyPart: RHand
   markingCategory: RightHand
-  speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Diona, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Lamia]
+  speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Diona, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Lamia, Tajaran]
   coloring:
     default:
       type:
@@ -129,7 +129,7 @@
   id: WristWatchGoldLeft
   bodyPart: LHand
   markingCategory: LeftHand
-  speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Lamia]
+  speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Lamia, Tajaran]
   coloring:
     default:
       type:
@@ -143,7 +143,7 @@
   id: WristWatchHoloRight
   bodyPart: RHand
   markingCategory: RightHand
-  speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Diona, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Lamia]
+  speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Diona, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Lamia, Tajaran]
   coloring:
     default:
       type:
@@ -157,7 +157,7 @@
   id: WristWatchHoloLeft
   bodyPart: LHand
   markingCategory: LeftHand
-  speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Lamia]
+  speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Lamia, Tajaran]
   coloring:
     default:
       type:
@@ -171,7 +171,7 @@
   id: WristWatchLeatherRight
   bodyPart: RHand
   markingCategory: RightHand
-  speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Diona, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Lamia]
+  speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Diona, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Lamia, Tajaran]
   coloring:
     default:
       type:
@@ -185,7 +185,7 @@
   id: WristWatchLeatherLeft
   bodyPart: LHand
   markingCategory: LeftHand
-  speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Lamia]
+  speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Lamia, Tajaran]
   coloring:
     default:
       type:
@@ -199,7 +199,7 @@
   id: WristWatchColorableRight
   bodyPart: RHand
   markingCategory: RightHand
-  speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Diona, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Lamia]
+  speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Diona, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Lamia, Tajaran]
   coloring:
     default:
       type:
@@ -215,7 +215,7 @@
   id: WristWatchColorableLeft
   bodyPart: LHand
   markingCategory: LeftHand
-  speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Lamia]
+  speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Lamia, Tajaran]
   coloring:
     default:
       type:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/plantbot.yml b/Resources/Prototypes/Entities/Mobs/NPCs/plantbot.yml
new file mode 100644
index 0000000000..efa3af1a97
--- /dev/null
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/plantbot.yml
@@ -0,0 +1,54 @@
+- type: entity
+  parent: MobSiliconBase
+  id: MobPlantbot
+  name: plantbot
+  description: A botanist's best friend!.
+  components:
+  - type: Plantbot
+  - type: Sprite
+    sprite: Mobs/Silicon/Bots/plantbot.rsi
+    state: plantbot
+  - type: HTN
+    rootTask:
+      task: PlantbotCompound
+  - type: Construction
+    graph: PlantBot
+    node: bot
+  - type: NoSlip
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 110
+      behaviors:
+      - !type:TriggerBehavior
+    - trigger:
+        !type:DamageTrigger
+        damage: 120
+      behaviors:
+      - !type:SpillBehavior
+        solution: tank
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+        - ReagentId: Water
+          Quantity: 100
+  - type: SentienceTarget
+    flavorKind: station-event-random-sentience-flavor-mechanical
+  - type: Anchorable
+  - type: InteractionPopup
+    interactSuccessString: petting-success-plantbot
+    interactFailureString: petting-failure-plantbot
+    interactSuccessSound:
+      path: /Audio/Ambience/Objects/periodic_beep.ogg
+  - type: ShowHealthBars
+    damageContainers:
+    - Inorganic
+    - Silicon
+  - type: ShowHealthIcons
+    damageContainers:
+    - Inorganic
+    - Silicon
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
index 0a79df01e0..a6d70d3f0d 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -3,6 +3,11 @@
   abstract: true
   id: MobSiliconBase
   components:
+  - type: Renamable
+  - type: UserInterface
+    interfaces:
+      enum.SharedRenamableInterfaceKey.Key:
+        type: RenamableBoundUserInterface
   - type: LagCompensation
   - type: Reactive
     groups:
diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
index 4c03c6c688..c3b9c0df8f 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
@@ -149,9 +149,13 @@
 - type: entity
   parent: BaseMobDragon
   id: MobDragon
+  suffix: No role or objectives
   components:
   - type: Dragon
     spawnRiftAction: ActionSpawnRift
+  - type: ActionGun
+    action: ActionDragonsBreath
+    gunProto: DragonsBreathGun
   - type: GuideHelp
     guides:
     - MinorAntagonists
diff --git a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
index 2a06306a91..7fcda82621 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
@@ -134,6 +134,18 @@
           map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ]
           color: "#40a7d7"
           shader: unshaded
+    - type: MeleeWeapon
+      hidden: false
+      altDisarm: false
+      animation: WeaponArcFist
+      attackRate: 0.3
+      autoAttack: true
+      soundHit:
+        collection: Punch
+      damage:
+        types:
+          Blunt: 10
+          Structural: 10
     - type: HTN
       rootTask:
         task: SimpleHumanoidHostileCompound
diff --git a/Resources/Prototypes/Entities/Mobs/Species/arachne.yml b/Resources/Prototypes/Entities/Mobs/Species/arachne.yml
index e276b43b74..e3712aed07 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/arachne.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/arachne.yml
@@ -117,6 +117,7 @@
     - CanPilot
     - FootstepSound
     - DoorBumpOpener
+    - SpiderCraft
   - type: StepTriggerImmune
   - type: Bloodstream
     bloodReagent: DemonsBlood
diff --git a/Resources/Prototypes/Entities/Objects/Decoration/present.yml b/Resources/Prototypes/Entities/Objects/Decoration/present.yml
index e07f0e0584..f60997bd0e 100644
--- a/Resources/Prototypes/Entities/Objects/Decoration/present.yml
+++ b/Resources/Prototypes/Entities/Objects/Decoration/present.yml
@@ -104,6 +104,8 @@
         orGroup: GiftPool
       - id: PlushieArachind
         orGroup: GiftPool
+      - id: PlushieShadowkin
+        orGroup: GiftPool
       - id: ClothingNeckCloakMoth
         orGroup: GiftPool
       - id: ToyMouse
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml
index 939a1d7a8e..7ecd859063 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml
@@ -432,3 +432,12 @@
   components:
   - type: AccessReader
     access: [["Mail"]]
+
+# Sol Alliance
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsSAN
+  suffix: SAN, Locked
+  components:
+  - type: AccessReader
+    access: [["SAN"]]
diff --git a/Resources/Prototypes/Entities/Objects/Fun/pai.yml b/Resources/Prototypes/Entities/Objects/Fun/pai.yml
index 806470607a..9434e9b52e 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/pai.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/pai.yml
@@ -6,6 +6,7 @@
   name: personal ai device
   description: Your electronic pal who's fun to be with!
   components:
+  - type: Renamable
   - type: Instrument
     allowPercussion: false
     handheld: false
@@ -19,6 +20,8 @@
       enum.StationMapUiKey.Key:
         type: StationMapBoundUserInterface
         requireInputValidation: false
+      enum.SharedRenamableInterfaceKey.Key:
+        type: RenamableBoundUserInterface
   - type: Sprite
     sprite: Objects/Fun/pai.rsi
     layers:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/plant_analyzer.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/plant_analyzer.yml
new file mode 100644
index 0000000000..2fbc953780
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/plant_analyzer.yml
@@ -0,0 +1,57 @@
+- type: entity
+  id: PlantAnalyzer
+  parent: [BaseItem, PowerCellSlotSmallItem]
+  name: plant analyzer
+  description: A scanner used to evaluate a plant's various areas of growth, genetic traits and chemicals.
+  components:
+  - type: PowerCellDraw
+    drawRate: 0.8
+  - type: ToggleCellDraw
+  - type: ActivatableUIRequiresPowerCell
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/plant_analyzer.rsi
+    layers:
+    - state: icon
+    - state: analyzer
+      shader: unshaded
+  - type: Item
+    storedRotation: -90
+  - type: Tag
+    tags:
+    - PlantAnalyzer
+  - type: ActivatableUI
+    key: enum.PlantAnalyzerUiKey.Key
+  - type: UserInterface
+    interfaces:
+      enum.PlantAnalyzerUiKey.Key:
+        type: PlantAnalyzerBoundUserInterface
+  - type: ItemToggle
+    onUse: false
+  - type: PlantAnalyzer
+  - type: GuideHelp
+    guides:
+    - Botany
+    - Chemicals
+
+- type: entity
+  name: plant analyzer report
+  parent: Paper
+  id: PlantAnalyzerReportPaper
+  description: A printout from a plant analyzer.
+  components:
+  - type: Sprite
+    sprite: Objects/Misc/bureaucracy.rsi
+    layers:
+    - state: paper_receipt_horizontal
+    - state: paper_receipt_horizontal_words
+      map: ["enum.PaperVisualLayers.Writing"]
+      visible: false
+    - state: paper_stamp-generic
+      map: ["enum.PaperVisualLayers.Stamp"]
+      visible: false
+  - type: PaperVisuals
+    backgroundImagePath: "/Textures/Interface/Paper/paper_background_perforated.svg.96dpi.png"
+    backgroundImageTile: true
+    backgroundPatchMargin: 6.0, 0.0, 6.0, 0.0
+    contentMargin: 6.0, 6.0, 6.0, 6.0
+    maxWritableArea: 375.0, 600.0
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
index 849019c3d0..351bdba252 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
@@ -39,6 +39,7 @@
   - type: Tag
     tags:
     - PlantSampleTaker
+    - HydroponicsToolClippers
   - type: Sprite
     sprite: Objects/Tools/Hydroponics/clippers.rsi
     state: icon
diff --git a/Resources/Prototypes/Entities/Objects/Tools/welders.yml b/Resources/Prototypes/Entities/Objects/Tools/welders.yml
index a04812e1eb..b8a003e3b5 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/welders.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/welders.yml
@@ -157,7 +157,7 @@
   name: advanced industrial welding tool
   parent: WelderIndustrial
   id: WelderIndustrialAdvanced
-  description: "An advanced industrial welder with over double the fuel capacity and hotter flame."
+  description: "An advanced industrial welder with over five times the fuel capacity and a hotter flame."
   components:
   - type: Sprite
     sprite: Objects/Tools/welder_industrialadv.rsi
@@ -168,16 +168,16 @@
       Welder:
         reagents:
         - ReagentId: WeldingFuel
-          Quantity: 250
-        maxVol: 250
+          Quantity: 500
+        maxVol: 500
   - type: Tool
-    speedModifier: 1.3
+    speedModifier: 1.5
 
 - type: entity
   name: experimental welding tool
   parent: Welder
   id: WelderExperimental
-  description: "An experimental welder capable of self-fuel generation and less harmful to the eyes."
+  description: "An experimental welder that is less harmful to the eyes while having a hotter flame and slowly regenerating fuel."
   components:
   - type: Sprite
     sprite: Objects/Tools/welder_experimental.rsi
@@ -188,8 +188,8 @@
       Welder:
         reagents:
         - ReagentId: WeldingFuel
-          Quantity: 1000
-        maxVol: 1000
+          Quantity: 200
+        maxVol: 200
   - type: PointLight
     enabled: false
     radius: 1.5
@@ -199,7 +199,9 @@
     generated:
       reagents:
       - ReagentId: WeldingFuel
-        Quantity: 1
+        Quantity: 0.5
+  - type: Tool
+    speedModifier: 2
 
 - type: entity
   name: emergency welding tool
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
index df4641827b..fd243e1bb1 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -566,6 +566,35 @@
       bluntStaminaDamageFactor: 2.5
       wideAnimationRotation: 135
 
+- type: entity
+  name: CentCom disabler
+  parent: WeaponDisabler
+  id: WeaponCCDisabler
+  description: An improved self-defense weapon that exhausts organic targets, weakening them until they collapse. Only for the finest officers that we don't trust with lethals.
+  components:
+  - type: BatterySelfRecharger
+    autoRecharge: true
+    autoRechargeRate: 20
+  - type: StealTarget
+    stealGroup: NTRepWeapon
+  - type: Gun
+    fireRate: 3
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/taser2.ogg
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Battery/ccdisabler.rsi
+    layers:
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
+      - state: mag-unshaded-0
+        map: ["enum.GunVisualLayers.MagUnshaded"]
+        shader: unshaded
+  - type: Tag
+    tags:
+    - HighRiskItem
+    - Taser
+    - Sidearm
+
 - type: entity
   name: disabler SMG
   parent: BaseWeaponBattery
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
index 32a0e8b4df..080251ca38 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
@@ -122,6 +122,21 @@
       path: /Audio/Weapons/Guns/Gunshots/pistol.ogg
     fireOnDropChance: 0.3
 
+- type: entity
+  name: viper
+  parent: WeaponPistolViper
+  id: WeaponPistolViperEmpty
+  suffix: Empty
+  components:
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: null
+      gun_chamber:
+        name: Chamber
+        startingItem: null
+
 - type: entity
   name: viper
   parent: WeaponPistolViper
@@ -219,6 +234,21 @@
       gun_magazine: !type:ContainerSlot
       gun_chamber: !type:ContainerSlot
 
+- type: entity
+  name: cobra
+  parent: WeaponPistolCobra
+  id: WeaponPistolCobraEmpty
+  suffix: Empty
+  components:
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: null
+      gun_chamber:
+        name: Chamber
+        startingItem: null
+
 - type: entity
   name: mk 58
   parent: BaseWeaponPistol
@@ -242,6 +272,21 @@
       path: /Audio/Weapons/Guns/Gunshots/mk58.ogg
     fireOnDropChance: 0.5
 
+- type: entity
+  name: mk58
+  parent: WeaponPistolMk58
+  id: WeaponPistolMk58Empty
+  suffix: Empty
+  components:
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: null
+      gun_chamber:
+        name: Chamber
+        startingItem: null
+
 - type: entity
   name: mk 58
   parent: WeaponPistolMk58
@@ -334,6 +379,21 @@
           tags:
             - CartridgeMagnum
 
+- type: entity
+  name: N1984
+  parent: WeaponPistolN1984
+  id: WeaponPistolN1984Empty
+  suffix: Empty
+  components:
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: null
+      gun_chamber:
+        name: Chamber
+        startingItem: null
+
 - type: entity
   name: N1984
   parent: WeaponPistolN1984
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml
index 3f75faf75e..c47317bf35 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml
@@ -128,6 +128,47 @@
       factions:
         - Syndicate
 
+- type: entity
+  parent: BaseWeaponTurret
+  id: WeaponTurretSAN
+  suffix: Sol Alliance Navy
+  description: A turret designed to provide protection for Sol Marines during combat drops. It menaces targets with a twin-linked C-20r, although its cheap fire controller lends to poor accuracy.
+  components:
+    - type: NpcFactionMember
+      factions:
+        - SAN
+    - type: Gun
+      fireRate: 10  # Guaranteed to spook the shit out of people.
+      minAngle: 40
+      maxAngle: 45  # Not guaranteed to do a whole lot of damage unless they stand there and let it hit them.
+      soundGunshot:
+        path: /Audio/Weapons/Guns/Gunshots/c-20r.ogg
+    - type: BallisticAmmoProvider
+      proto: CartridgePistol
+      capacity: 200
+    - type: Destructible
+      thresholds:
+        - trigger:
+            !type:DamageTrigger
+            damage: 200
+          behaviors:
+            - !type:DoActsBehavior
+              acts: ["Destruction"]
+        - trigger:
+            !type:DamageTrigger
+            damage: 100
+          # TODO: Construction graph
+          behaviors:
+            - !type:DoActsBehavior
+              acts: ["Destruction"]
+            - !type:PlaySoundBehavior
+              sound:
+                collection: MetalGlassBreak
+            - !type:SpawnEntitiesBehavior
+              spawn:
+                SheetSteel1:
+                  min: 3
+                  max: 5
 - type: entity
   parent: BaseWeaponTurret
   name: disposable ballistic turret
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
index 7c8439fd6e..bdce1de9f6 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
@@ -43,6 +43,9 @@
     - state: panel_open
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: AnimationPlayer
+  - type: Tag
+    tags:
+      - WeldbotFixableStructure
   - type: ApcPowerReceiver
   - type: ExtensionCableReceiver
   - type: DoorSignalControl
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 439e9c944c..8efe06202f 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -1102,6 +1102,10 @@
       - EnergyCutlass
       - WeaponSubMachineGunFPA90
       - WeaponSubMachineGunBRDIR25
+      - WeaponPistolMk58
+      - WeaponPistolN1984
+      - WeaponPistolViper
+      - WeaponPistolCobra
   - type: MaterialStorage
     whitelist:
       tags:
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml
index 55a22a59a5..2df9cf6a1d 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml
@@ -77,6 +77,9 @@
   - type: InteractionOutline
   - type: Damageable
     damageContainer: StructuralInorganic
+  - type: Tag
+    tags:
+      - WeldbotFixableStructure
   - type: ExaminableDamage
     messages: WindowMessages
   - type: Repairable
@@ -164,6 +167,9 @@
   - type: Repairable
   - type: Damageable
     damageContainer: StructuralInorganic
+  - type: Tag
+    tags:
+      - WeldbotFixableStructure
   - type: DamageVisuals
     thresholds: [8, 16, 25]
     damageDivisor: 3.333
diff --git a/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml b/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml
index b1850d6e8f..de79a32b87 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml
@@ -39,6 +39,9 @@
   - type: IconSmooth
     base: swindow
   - type: Appearance
+  - type: Tag
+    tags:
+      - WeldbotFixableStructure
   - type: DamageVisuals
     thresholds: [4, 8, 12]
     damageDivisor: 28
diff --git a/Resources/Prototypes/Entities/Structures/Windows/window.yml b/Resources/Prototypes/Entities/Structures/Windows/window.yml
index c8cc53106b..68a0f1a9f0 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/window.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/window.yml
@@ -18,6 +18,7 @@
     tags:
       - ForceFixRotations
       - Window
+      - WeldbotFixableStructure
   - type: Sprite
     drawdepth: WallTops
     sprite: Structures/Windows/window.rsi
@@ -115,6 +116,7 @@
     tags:
       - Window
       - Directional #Delta V - Summary: Allows the tilewindow mapping command to work.
+      - WeldbotFixableStructure
   - type: MeleeSound
     soundGroups:
       Brute:
diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
index 46fb291c34..5aba98969a 100644
--- a/Resources/Prototypes/GameRules/events.yml
+++ b/Resources/Prototypes/GameRules/events.yml
@@ -117,12 +117,28 @@
   components:
   - type: StationEvent
     weight: 6.5
-    duration: 1
     earliestStart: 40
     reoccurrenceDelay: 20
     minimumPlayers: 20
-  - type: RandomSpawnRule
-    prototype: SpawnPointGhostDragon
+    duration: null
+  - type: SpaceSpawnRule
+    spawnDistance: 0
+  - type: AntagSpawner
+    prototype: MobDragon
+  - type: DragonRule
+  - type: AntagObjectives
+    objectives:
+    - CarpRiftsObjective
+    - DragonSurviveObjective
+  - type: AntagSelection
+    agentName: dragon-round-end-agent-name
+    definitions:
+    - spawnerPrototype: SpawnPointGhostDragon
+      min: 1
+      max: 1
+      pickPlayer: false
+      mindRoles:
+      - MindRoleDragon
 
 - type: entity
   parent: BaseGameRule
@@ -169,9 +185,8 @@
         nameSegments:
         - names_ninja_title
         - names_ninja
-      mindComponents:
-      - type: NinjaRole
-        prototype: SpaceNinja
+      mindRoles:
+      - MindRoleNinja
 
 - type: entity
   parent: BaseGameRule
@@ -448,9 +463,9 @@
   categories: [ HideSpawnMenu ]
   components:
   - type: StationEvent
-    earliestStart: 50
-    minimumPlayers: 30
-    weight: 2
+    earliestStart: 90
+    minimumPlayers: 40
+    weight: 1 # Zombies was happening basically every single survival round, so now it's super rare
     duration: 1
   - type: ZombieRule
   - type: AntagSelection
@@ -472,9 +487,9 @@
         maxInitialInfectedGrace: 450
       - type: ZombifyOnDeath
       - type: IncurableZombie
-      mindComponents:
-      - type: InitialInfectedRole
-        prototype: InitialInfected
+      - type: InitialInfected
+      mindRoles:
+      - MindRoleInitialInfected
 
 - type: entity
   categories: [ HideSpawnMenu ]
@@ -507,9 +522,8 @@
       - type: NpcFactionMember
         factions:
         - Syndicate
-      mindComponents:
-      - type: NukeopsRole
-        prototype: Nukeops
+      mindRoles:
+      - MindRoleNukeops
 
 - type: entity
   categories: [ HideSpawnMenu ]
@@ -533,9 +547,8 @@
       blacklist:
         components:
         - AntagImmune
-      mindComponents:
-      - type: TraitorRole
-        prototype: TraitorSleeper
+      mindRoles:
+      - MindRoleTraitorSleeper
 
 - type: entity
   id: MassHallucinations
diff --git a/Resources/Prototypes/GameRules/midround.yml b/Resources/Prototypes/GameRules/midround.yml
index 39fbab580f..ce7c3fa911 100644
--- a/Resources/Prototypes/GameRules/midround.yml
+++ b/Resources/Prototypes/GameRules/midround.yml
@@ -27,9 +27,8 @@
       startingGear: ThiefGear
       components:
       - type: Pacified
-      mindComponents:
-      - type: ThiefRole
-        prototype: Thief
+      mindRoles:
+      - MindRoleThief
       briefing:
         sound: "/Audio/Misc/thief_greeting.ogg"
 
diff --git a/Resources/Prototypes/GameRules/roundstart.yml b/Resources/Prototypes/GameRules/roundstart.yml
index 82ea21b4ba..10e9ffd5e5 100644
--- a/Resources/Prototypes/GameRules/roundstart.yml
+++ b/Resources/Prototypes/GameRules/roundstart.yml
@@ -103,9 +103,8 @@
       - type: NpcFactionMember
         factions:
         - Syndicate
-      mindComponents:
-      - type: NukeopsRole
-        prototype: NukeopsCommander
+      mindRoles:
+      - MindRoleNukeopsCommander
     - prefRoles: [ NukeopsMedic ]
       fallbackRoles: [ Nukeops, NukeopsCommander ]
       max: 1
@@ -120,9 +119,8 @@
       - type: NpcFactionMember
         factions:
         - Syndicate
-      mindComponents:
-      - type: NukeopsRole
-        prototype: NukeopsMedic
+      mindRoles:
+      - MindRoleNukeopsMedic
     - prefRoles: [ Nukeops ]
       fallbackRoles: [ NukeopsCommander, NukeopsMedic ]
       min: 0
@@ -138,9 +136,8 @@
       - type: NpcFactionMember
         factions:
         - Syndicate
-      mindComponents:
-      - type: NukeopsRole
-        prototype: Nukeops
+      mindRoles:
+      - MindRoleNukeops
 
 - type: entity
   abstract: true
@@ -176,9 +173,8 @@
         components:
         - AntagImmune
       lateJoinAdditional: true
-      mindComponents:
-      - type: TraitorRole
-        prototype: Traitor
+      mindRoles:
+      - MindRoleTraitor
 
 - type: entity
   id: TraitorReinforcement
@@ -210,9 +206,8 @@
       components:
       - type: Revolutionary
       - type: HeadRevolutionary
-      mindComponents:
-      - type: RevolutionaryRole
-        prototype: HeadRev
+      mindRoles:
+      - MindRoleHeadRevolutionary
 
 - type: entity
   id: Sandbox
@@ -256,9 +251,9 @@
       - type: PendingZombie
       - type: ZombifyOnDeath
       - type: IncurableZombie
-      mindComponents:
-      - type: InitialInfectedRole
-        prototype: InitialInfected
+      - type: InitialInfected
+      mindRoles:
+      - MindRoleInitialInfected
 
 # event schedulers
 - type: entity
diff --git a/Resources/Prototypes/Guidebook/Lore/settinglore.yml b/Resources/Prototypes/Guidebook/Lore/settinglore.yml
index ccf940bcd3..458a236f44 100644
--- a/Resources/Prototypes/Guidebook/Lore/settinglore.yml
+++ b/Resources/Prototypes/Guidebook/Lore/settinglore.yml
@@ -4,12 +4,15 @@
   text: "/ServerInfo/Guidebook/Lore/SettingLore.xml"
   children:
     - Corporations
+    - Nations
 
+# Corporations
 - type: guideEntry
   id: Corporations
   name: guide-entry-corporations
   text: "/ServerInfo/Guidebook/Lore/Corporations/Corporations.xml"
   children:
+    # Major Corporations
     - IdrisIncorporated
     - EinsteinEngines
     - StellarCorporateConglomerate
@@ -19,7 +22,9 @@
     - HephaestusIndustries
     - ZavodskoiInterstellar
     - PrivateMilitaryContractingGroup
+    # Minor Corporations/Subsidiaries
 
+# Major Corporations
 - type: guideEntry
   id: IdrisIncorporated
   name: guide-entry-idris-incorporated
@@ -64,3 +69,22 @@
   id: PrivateMilitaryContractingGroup
   name: guide-entry-private-military-contracting-group
   text: "/ServerInfo/Guidebook/Lore/Corporations/PrivateMilitaryContractingGroup.xml"
+# Minor Corporations/Subsidiaries
+
+- type: guideEntry
+  id: Nations
+  name: guide-entry-nations
+  text: "/ServerInfo/Guidebook/Lore/Nations/Nations.xml"
+  children:
+    # Major Nations
+    - SolAlliance
+    #- BieselRepublic
+    #- CoalitionOfColonies
+    #- AdhomaiFactions
+    #- MoghesFactions
+    # Minor Nations
+
+- type: guideEntry
+  id: SolAlliance
+  name: guide-entry-sol-alliance
+  text: "/ServerInfo/Guidebook/Lore/Nations/SolAlliance.xml"
diff --git a/Resources/Prototypes/Loadouts/Generic/hands.yml b/Resources/Prototypes/Loadouts/Generic/hands.yml
index ec2aec9070..202c5a65d0 100644
--- a/Resources/Prototypes/Loadouts/Generic/hands.yml
+++ b/Resources/Prototypes/Loadouts/Generic/hands.yml
@@ -95,3 +95,15 @@
       inverted: true
       species:
         - Plasmaman
+
+- type: loadout
+  id: LoadoutHandsClothWrap
+  category: Hands
+  cost: 0
+  exclusive: false
+  customColorTint: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutGloves
+  items:
+    - ClothingClothWrap
diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/blueshield_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Command/blueshield_officer.yml
index e8a3fd233c..fd297829b6 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Command/blueshield_officer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Command/blueshield_officer.yml
@@ -74,6 +74,8 @@
   canBeHeirloom: true
   guideEntry: SecurityWeapons
   requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutBlueshieldOfficerPrimary
     - !type:CharacterJobRequirement
       jobs:
         - BlueshieldOfficer
@@ -82,6 +84,40 @@
   items:
     - WeaponLeverChester
 
+- type: loadout
+  id: LoadoutBSORifleBRDIR25
+  category: JobsCommandBlueshieldOfficer
+  cost: 9 # Significant upgrade over a Chester, offered here for the STYLE. Intentionally priced at you not being able to buy a crew monitor with it.
+  canBeHeirloom: true
+  guideEntry: SecurityWeapons
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutBlueshieldOfficerPrimary
+    - !type:CharacterJobRequirement
+      jobs:
+        - BlueshieldOfficer
+    - !type:CharacterAgeRequirement
+      min: 21
+  items:
+    - WeaponSubMachineGunBRDIR25
+
+- type: loadout
+  id: LoadoutBSOEnergyShield
+  category: JobsCommandBlueshieldOfficer
+  cost: 0
+  canBeHeirloom: true
+  guideEntry: SecurityWeapons
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutBlueshieldOfficerPrimary
+    - !type:CharacterJobRequirement
+      jobs:
+        - BlueshieldOfficer
+    - !type:CharacterAgeRequirement
+      min: 21
+  items:
+    - EnergyShield
+
 - type: loadout
   id: LoadoutBSOMedkitCombatFilled
   category: JobsCommandBlueshieldOfficer
diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/nanorep.yml b/Resources/Prototypes/Loadouts/Jobs/Command/nanorep.yml
index 858c7a65e8..f17b3013b0 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Command/nanorep.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Command/nanorep.yml
@@ -19,7 +19,19 @@
 # Ears
 
 # Equipment
-
+- type: loadout
+  id: LoadoutNanotrasenRepresentativeDisabler
+  category: JobsCommandNanorep
+  cost: 0
+  canBeHeirloom: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutNanotrasenRepresentativeWeapon
+    - !type:CharacterJobRequirement
+      jobs:
+        - NanotrasenRepresentative
+  items:
+    - WeaponCCDisabler
 # Eyes
 
 # Gloves
@@ -63,4 +75,4 @@
       jobs:
         - NanotrasenRepresentative
   items:
-    - ClothingUniformJumpsuitNanotrasenRepresentative
\ No newline at end of file
+    - ClothingUniformJumpsuitNanotrasenRepresentative
diff --git a/Resources/Prototypes/NPCs/plantbot.yml b/Resources/Prototypes/NPCs/plantbot.yml
new file mode 100644
index 0000000000..5f54b0d370
--- /dev/null
+++ b/Resources/Prototypes/NPCs/plantbot.yml
@@ -0,0 +1,38 @@
+- type: htnCompound
+  id: PlantbotCompound
+  branches:
+    - tasks:
+        - !type:HTNCompoundTask
+          task: ServiceNearbyPlantsCompound
+    - tasks:
+        - !type:HTNCompoundTask
+          task: IdleCompound
+
+- type: htnCompound
+  id: ServiceNearbyPlantsCompound
+  branches:
+    - tasks:
+        - !type:HTNPrimitiveTask
+          operator: !type:PickNearbyServicableHydroponicsTrayOperator
+            targetKey: PlantTarget
+            targetMoveKey: TargetCoordinates
+
+        - !type:HTNPrimitiveTask
+          operator: !type:MoveToOperator
+            pathfindInPlanning: false
+
+        - !type:HTNPrimitiveTask
+          operator: !type:SetFloatOperator
+            targetKey: IdleTime
+            amount: 3
+
+        - !type:HTNPrimitiveTask
+          operator: !type:WaitOperator
+            key: IdleTime
+          preconditions:
+            - !type:KeyExistsPrecondition
+              key: IdleTime
+
+        - !type:HTNPrimitiveTask
+          operator: !type:PlantbotServiceOperator
+            targetKey: PlantTarget
diff --git a/Resources/Prototypes/Objectives/dragon.yml b/Resources/Prototypes/Objectives/dragon.yml
index 70cb4643de..fdd873adb6 100644
--- a/Resources/Prototypes/Objectives/dragon.yml
+++ b/Resources/Prototypes/Objectives/dragon.yml
@@ -9,7 +9,7 @@
     issuer: dragon
   - type: RoleRequirement
     roles:
-      components:
+      mindRoles:
       - DragonRole
 
 - type: entity
diff --git a/Resources/Prototypes/Objectives/ninja.yml b/Resources/Prototypes/Objectives/ninja.yml
index 864bff25c6..81a0b5cb91 100644
--- a/Resources/Prototypes/Objectives/ninja.yml
+++ b/Resources/Prototypes/Objectives/ninja.yml
@@ -9,7 +9,7 @@
     issuer: spiderclan
   - type: RoleRequirement
     roles:
-      components:
+      mindRoles:
       - NinjaRole
 
 - type: entity
diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml
index 6722fbe8de..aadab6e424 100644
--- a/Resources/Prototypes/Objectives/objectiveGroups.yml
+++ b/Resources/Prototypes/Objectives/objectiveGroups.yml
@@ -20,6 +20,7 @@
     MantisKnifeStealObjective: 1 # Nyanotrasen - ForensicMantis steal objective, see Resources/Prototypes/Nyanotrasen/Objectives/traitor.yml
     ClipboardStealObjective: 1
     CaptainGunStealObjective: 0.5
+    NTRepGunStealObjective: 0.5
     CaptainJetpackStealObjective: 0.5
     HandTeleporterStealObjective: 0.5
     LOLuckyBillStealObjective: 0.5 # DeltaV - LO steal objective, see Resources/Prototypes/DeltaV/Objectives/traitor.yml
diff --git a/Resources/Prototypes/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Objectives/stealTargetGroups.yml
index f014194411..cdaa7def84 100644
--- a/Resources/Prototypes/Objectives/stealTargetGroups.yml
+++ b/Resources/Prototypes/Objectives/stealTargetGroups.yml
@@ -70,6 +70,13 @@
     sprite: Objects/Weapons/Guns/Battery/antiquelasergun.rsi
     state: base
 
+- type: stealTargetGroup
+  id: NTRepWeapon
+  name: nanotrasen representative's weapon
+  sprite:
+    sprite: Objects/Weapons/Guns/Battery/ccdisabler.rsi
+    state: base
+
 - type: stealTargetGroup
   id: NukeDisk
   name: nuclear authentication disk
diff --git a/Resources/Prototypes/Objectives/thief.yml b/Resources/Prototypes/Objectives/thief.yml
index e556171a1f..416893cc0d 100644
--- a/Resources/Prototypes/Objectives/thief.yml
+++ b/Resources/Prototypes/Objectives/thief.yml
@@ -7,7 +7,7 @@
     issuer: thief
   - type: RoleRequirement
     roles:
-      components:
+      mindRoles:
       - ThiefRole
 
 - type: entity
diff --git a/Resources/Prototypes/Objectives/traitor.yml b/Resources/Prototypes/Objectives/traitor.yml
index eecff55cd6..1ac81ae0fd 100644
--- a/Resources/Prototypes/Objectives/traitor.yml
+++ b/Resources/Prototypes/Objectives/traitor.yml
@@ -7,7 +7,7 @@
     issuer: syndicate
   - type: RoleRequirement
     roles:
-      components:
+      mindRoles:
       - TraitorRole
 
 - type: entity
@@ -333,3 +333,25 @@
     stealGroup: SupermatterSliver
     objectiveNoOwnerText: objective-condition-steal-smsliver-title
     descriptionText: objective-condition-steal-smsliver-description
+
+## ntrep
+
+- type: entity
+  abstract: true
+  parent: BaseTraitorStealObjective
+  id: BaseNTRepObjective
+  components:
+  - type: Objective
+    difficulty: 2.5
+  - type: NotJobRequirement
+    job: NanotrasenRepresentative
+
+- type: entity
+  categories: [HideSpawnMenu]
+  parent: BaseNTRepObjective
+  id: NTRepGunStealObjective
+  components:
+  - type: StealCondition
+    stealGroup: NTRepWeapon
+    owner: job-name-ntrep
+    verifyMapExistence: true
diff --git a/Resources/Prototypes/Procedural/salvage_rewards.yml b/Resources/Prototypes/Procedural/salvage_rewards.yml
index 33bb3907e0..cf148e3e0d 100644
--- a/Resources/Prototypes/Procedural/salvage_rewards.yml
+++ b/Resources/Prototypes/Procedural/salvage_rewards.yml
@@ -64,6 +64,7 @@
     CrateArmoryLaser: 1.0
     CrateArmoryShotgun: 1.0
     CrateArmoryPistols: 1.0
+    CrateArmoryBRDIR25: 0.5
     # rare armor
     ClothingOuterArmorARC: 1.0 # DeltaV - ClothingOuterArmorRiot replaced in favour of ARC suit
     # rare chemicals
diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml
index 0e83a6dd21..358dc3b6a9 100644
--- a/Resources/Prototypes/Reagents/medicine.yml
+++ b/Resources/Prototypes/Reagents/medicine.yml
@@ -781,6 +781,7 @@
             Brute: -1
           types:
             Poison: -0.5 ##Should be about what it was when it healed the toxin group
+            Radiation: -0.15 ##Should really only heal minor accidental exposures
             Heat: -0.5
             Shock: -0.5
             Cold: -0.5 # Was .33, Buffed due to limb damage changes
diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/bots/plantbot.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/bots/plantbot.yml
new file mode 100644
index 0000000000..2fc01da255
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/bots/plantbot.yml
@@ -0,0 +1,32 @@
+- type: constructionGraph
+  id: PlantBot
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: bot
+      steps:
+      - tag: Bucket
+        icon:
+          sprite: Objects/Tools/bucket.rsi
+          state: icon
+        name: bucket
+      - tag: ProximitySensor
+        icon:
+          sprite: Objects/Misc/proximity_sensor.rsi
+          state: icon
+        name: proximity sensor
+        doAfter: 2
+      - tag: BorgArm
+        icon:
+          sprite: Mobs/Silicon/drone.rsi
+          state: l_hand
+        name: borg arm
+      - tag: HydroponicsToolClippers
+        icon:
+          sprite: Objects/Tools/Hydroponics/clippers.rsi
+          state: icon
+        name: plant clippers
+        doAfter: 2
+  - node: bot
+    entity: MobPlantbot
diff --git a/Resources/Prototypes/Recipes/Crafting/bots.yml b/Resources/Prototypes/Recipes/Crafting/bots.yml
index c59d6cd22c..332b8dfbba 100644
--- a/Resources/Prototypes/Recipes/Crafting/bots.yml
+++ b/Resources/Prototypes/Recipes/Crafting/bots.yml
@@ -127,3 +127,16 @@
   icon:
     sprite: Mobs/Silicon/Bots/weldbot.rsi
     state: weldbot
+
+- type: construction
+  name: plantbot
+  id: plantbot
+  graph: PlantBot
+  startNode: start
+  targetNode: bot
+  category: construction-category-utilities
+  objectType: Item
+  description: This bot takes care of the plants.
+  icon:
+    sprite: Mobs/Silicon/Bots/plantbot.rsi
+    state: plantbot
diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/service.yml b/Resources/Prototypes/Recipes/Lathes/Packs/service.yml
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/Resources/Prototypes/Recipes/Lathes/botany.yml b/Resources/Prototypes/Recipes/Lathes/botany.yml
index 010beb491a..ea87f4c5c2 100644
--- a/Resources/Prototypes/Recipes/Lathes/botany.yml
+++ b/Resources/Prototypes/Recipes/Lathes/botany.yml
@@ -37,3 +37,8 @@
   materials:
     Steel: 200
     Plastic: 100
+
+- type: latheRecipe
+  parent: HandheldHealthAnalyzer
+  id: PlantAnalyzer
+  result: PlantAnalyzer
diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml
index 016eb904fd..7a27c8ae69 100644
--- a/Resources/Prototypes/Recipes/Lathes/security.yml
+++ b/Resources/Prototypes/Recipes/Lathes/security.yml
@@ -1159,3 +1159,48 @@
     Steel: 500
     Circuitry: 500
     Tungsten: 200
+
+- type: latheRecipe
+  id: WeaponPistolMk58
+  result: WeaponPistolMk58Empty
+  category: Weapons
+  completetime: 6
+  materials:
+    Aluminum: 800
+    Steel: 100
+    Plastic: 150
+
+- type: latheRecipe
+  id: WeaponPistolN1984
+  result: WeaponPistolN1984Empty
+  category: Weapons
+  completetime: 6
+  materials:
+    Steel: 800 #Yes, Steel and not Aluminum, the original M1911 handguns that this is in reference to are steel frame.
+               #For balancing reasons(Steel is way easier to get), it includes other rarer materials.
+    Plasteel: 100
+    Plastic: 250
+    Gold: 200
+    Silver: 100
+
+- type: latheRecipe
+  id: WeaponPistolViper
+  result: WeaponPistolViperEmpty
+  category: Weapons
+  completetime: 6
+  materials:
+    Aluminum: 900
+    Plasteel: 100
+    Plastic: 150
+    Silver: 100
+
+- type: latheRecipe
+  id: WeaponPistolCobra
+  result: WeaponPistolCobraEmpty
+  category: Weapons
+  completetime: 6
+  materials:
+    Aluminum: 600
+    Plasteel: 100
+    Plastic: 450
+    Silver: 100
diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml
index dba39448b5..4d319288c1 100644
--- a/Resources/Prototypes/Research/arsenal.yml
+++ b/Resources/Prototypes/Research/arsenal.yml
@@ -26,6 +26,7 @@
   - WeaponMechCombatDisabler # Goobstation
   #- WeaponPistolMk58 #todo: Add a bunch of basic ballistic guns to the list and make lathe recipes for them.
   - MechEquipmentKineticAccelerator # Goobstation
+  - WeaponPistolMk58
   # These are roundstart but not replenishable for salvage
 
 - type: technology
@@ -139,6 +140,9 @@
   - WeaponLaserCannon
   - WeaponMechCombatSolarisLaser # Goobstation
   - WeaponSubMachineGunFPA90
+  - WeaponPistolN1984
+  - WeaponPistolViper
+  - WeaponPistolCobra
   technologyPrerequisites:
   - BasicWeapons
 
diff --git a/Resources/Prototypes/Roles/Antags/dragon.yml b/Resources/Prototypes/Roles/Antags/dragon.yml
new file mode 100644
index 0000000000..6630b812e3
--- /dev/null
+++ b/Resources/Prototypes/Roles/Antags/dragon.yml
@@ -0,0 +1,5 @@
+- type: antag
+  id: Dragon
+  name: roles-antag-dragon-name
+  antagonist: true
+  objective: roles-antag-dragon-objective
diff --git a/Resources/Prototypes/Roles/MindRoles/mind_roles.yml b/Resources/Prototypes/Roles/MindRoles/mind_roles.yml
new file mode 100644
index 0000000000..eb92fa51ae
--- /dev/null
+++ b/Resources/Prototypes/Roles/MindRoles/mind_roles.yml
@@ -0,0 +1,180 @@
+- type: entity
+  id: BaseMindRole
+  name: Mind Role
+  description: Mind Role entity
+  abstract: true
+  components:
+  - type: MindRole
+
+- type: entity
+  parent: BaseMindRole
+  id: BaseMindRoleAntag
+  abstract: true
+  components:
+  - type: MindRole
+    antag: true
+
+#Observer
+- type: entity
+  parent: BaseMindRole
+  id: MindRoleObserver
+  name: Observer Role
+  components:
+  - type: ObserverRole
+
+#Ghostrole Marker
+- type: entity
+  parent: BaseMindRole
+  id: MindRoleGhostMarker
+  name: Ghost Role
+  components:
+  - type: GhostRoleMarkerRole
+
+# The Job MindRole holds the mob's Job prototype
+- type: entity
+  parent: BaseMindRole
+  id: MindRoleJob
+  name: Job Role
+#  description:
+  # MindRoleComponent.JobPrototype is filled by SharedJobSystem
+
+# Subverted Silicon
+- type: entity
+  parent: BaseMindRoleAntag
+  id: MindRoleSubvertedSilicon
+  name: Subverted Silicon Role
+  description:
+  components:
+  - type: SubvertedSiliconRole
+
+# Dragon
+- type: entity
+  parent: BaseMindRoleAntag
+  id: MindRoleDragon
+  name: Dragon Role
+#  description:
+  components:
+  - type: MindRole
+    antagPrototype: Dragon
+    exclusiveAntag: true
+  - type: DragonRole
+  - type: RoleBriefing
+    briefing: dragon-role-briefing
+
+# Ninja
+- type: entity
+  parent: BaseMindRoleAntag
+  id: MindRoleNinja
+  name: Space Ninja Role
+#  description: mind-role-ninja-description
+  components:
+  - type: MindRole
+    antagPrototype: SpaceNinja
+    exclusiveAntag: true
+  - type: NinjaRole
+
+# Nukies
+- type: entity
+  parent: BaseMindRoleAntag
+  id: MindRoleNukeops
+  name: Nukeops Operative Role
+#  description: mind-role-nukeops-description
+  components:
+  - type: MindRole
+    exclusiveAntag: true
+    antagPrototype: Nukeops
+  - type: NukeopsRole
+
+- type: entity
+  parent: MindRoleNukeops
+  id: MindRoleNukeopsMedic
+  name: Nukeops Medic Role
+#  description: mind-role-nukeops-medic-description
+  components:
+  - type: MindRole
+    antagPrototype: NukeopsMedic
+
+- type: entity
+  parent: MindRoleNukeops
+  id: MindRoleNukeopsCommander
+  name: Nukeops Commander Role
+#  description: mind-role-nukeops-commander-description
+  components:
+  - type: MindRole
+    antagPrototype: NukeopsCommander
+
+# Revolutionaries
+- type: entity
+  parent: BaseMindRoleAntag
+  id: MindRoleHeadRevolutionary
+  name: Head Revolutionary Role
+#  description: mind-role-head-revolutionary-description
+  components:
+  - type: MindRole
+    antagPrototype: HeadRev
+    exclusiveAntag: true
+  - type: RevolutionaryRole
+
+- type: entity
+  parent: MindRoleHeadRevolutionary
+  id: MindRoleRevolutionary
+  name: Revolutionary Role
+#  description: mind-role-revolutionary-description
+  components:
+  - type: MindRole
+    antagPrototype: Rev
+
+# Thief
+- type: entity
+  parent: BaseMindRoleAntag
+  id: MindRoleThief
+  name: Thief Role
+#  description: mind-role-thief-description
+  components:
+  - type: MindRole
+    antagPrototype: Thief
+  - type: ThiefRole
+
+# Traitors
+- type: entity
+  parent: BaseMindRoleAntag
+  id: MindRoleTraitor
+  name: Traitor Role
+#  description: mind-role-traitor-description
+  components:
+  - type: MindRole
+    antagPrototype: Traitor
+    exclusiveAntag: true
+  - type: TraitorRole
+
+- type: entity
+  parent: MindRoleTraitor
+  id: MindRoleTraitorSleeper
+  name: Sleeper Agent Role
+#  description: mind-role-traitor-sleeper-description
+  components:
+  - type: MindRole
+    antagPrototype: TraitorSleeper
+
+# Zombie Squad
+- type: entity
+  parent: BaseMindRoleAntag
+  id: MindRoleInitialInfected
+  name: Initial Infected Role
+#  description: mind-role-initial-infected-description
+  components:
+  - type: MindRole
+    antagPrototype: InitialInfected
+    exclusiveAntag: true
+  - type: InitialInfectedRole
+
+- type: entity
+  parent: BaseMindRoleAntag
+  id: MindRoleZombie
+  name: Zombie Role
+#  description: mind-role-zombie-description
+  components:
+  - type: MindRole
+    antagPrototype: Zombie
+    exclusiveAntag: true
+  - type: ZombieRole
diff --git a/Resources/Prototypes/Species/shadowkin.yml b/Resources/Prototypes/Species/shadowkin.yml
index 4cf88e803b..84dc6ef36f 100644
--- a/Resources/Prototypes/Species/shadowkin.yml
+++ b/Resources/Prototypes/Species/shadowkin.yml
@@ -12,9 +12,9 @@
   maleFirstNames: names_shadowkin
   femaleFirstNames: names_shadowkin
   minAge: 18
-  maxAge: 300
-  youngAge: 20
-  oldAge: 250
+  maxAge: 250
+  youngAge: 80
+  oldAge: 175
   sexes:
     - Male
     - Female
diff --git a/Resources/Prototypes/Traits/disabilities.yml b/Resources/Prototypes/Traits/disabilities.yml
index 9c3c21e19f..85c6d72cbf 100644
--- a/Resources/Prototypes/Traits/disabilities.yml
+++ b/Resources/Prototypes/Traits/disabilities.yml
@@ -99,6 +99,11 @@
     - !type:TraitAddComponent
       components:
         - type: Muted
+    - !type:TraitModifyLanguages
+      languagesSpoken:
+        - Sign
+      languagesUnderstood:
+        - Sign
 
 - type: trait
   id: Uncloneable
diff --git a/Resources/Prototypes/Traits/languages.yml b/Resources/Prototypes/Traits/languages.yml
index 44a487cecd..c9d8418189 100644
--- a/Resources/Prototypes/Traits/languages.yml
+++ b/Resources/Prototypes/Traits/languages.yml
@@ -5,6 +5,10 @@
   requirements:
     - !type:CharacterItemGroupRequirement
       group: TraitsLanguagesBasic
+    - !type:CharacterTraitRequirement
+      inverted: true
+      traits:
+        - Muted
   functions:
     - !type:TraitModifyLanguages
       languagesSpoken:
diff --git a/Resources/Prototypes/Traits/physical.yml b/Resources/Prototypes/Traits/physical.yml
index f93fdddf14..ca745bb8cc 100644
--- a/Resources/Prototypes/Traits/physical.yml
+++ b/Resources/Prototypes/Traits/physical.yml
@@ -469,37 +469,23 @@
       inverted: true
       jobs:
         - Prisoner # Bionics should be "Confiscated" from long term prisoners.
-    - !type:CharacterSpeciesRequirement
-      species:
-        - Human # Entirely arbitrary, I've decided I want a trait unique to humans. Since they don't normally get anything exciting.
-                # When we get the Character Records system in, I also want to make this require certain Backgrounds.
     - !type:CharacterTraitRequirement
       inverted: true
       traits:
         - Claws
         - Talons
-    - !type:CharacterLogicOrRequirement
-      requirements:
-        - !type:CharacterTraitRequirement
-          traits:
-            - MartialArtist
-        - !type:CharacterJobRequirement
-          jobs:
-            - Boxer
-            - MartialArtist
-            - Gladiator
     - !type:CharacterItemGroupRequirement
       group: TraitsMind
   functions:
     - !type:TraitModifyUnarmed
       flatDamageIncrease:
         types:
-          Blunt: 1
+          Blunt: 2
 
 - type: trait
   id: Spinarette
   category: Physical
-  points: -4
+  points: -3
   requirements:
     - !type:CharacterJobRequirement
       inverted: true
@@ -521,7 +507,7 @@
           action: ActionSericulture
           productionLength: 2
           entityProduced: MaterialWebSilk1
-          hungerCost: 4
+          hungerCost: 1 
 
 - type: trait
   id: BionicArm
@@ -569,14 +555,14 @@
           allowedStates:
           - Alive
           - Critical
-          damageCap: 200
+          damageCap: 400
           damage:
             groups:
-              Brute: -0.07
-              Burn: -0.07
-              Airloss: -0.07
-              Toxin: -0.07
-              Genetic: -0.07
+              Brute: -0.35
+              Burn: -0.35
+              Airloss: -0.25
+              Toxin: -0.35
+              Genetic: -0.35
 
 - type: trait
   id: DermalArmor
@@ -639,8 +625,6 @@
     - !type:CharacterTraitRequirement
       traits:
         - CyberEyes
-    - !type:CharacterItemGroupRequirement
-      group: TraitsMind
   functions:
     - !type:TraitAddComponent
       components:
@@ -667,8 +651,6 @@
       inverted: true
       traits:
         - CyberEyesOmni
-    - !type:CharacterItemGroupRequirement
-      group: TraitsMind
   functions:
     - !type:TraitAddComponent
       components:
@@ -693,8 +675,6 @@
       traits:
         - CyberEyesDiagnostic
         - CyberEyesOmni
-    - !type:CharacterItemGroupRequirement
-      group: TraitsMind
   functions:
     - !type:TraitAddComponent
       components:
@@ -722,8 +702,6 @@
       traits:
         - CyberEyesMedical
         - CyberEyesOmni
-    - !type:CharacterItemGroupRequirement
-      group: TraitsMind
   functions:
     - !type:TraitAddComponent
       components:
@@ -744,6 +722,7 @@
     - !type:CharacterDepartmentRequirement
       departments:
         - Security
+        - Command
     - !type:CharacterTraitRequirement
       traits:
         - CyberEyes
@@ -753,8 +732,6 @@
         - CyberEyesMedical
         - CyberEyesDiagnostic
         - CyberEyesSecurity
-    - !type:CharacterItemGroupRequirement
-      group: TraitsMind
   functions:
     - !type:TraitAddComponent
       components:
@@ -843,8 +820,6 @@
     - !type:CharacterTraitRequirement
       traits:
         - CyberEyes
-    - !type:CharacterItemGroupRequirement
-      group: TraitsMind
   functions:
     - !type:TraitAddComponent
       components:
@@ -853,7 +828,7 @@
 - type: trait
   id: ThermographicVision
   category: Physical
-  points: -8
+  points: -4
   requirements:
     - !type:CharacterJobRequirement
       inverted: true
@@ -862,8 +837,6 @@
     - !type:CharacterTraitRequirement
       traits:
         - CyberEyes
-    - !type:CharacterItemGroupRequirement
-      group: TraitsMind
   functions:
     - !type:TraitAddComponent
       components:
@@ -898,11 +871,11 @@
           - Alive
           - Critical
           - Dead
-          damageCap: 200
+          damageCap: 250
           damage:
             groups:
-              Brute: -0.9
-              Burn: -0.9
+              Brute: -0.6
+              Burn: -0.6
 
 - type: trait
   id: BionicLeg
@@ -916,11 +889,11 @@
     - !type:CharacterItemGroupRequirement
       group: TraitsMind
   functions:
-    - !type:TraitAddComponent
+    - !type:TraitReplaceComponent
       components:
-      - type: MovementBodyPart
-        walkSpeed: 3.125
-        sprintSpeed: 5.625
+      - type: TraitSpeedModifier
+        sprintModifier: 1.300
+        walkModifier: 1.125
     - !type:TraitPushDescription
       descriptionExtensions:
         - description: examine-bionic-leg-message
@@ -1043,6 +1016,7 @@
     - !type:CharacterDepartmentRequirement
       departments:
         - Security
+        - Command
     - !type:CharacterSpeciesRequirement
       species:
         - IPC
@@ -1091,7 +1065,7 @@
 - type: trait
   id: ThermographicVisionModule
   category: Physical
-  points: -8
+  points: -4
   requirements:
     - !type:CharacterJobRequirement
       inverted: true
@@ -1112,4 +1086,4 @@
       descriptionExtensions:
         - description: examine-thermal-vision-message
           fontSize: 12
-          requireDetailRange: true
\ No newline at end of file
+          requireDetailRange: true
diff --git a/Resources/Prototypes/Traits/skills.yml b/Resources/Prototypes/Traits/skills.yml
index 02632f36ea..be8ded8cab 100644
--- a/Resources/Prototypes/Traits/skills.yml
+++ b/Resources/Prototypes/Traits/skills.yml
@@ -178,6 +178,10 @@
       inverted: true
       species:
         - Harpy
+    - !type:CharacterTraitRequirement
+      inverted: true
+      traits:
+        - Muted
   functions:
     - !type:TraitAddComponent
       components:
@@ -192,6 +196,10 @@
     - !type:CharacterSpeciesRequirement
       species:
         - Harpy
+    - !type:CharacterTraitRequirement
+      inverted: true
+      traits:
+        - Muted
   functions:
     - !type:TraitReplaceComponent
       components:
diff --git a/Resources/Prototypes/WhiteDream/GameRules/roundstart.yml b/Resources/Prototypes/WhiteDream/GameRules/roundstart.yml
index 0ffe022055..c8f1658426 100644
--- a/Resources/Prototypes/WhiteDream/GameRules/roundstart.yml
+++ b/Resources/Prototypes/WhiteDream/GameRules/roundstart.yml
@@ -20,6 +20,5 @@
       components:
       - type: BloodCultist
       - type: BloodCultSpellsHolder
-      mindComponents:
-      - type: BloodCultistRole
-        prototype: BloodCultist
+      mindRoles:
+      - MindRoleBloodCultist
diff --git a/Resources/Prototypes/WhiteDream/Objectives/cult.yml b/Resources/Prototypes/WhiteDream/Objectives/cult.yml
index 835807bfce..79925ba609 100644
--- a/Resources/Prototypes/WhiteDream/Objectives/cult.yml
+++ b/Resources/Prototypes/WhiteDream/Objectives/cult.yml
@@ -13,7 +13,7 @@
       state: icon
   - type: RoleRequirement
     roles:
-      components:
+      mindRoles:
       - BloodCultistRole
   - type: KillTargetCult
     title: objective-condition-kill-person-title
diff --git a/Resources/Prototypes/WhiteDream/Roles/Antags/blood-cultist.yml b/Resources/Prototypes/WhiteDream/Roles/Antags/blood-cultist.yml
index d1624a9d8a..2338462b9a 100644
--- a/Resources/Prototypes/WhiteDream/Roles/Antags/blood-cultist.yml
+++ b/Resources/Prototypes/WhiteDream/Roles/Antags/blood-cultist.yml
@@ -11,3 +11,15 @@
     back:
     - RitualDagger
     - RunedMetal20
+
+# Traitors
+- type: entity
+  parent: BaseMindRoleAntag
+  id: MindRoleBloodCultist
+  name: Blood Cultist Role
+#  description: mind-role-traitor-description
+  components:
+  - type: MindRole
+    antagPrototype: BloodCultist
+    exclusiveAntag: true
+  - type: BloodCultistRole
diff --git a/Resources/Prototypes/_EE/Access/SAN.yml b/Resources/Prototypes/_EE/Access/SAN.yml
new file mode 100644
index 0000000000..236bd8c8de
--- /dev/null
+++ b/Resources/Prototypes/_EE/Access/SAN.yml
@@ -0,0 +1,3 @@
+- type: accessLevel
+  id: SAN
+  name: id-card-access-level-sol-alliance-navy
diff --git a/Resources/Prototypes/_EE/Entities/Clothing/SolAlliance/SAN/helmets.yml b/Resources/Prototypes/_EE/Entities/Clothing/SolAlliance/SAN/helmets.yml
new file mode 100644
index 0000000000..68a8b76618
--- /dev/null
+++ b/Resources/Prototypes/_EE/Entities/Clothing/SolAlliance/SAN/helmets.yml
@@ -0,0 +1,30 @@
+- type: entity
+  parent: [ClothingHeadHelmetBasic, SolAllianceInfo]
+  id: ClothingHeadHelmetSAN
+  name: SAN tactical helmet
+  description: A simple Solarian helmet design, only marginally different than the ancient sallet which inspired it. Today they're made from the same alloy as starship hulls. It incorprates a built-in shortwave radio.
+  components:
+    - type: Sprite
+      sprite: _EE/Clothing/SolAlliance/Helmet/SAN_tactical_helmet.rsi
+    - type: Clothing
+      sprite: _EE/Clothing/SolAlliance/Helmet/SAN_tactical_helmet.rsi
+    - type: TelecomExempt
+    - type: RadioMicrophone
+      broadcastChannel: Handheld
+      toggleOnInteract: false
+      frequency: 2132
+    - type: RadioSpeaker
+      toggleOnInteract: false
+      channels:
+      - Handheld
+    - type: Speech
+      speechVerb: Robotic
+    - type: Tag
+      tags:
+      - Radio
+    - type: ActivatableUI
+      key: enum.HandheldRadioUiKey.Key
+    - type: UserInterface
+      interfaces:
+        enum.HandheldRadioUiKey.Key:
+          type: HandheldRadioBoundUserInterface
diff --git a/Resources/Prototypes/_EE/Entities/Clothing/SolAlliance/SAN/outerwear.yml b/Resources/Prototypes/_EE/Entities/Clothing/SolAlliance/SAN/outerwear.yml
new file mode 100644
index 0000000000..133187db14
--- /dev/null
+++ b/Resources/Prototypes/_EE/Entities/Clothing/SolAlliance/SAN/outerwear.yml
@@ -0,0 +1,19 @@
+- type: entity
+  parent: [ClothingOuterStorageBase, AllowSuitStorageClothing, SolAllianceInfo]
+  id: ClothingOuterVestWebSAN
+  name: SAN web vest
+  description: Standard-issue body armor for Solarian marines. While the rest of their gear may be cheap, the armor worn on top was apparently made by the highest bidder. A suit of polymer fabric encases a large plastitanium plate. The inside is sewn with, "Manufactured by CyberSun Armaments, For Solarian-Use Only".
+  components:
+    - type: Sprite
+      sprite: _EE/Clothing/SolAlliance/OuterClothing/SAN_web_vest.rsi
+    - type: Clothing
+      sprite: _EE/Clothing/SolAlliance/OuterClothing/SAN_web_vest.rsi
+    - type: Armor
+      modifiers:
+        coefficients:
+          Blunt: 0.75
+          Slash: 0.75
+          Piercing: 0.3
+          Heat: 0.80
+    - type: ExplosionResistance
+      damageCoefficient: 0.90
diff --git a/Resources/Prototypes/_EE/Entities/Clothing/SolAlliance/SAN/uniforms.yml b/Resources/Prototypes/_EE/Entities/Clothing/SolAlliance/SAN/uniforms.yml
new file mode 100644
index 0000000000..b6bda6d796
--- /dev/null
+++ b/Resources/Prototypes/_EE/Entities/Clothing/SolAlliance/SAN/uniforms.yml
@@ -0,0 +1,45 @@
+# For faction clothing related to the Sol Alliance Navy and her Armed Forces
+# Lore Info Link
+- type: entity
+  id: SolAllianceInfo
+  abstract: true
+  components:
+    - type: GuideHelp
+      guides: [SolAlliance]
+
+# Uniforms
+- type: entity
+  parent: [ClothingUniformBase, ClothingUniformFoldableBase, SolAllianceInfo]
+  id: ClothingUniformJumpsuitSolFatigueGreen
+  name: SAN fatigues
+  suffix: Green
+  description: A common uniform worn by "grunts" in the Solarian Armed Forces. Although Earth is no longer the green paradise of old, olive BDUs remain an emblem of old Earth's militaries.
+  components:
+    - type: Sprite
+      sprite: _EE/Clothing/SolAlliance/Uniforms/SAN_fatigue_green.rsi
+    - type: Clothing
+      sprite: _EE/Clothing/SolAlliance/Uniforms/SAN_fatigue_green.rsi
+
+- type: entity
+  parent: [ClothingUniformBase, ClothingUniformFoldableBase, SolAllianceInfo]
+  id: ClothingUniformJumpsuitSolFatigueGrey
+  name: SAN fatigues
+  suffix: Grey
+  description: A common uniform worn by "grunts" in the Solarian Armed Forces. Although not as common as olive BDUs, "stone gray" remains a popular choice of uniform color.
+  components:
+    - type: Sprite
+      sprite: _EE/Clothing/SolAlliance/Uniforms/SAN_fatigue_grey.rsi
+    - type: Clothing
+      sprite: _EE/Clothing/SolAlliance/Uniforms/SAN_fatigue_grey.rsi
+
+- type: entity
+  parent: [ClothingUniformBase, ClothingUniformFoldableBase, SolAllianceInfo]
+  id: ClothingUniformJumpsuitSolFatigueIPC
+  name: SAN IPC fatigues
+  suffix: Grey
+  description: IPCs serve as the only exception to the infamous xenophobia of the Solarians Armed Forces. For while SAN has never once permitted an alien to serve, it is eager to make use of synthetics to save pure humans from back breaking labor or charging into meat grinders.
+  components:
+    - type: Sprite
+      sprite: _EE/Clothing/SolAlliance/Uniforms/SAN_fatigue_ipc.rsi
+    - type: Clothing
+      sprite: _EE/Clothing/SolAlliance/Uniforms/SAN_fatigue_ipc.rsi
diff --git a/Resources/Prototypes/_EE/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/_EE/Entities/Objects/Misc/identification_cards.yml
new file mode 100644
index 0000000000..b3924bd59f
--- /dev/null
+++ b/Resources/Prototypes/_EE/Entities/Objects/Misc/identification_cards.yml
@@ -0,0 +1,19 @@
+# SAN ID
+- type: entity
+  parent: [IDCardStandard, SolAllianceInfo]
+  id: SANIdCard
+  name: "Solarian Alliance Navy RFItags"
+  components:
+    - type: Icon
+      sprite: Clothing/Neck/Misc/dogtags.rsi
+      state: icon
+    - type: Sprite
+      sprite: Clothing/Neck/Misc/dogtags.rsi
+      state: icon
+    - type: Clothing
+      sprite: Clothing/Neck/Misc/dogtags.rsi
+      slots:
+        - idcard
+    - type: Access
+      tags:
+        - SAN
diff --git a/Resources/Prototypes/_EE/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/_EE/Entities/Structures/Doors/Airlocks/access.yml
new file mode 100644
index 0000000000..51ef28913c
--- /dev/null
+++ b/Resources/Prototypes/_EE/Entities/Structures/Doors/Airlocks/access.yml
@@ -0,0 +1,9 @@
+# Solarian Alliance Navy
+- type: entity
+  parent: HighSecDoor
+  id: HighSecSANLocked
+  suffix: SAN, Locked
+  components:
+    - type: ContainerFill
+      containers:
+        board: [DoorElectronicsSAN]
diff --git a/Resources/Prototypes/_EE/Gamerules/SANDeserters.yml b/Resources/Prototypes/_EE/Gamerules/SANDeserters.yml
new file mode 100644
index 0000000000..0ed5fc0cba
--- /dev/null
+++ b/Resources/Prototypes/_EE/Gamerules/SANDeserters.yml
@@ -0,0 +1,77 @@
+- type: entity
+  parent: BaseUnknownShuttleRule
+  id: Deserters
+  components:
+    - type: StationEvent
+      earliestStart: 35
+      weight: 5.5
+      minimumPlayers: 20
+      duration: 1
+      maxOccurrences: 1
+    - type: LoadMapRule
+      preloadedGrid: SANDesertersDropship
+
+- type: preloadedGrid
+  id: SANDesertersDropship
+  path: /Maps/Shuttles/ShuttleEvent/SANDropship.yml
+  copies: 1
+
+- type: entity
+  categories: [HideSpawnMenu]
+  id: SpawnPointGhostSANDeserter
+  name: ghost role spawn point
+  suffix: SAN Deserter
+  parent: MarkerBase
+  components:
+    - type: GhostRole
+      name: ghost-role-information-deserter-name
+      description: ghost-role-information-deserter-description
+      rules: ghost-role-information-deserter-rules
+    - type: GhostRoleMobSpawner
+      prototype: MobHumanSANDeserter
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      layers:
+        - state: green
+        - sprite: Structures/Wallmounts/signs.rsi
+          state: radiation
+    - type: GhostRoleAntagSpawner
+
+- type: entity
+  categories: [HideSpawnMenu]
+  parent: MobHuman
+  id: MobHumanSANDeserter
+  name: SAN Deserter
+  components:
+    - type: Loadout
+      prototypes: [SANDeserterGearFull]
+    - type: NpcFactionMember
+      factions:
+      - SAN
+    - type: RandomMetadata
+      nameSegments:
+      - NamesFirstMilitary
+      - names_last
+    # TODO: Mindroles
+
+- type: antag
+  id: SANDeserter
+  name: roles-antag-sol-alliance-navy-deserter
+  antagonist: true
+  setPreference: false
+  objective: roles-antag-sol-alliance-navy-deserter-objective
+
+- type: startingGear
+  id: SANDeserterGearFull
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitSolFatigueGreen
+    head: ClothingHeadHelmetSAN
+    back: ClothingBackpackMerc
+    mask: ClothingMaskGasMerc
+    gloves: ClothingHandsGlovesCombat
+    shoes: ClothingShoesBootsCombatFilled
+    id: SANIdCard
+    pocket1: WeaponPistolViperWood
+    pocket2: MagazinePistolRubber
+    belt: ClothingBeltMilitaryWebbing
+    outerClothing: ClothingOuterVestWebSAN
diff --git a/Resources/Prototypes/_EE/Species/tajaran.yml b/Resources/Prototypes/_EE/Species/tajaran.yml
index d7029f67fe..ba6048cc7d 100644
--- a/Resources/Prototypes/_EE/Species/tajaran.yml
+++ b/Resources/Prototypes/_EE/Species/tajaran.yml
@@ -16,7 +16,7 @@
   maleFirstNames: names_tajaran_first
   femaleFirstNames: names_tajaran_first
   lastNames: names_tajaran_last
-  
+
 
 - type: markingPoints
   id: MobTajaranMarkingLimits
@@ -67,6 +67,7 @@
   id: MobTajaranSprites
   sprites:
     Head: MobTajaranHead
+    Face: MobHumanoidAnyMarking
     HeadTop: MobHumanoidAnyMarking
     HeadSide: MobHumanoidAnyMarking
     Hair: MobHumanoidAnyMarking
diff --git a/Resources/Prototypes/_Goobstation/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/_Goobstation/Catalog/Fills/Backpacks/duffelbag.yml
new file mode 100644
index 0000000000..edd0d70040
--- /dev/null
+++ b/Resources/Prototypes/_Goobstation/Catalog/Fills/Backpacks/duffelbag.yml
@@ -0,0 +1,13 @@
+- type: entity
+  parent: ClothingBackpackDuffelSyndicateBundle
+  id: ClothingBackpackDuffelSyndicateStealthHardsuitBundle
+  name: cybersun stealthsuit bundle
+  description: "An advanced cybersun stealth tacsuit bundle."
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingOuterHardsuitCybersunStealth
+      - id: ClothingMaskGasSyndicate
+      - id: ClothingHandsGlovesCombat
+      - id: DoubleEmergencyOxygenTankFilled
+      - id: DoubleEmergencyNitrogenTankFilled
diff --git a/Resources/Prototypes/_Goobstation/Catalog/uplink_catalog.yml b/Resources/Prototypes/_Goobstation/Catalog/uplink_catalog.yml
index 6f401d1811..7f1eb7d6d1 100644
--- a/Resources/Prototypes/_Goobstation/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/_Goobstation/Catalog/uplink_catalog.yml
@@ -26,3 +26,17 @@
     whitelist:
       tags:
       - NukeOpsUplink
+
+- type: listing
+  id: UplinkHardsuitCybersunStealth
+  name: uplink-hardsuit-cybersun-stealth-name
+  description: uplink-hardsuit-cybersun-stealth-desc
+  icon: { sprite: /Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/cybersunstealth.rsi, state: icon }
+  productEntity: ClothingBackpackDuffelSyndicateStealthHardsuitBundle
+  discountCategory: rareDiscounts
+  discountDownTo:
+    Telecrystal: 35
+  cost:
+    Telecrystal: 55
+  categories:
+  - UplinkWearables
diff --git a/Resources/Prototypes/_Goobstation/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/_Goobstation/Entities/Clothing/Head/hardsuit-helmets.yml
index 50c93e1ce4..0a88d8171a 100644
--- a/Resources/Prototypes/_Goobstation/Entities/Clothing/Head/hardsuit-helmets.yml
+++ b/Resources/Prototypes/_Goobstation/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -21,3 +21,32 @@
         Slash: 0.9
         Piercing: 0.9
         Heat: 0.9
+
+# cybersun stealth
+
+- type: entity
+  parent: ClothingHeadHardsuitWithLightBase
+  id: ClothingHeadHelmetHardsuitCybersunStealth
+  suffix: stealth
+  name: cybersun stealth hardsuit helmet
+  description: A helmet with plating for stealth operations.
+  components:
+  - type: Sprite
+    sprite: _Goobstation/Clothing/Head/Hardsuits/cybersunstealth.rsi
+  - type: Clothing
+    sprite: _Goobstation/Clothing/Head/Hardsuits/cybersunstealth.rsi
+  - type: PointLight
+    color: green
+  - type: PressureProtection
+    highPressureMultiplier: 0.08
+    lowPressureMultiplier: 1000
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.95
+        Slash: 0.95
+        Piercing: 0.95
+        Heat: 0.95
+  - type: ClothingGrantComponent
+    component:
+    - type: Stealth
diff --git a/Resources/Prototypes/_Goobstation/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/_Goobstation/Entities/Clothing/OuterClothing/hardsuits.yml
index 23812c039b..28bd09d920 100644
--- a/Resources/Prototypes/_Goobstation/Entities/Clothing/OuterClothing/hardsuits.yml
+++ b/Resources/Prototypes/_Goobstation/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -29,3 +29,67 @@
     clothingPrototype: ClothingHeadHelmetHardsuitBlueshield
   - type: StaminaDamageResistance
     coefficient: 0.5 # 50%
+
+
+# cybersun stealth
+
+- type: entity
+  parent: ClothingOuterHardsuitBase
+  id: ClothingOuterHardsuitCybersunStealth
+  suffix: stealth
+  name: cybersun stealth hardsuit
+  description: A hardsuit with stealth plating for operations, the shielding doesn't work while you're moving though! Needs the helmet on to finish the stealth field.
+  components:
+  - type: Sprite
+    sprite: _Goobstation/Clothing/OuterClothing/Hardsuits/cybersunstealth.rsi
+  - type: Item
+    size: Huge
+  - type: Clothing
+    sprite: _Goobstation/Clothing/OuterClothing/Hardsuits/cybersunstealth.rsi
+    onEquipFunctions:
+      - !type:TraitAddComponent
+        components:
+          - type: BreakStealthOnAttack
+    onUnequipFunctions:
+      - !type:TraitRemoveComponent
+        components:
+          - type: BreakStealthOnAttack
+  - type: PressureProtection
+    highPressureMultiplier: 0.05
+    lowPressureMultiplier: 1000
+  - type: ExplosionResistance
+    damageCoefficient: 0.75
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.85 # Metamaterials are quite brittle
+        Slash: 0.75
+        Piercing: 0.70 # But at least it can have steel plates underneath.
+        Heat: 0.75
+        Radiation: 0.85
+        Caustic: 0.85
+  - type: ClothingSpeedModifier
+    walkModifier: 0.8
+    sprintModifier: 0.85
+  - type: HeldSpeedModifier
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetHardsuitCybersunStealth
+  - type: Tag
+    tags:
+    - Hardsuit
+    - WhitelistChameleon
+  - type: ClothingGrantComponent
+    component:
+    - type: StealthOnMove
+      passiveVisibilityRate: -0.65
+      movementVisibilityRate: 0.575
+  - type: EmitsSoundOnMove
+    soundCollection:
+      collection: FootstepHardsuitLight
+      params:
+        volume: -12
+        maxDistance: 5
+        rolloffFactor: 1.2
+        # SIGNIFICANTLY Quieter than a normal hardsuit, but not perfectly stealthy. If you move while people are close enough, they can still hear it.
+  - type: StaminaDamageResistance
+    coefficient: 0.85 # 15%. Substantially lower than a normal hardsuit.
diff --git a/Resources/Prototypes/_Goobstation/Entities/Debugging/nukiestealth.yml b/Resources/Prototypes/_Goobstation/Entities/Debugging/nukiestealth.yml
new file mode 100644
index 0000000000..eb76b17a1c
--- /dev/null
+++ b/Resources/Prototypes/_Goobstation/Entities/Debugging/nukiestealth.yml
@@ -0,0 +1,70 @@
+- type: entity
+  parent: ClothingOuterHardsuitBase
+  id: ClothingOuterHardsuitSyndieStealthDebug
+  suffix: DEBUG, DO NOT MAP, stealth
+  name: syndicate stealth hardsuit
+  description: A hardsuit with stealth plating for operations, the shielding doesn't work while you're moving though! Needs the helmet on to finish the stealth field.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Hardsuits/syndicate.rsi
+  - type: Item
+    size: Huge
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Hardsuits/syndicate.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 0.05
+    lowPressureMultiplier: 1000
+  - type: ExplosionResistance
+    damageCoefficient: 0.5
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.65
+        Slash: 0.65
+        Piercing: 0.65
+        Heat: 0.7
+        Radiation: 0.55
+        Caustic: 0.7
+  - type: ClothingSpeedModifier
+    walkModifier: 0.95
+    sprintModifier: 0.95
+  - type: HeldSpeedModifier
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetHardsuitSyndieStealthDebug
+  - type: Tag
+    tags:
+    - Hardsuit
+    - WhitelistChameleon
+  - type: ClothingGrantComponent
+    component:
+    - type: StealthOnMove
+      passiveVisibilityRate: -0.5
+      movementVisibilityRate: 0.4
+
+
+- type: entity
+  parent: ClothingHeadHardsuitWithLightBase
+  id: ClothingHeadHelmetHardsuitSyndieStealthDebug
+  suffix: DEBUG, DO NOT MAP, stealth
+  name: syndicate stealth hardsuit helmet
+  description: A helmet with plating for stealth operations.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hardsuits/syndicate.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hardsuits/syndicate.rsi
+  - type: PointLight
+    color: green
+  - type: PressureProtection
+    highPressureMultiplier: 0.08
+    lowPressureMultiplier: 1000
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.9
+        Slash: 0.9
+        Piercing: 0.9
+        Heat: 0.9
+  - type: ClothingGrantComponent # this is horrible shitcode i have to do because clothinggrantcomponent only works with 1 comp per clothing item
+    component:
+    - type: Stealth
diff --git a/Resources/Prototypes/_Nuclear14/Entities/Structures/Windows/windows.yml b/Resources/Prototypes/_Nuclear14/Entities/Structures/Windows/windows.yml
index 979a70c3a0..9ee2ed1f01 100644
--- a/Resources/Prototypes/_Nuclear14/Entities/Structures/Windows/windows.yml
+++ b/Resources/Prototypes/_Nuclear14/Entities/Structures/Windows/windows.yml
@@ -19,6 +19,7 @@
     tags:
       - ForceFixRotations
       - Window
+      - WeldbotFixableStructure
   - type: Physics
     bodyType: Static
   - type: Fixtures
diff --git a/Resources/Prototypes/ai_factions.yml b/Resources/Prototypes/ai_factions.yml
index f6e16b4343..43bfa9b7fa 100644
--- a/Resources/Prototypes/ai_factions.yml
+++ b/Resources/Prototypes/ai_factions.yml
@@ -192,3 +192,14 @@
     - Xeno
     - Zombie
     - Dragon
+
+- type: npcFaction
+  id: SAN
+  hostile:
+    - NanoTrasen
+    - SimpleHostile
+    - Syndicate
+    - Xeno
+    - Zombie
+    - Revolutionary
+    - Dragon
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 5499f9c372..b4c9888746 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -1073,6 +1073,9 @@
 - type: Tag
   id: PlantSampleTaker
 
+- type: Tag
+  id: HydroponicsToolClippers
+
 - type: Tag
   id: PlasmaGlassShard
 
@@ -1091,6 +1094,9 @@
 - type: Tag
   id: SiliconMob
 
+- type: Tag
+  id: WeldbotFixableStructure
+
 - type: Tag
   id: PlushieSharkBlue
 
diff --git a/Resources/ServerInfo/Guidebook/Lore/Nations/Nations.xml b/Resources/ServerInfo/Guidebook/Lore/Nations/Nations.xml
new file mode 100644
index 0000000000..6f3de92849
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/Lore/Nations/Nations.xml
@@ -0,0 +1,3 @@
+<Document>
+    These are just a few of the nations present across the Orion Spur.
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/Lore/Nations/SolAlliance.xml b/Resources/ServerInfo/Guidebook/Lore/Nations/SolAlliance.xml
new file mode 100644
index 0000000000..ad0f991215
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/Lore/Nations/SolAlliance.xml
@@ -0,0 +1,36 @@
+<Document>
+    All Information included in this document is licensed under CC BY-SA 4.0, and is taken from https://wiki.aurorastation.org/index.php?title=Sol_Alliance with some modifications.
+
+    # Solarian Alliance
+
+    - [bold]Home System:[/bold] [italic] Sol[/italic]
+    - [bold]Homeworld:[/bold] Earth
+    - [bold]Capital:[/bold] Unity Station, Earth's Orbit
+    - [bold]Language(s):[/bold] Sol Common
+    - [bold]Founded:[/bold] June 15th, 2132
+    - [bold]Political Entities:[/bold] Alliance of Sovereign Solarian Nations
+    - [bold]Military Force:[/bold] Solarian Armed Forces including its Navy, Marine Corps, Army, and Planetary Defense Forces. Given the prevalence of its Navy, the Solarian armies are commonly abbreviated as SAN.
+    - [bold]Special Notes:[/bold] [color=#ff0000]Non-Humans cannot be citizens of the Sol Alliance. No alien has ever served in the Solarian Armed Forces.[/color]
+    - [bold]Synthetic Rights:[/bold] [color=#ff0000]None. Synthetics; including IPCs, Cyborgs, and Artificial Intelligences, are legally considered state property.[/color]
+
+    ## Overview
+    Though its power has waned following the disastrous events of late 2462, this federal union remains the home of humanity and the one of the premier powers in the Orion Spur.
+    Formerly held back by bureaucratic corruption, administrative inefficiency, an overstretched legal system, systemic political infighting, and economic troubles that led to over a century of decline and waning influence culminating in its retreat inwards, many now look to reform the Alliance into a more effective political force.
+
+    The Alliance of Sovereign Solarian Nations (ASSN), commonly referred to as the Solarian Alliance, the Sol Alliance, and sometimes the Alliance, is a federal union of 70 member state star systems, and 198 dependencies including the Eridani Corporate Federation.
+    Dependencies vary between undeveloped star systems and outposts on asteroids, to sprawling space stations and include the capital of the Sol Alliance: the bustling Unity Station in orbit over Earth. The Sol Alliance is divided into two administrative sections known as the Inner and Middle Rings.
+
+    Day by day, the power and influence of the Sol Alliance diminishes. At the present, she is beset upon by the most insidious and unstoppable forces known to to all empires, that of simple economics. Her coffers have been bled dry for decades, her budgets padded by seemingly endless credit.
+    Yet from an outside perspective, the Alliance is seemingly at its xenith, as though they are the mightiest and largest they have ever been. The cracks in this empire can be seen in the dirt accumulating in the corners of pristine ship bridges, buildings going without paint, marines going without pay.
+
+    Desertion from her armies has grown to an all-time high year after year, ever increasing. These issues drive the Sol Alliance towards seemingly endless compliance actions against worlds at her periphery, and in particular against that of the recently formed Biesel Republic.
+    Oftentimes the Alliance gives shaky justifications for "Compliance", stating that they are merely acting on behalf of oppressed parties and individuals in need of help. In reality, the Sol Navy is pointed like a sword at every world in the periphery by transtellar corporations, corrupt politicians, and individuals of particular influence, all of them like vultures scavenging whatever they find in the ruins.
+    Money changes hands, the Navy moves to plant boots on necks, and Corporations grow fat with wealth taken from the "Neo-Barbs" at the edges of the empire.
+
+    ## Demographics
+    - [textlink="Solarian-Standard Humans" link="Human"]: Officially, 100%. There are somewhere between 40 and 65 billion humans residing in the Sol Alliance.
+    The Solarian Census only records individuals who are citizens, and there are no non-human citizens by policy.
+    Unofficially, there exists an underclass of non-humans who make up a significant portion of the population.
+    - [bold]All Other Species[/bold]: Anywhere from 25% to 38% of the Sol Alliance population is composed of non-human residents. Their specific numbers and demographics are not recorded, and neutral census takers are often imprisoned when caught trying to count the non-humans.
+
+</Document>
diff --git a/Resources/Textures/Clothing/Neck/Misc/dogtags.rsi/equipped-IDCARD.png b/Resources/Textures/Clothing/Neck/Misc/dogtags.rsi/equipped-IDCARD.png
new file mode 100644
index 0000000000..ca6bf1dc4b
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/dogtags.rsi/equipped-IDCARD.png differ
diff --git a/Resources/Textures/Clothing/Neck/Misc/dogtags.rsi/meta.json b/Resources/Textures/Clothing/Neck/Misc/dogtags.rsi/meta.json
index 939b5871ab..fb7555a914 100644
--- a/Resources/Textures/Clothing/Neck/Misc/dogtags.rsi/meta.json
+++ b/Resources/Textures/Clothing/Neck/Misc/dogtags.rsi/meta.json
@@ -13,6 +13,10 @@
     {
       "name": "equipped-NECK",
       "directions": 4
+    },
+    {
+      "name": "equipped-IDCARD",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Mobs/Silicon/Bots/plantbot.rsi/meta.json b/Resources/Textures/Mobs/Silicon/Bots/plantbot.rsi/meta.json
new file mode 100644
index 0000000000..9aedcd5414
--- /dev/null
+++ b/Resources/Textures/Mobs/Silicon/Bots/plantbot.rsi/meta.json
@@ -0,0 +1,20 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Timfa",
+    "states": [
+        {
+            "name": "plantbot",
+            "delays": [
+                [
+                    0.5,
+                    0.4
+                ]
+            ]
+        }
+    ]
+}
diff --git a/Resources/Textures/Mobs/Silicon/Bots/plantbot.rsi/plantbot.png b/Resources/Textures/Mobs/Silicon/Bots/plantbot.rsi/plantbot.png
new file mode 100644
index 0000000000..abcb408db9
Binary files /dev/null and b/Resources/Textures/Mobs/Silicon/Bots/plantbot.rsi/plantbot.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/plant_analyzer.rsi/analyzer.png b/Resources/Textures/Objects/Specific/Hydroponics/plant_analyzer.rsi/analyzer.png
new file mode 100644
index 0000000000..827a0b347c
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/plant_analyzer.rsi/analyzer.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/plant_analyzer.rsi/icon.png b/Resources/Textures/Objects/Specific/Hydroponics/plant_analyzer.rsi/icon.png
new file mode 100644
index 0000000000..d23d6df1ee
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/plant_analyzer.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/plant_analyzer.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/plant_analyzer.rsi/meta.json
new file mode 100644
index 0000000000..1892249f7b
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Hydroponics/plant_analyzer.rsi/meta.json
@@ -0,0 +1,33 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f032bb1d4d982d4ee57c214c18238aaddb45d512, slightly edited by Timfa",
+    "states": [
+        {
+            "name": "analyzer",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "icon"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/base.png
new file mode 100644
index 0000000000..e780187b0b
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/base.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/equipped-BELT.png
new file mode 100644
index 0000000000..ce393454de
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/equipped-BELT.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..ce393454de
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-left-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-left-0.png
new file mode 100644
index 0000000000..c1ceb2a91d
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-left-0.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-left-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-left-1.png
new file mode 100644
index 0000000000..ccd1e39299
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-left-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-left-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-left-2.png
new file mode 100644
index 0000000000..6f5bb847ff
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-left-2.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-left-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-left-3.png
new file mode 100644
index 0000000000..9fce41b870
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-left-3.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-left-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-left-4.png
new file mode 100644
index 0000000000..cad42dcfd7
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-left-4.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-left.png
new file mode 100644
index 0000000000..9abb79eee0
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-right-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-right-0.png
new file mode 100644
index 0000000000..6feb5766f6
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-right-0.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-right-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-right-1.png
new file mode 100644
index 0000000000..ebc20e06ab
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-right-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-right-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-right-2.png
new file mode 100644
index 0000000000..eb5a3cb461
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-right-2.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-right-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-right-3.png
new file mode 100644
index 0000000000..3a79d38e48
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-right-3.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-right-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-right-4.png
new file mode 100644
index 0000000000..4efbefc03b
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-right-4.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-right.png
new file mode 100644
index 0000000000..c42804f9ff
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/mag-unshaded-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/mag-unshaded-0.png
new file mode 100644
index 0000000000..2729cc16ae
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/mag-unshaded-0.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/mag-unshaded-1.png
new file mode 100644
index 0000000000..5b1ee7abca
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/mag-unshaded-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/mag-unshaded-2.png
new file mode 100644
index 0000000000..9fd9947bd5
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/mag-unshaded-2.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/mag-unshaded-3.png
new file mode 100644
index 0000000000..b2ac90405b
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/mag-unshaded-3.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/mag-unshaded-4.png
new file mode 100644
index 0000000000..2077862fdb
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/mag-unshaded-4.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/meta.json
new file mode 100644
index 0000000000..5ff0eda700
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/ccdisabler.rsi/meta.json
@@ -0,0 +1,81 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "taken from tg station at commit https://github.com/tgstation/tgstation/blob/832ae532766d491d91db53746d15b4b55be3f2b0, painted green by Timfa",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-unshaded-4"
+        },
+        {
+            "name": "mag-unshaded-3"
+        },
+        {
+            "name": "mag-unshaded-2"
+        },
+        {
+            "name": "mag-unshaded-1"
+        },
+        {
+            "name": "mag-unshaded-0",
+            "delays": [
+                [
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-0"
+        },
+        {
+            "name": "inhand-left-1"
+        },
+        {
+            "name": "inhand-left-2"
+        },
+        {
+            "name": "inhand-left-3"
+        },
+        {
+            "name": "inhand-left-4"
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-0"
+        },
+        {
+            "name": "inhand-right-1"
+        },
+        {
+            "name": "inhand-right-2"
+        },
+        {
+            "name": "inhand-right-3"
+        },
+        {
+            "name": "inhand-right-4"
+        },
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Helmet/SAN_tactical_helmet.rsi/equipped-HELMET.png b/Resources/Textures/_EE/Clothing/SolAlliance/Helmet/SAN_tactical_helmet.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..fd6d3e9cce
Binary files /dev/null and b/Resources/Textures/_EE/Clothing/SolAlliance/Helmet/SAN_tactical_helmet.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Helmet/SAN_tactical_helmet.rsi/icon.png b/Resources/Textures/_EE/Clothing/SolAlliance/Helmet/SAN_tactical_helmet.rsi/icon.png
new file mode 100644
index 0000000000..796743af8e
Binary files /dev/null and b/Resources/Textures/_EE/Clothing/SolAlliance/Helmet/SAN_tactical_helmet.rsi/icon.png differ
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Helmet/SAN_tactical_helmet.rsi/meta.json b/Resources/Textures/_EE/Clothing/SolAlliance/Helmet/SAN_tactical_helmet.rsi/meta.json
new file mode 100644
index 0000000000..303deb51ca
--- /dev/null
+++ b/Resources/Textures/_EE/Clothing/SolAlliance/Helmet/SAN_tactical_helmet.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Aurora.3 at https://github.com/Aurorastation/Aurora.3/commit/988b9b29bcb40a6108d1f68c788dc81893750f0c",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/OuterClothing/SAN_web_vest.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_EE/Clothing/SolAlliance/OuterClothing/SAN_web_vest.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000..8c3165b790
Binary files /dev/null and b/Resources/Textures/_EE/Clothing/SolAlliance/OuterClothing/SAN_web_vest.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/OuterClothing/SAN_web_vest.rsi/icon.png b/Resources/Textures/_EE/Clothing/SolAlliance/OuterClothing/SAN_web_vest.rsi/icon.png
new file mode 100644
index 0000000000..567ef07480
Binary files /dev/null and b/Resources/Textures/_EE/Clothing/SolAlliance/OuterClothing/SAN_web_vest.rsi/icon.png differ
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/OuterClothing/SAN_web_vest.rsi/meta.json b/Resources/Textures/_EE/Clothing/SolAlliance/OuterClothing/SAN_web_vest.rsi/meta.json
new file mode 100644
index 0000000000..1c7b9d82ed
--- /dev/null
+++ b/Resources/Textures/_EE/Clothing/SolAlliance/OuterClothing/SAN_web_vest.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Aurora.3 at https://github.com/Aurorastation/Aurora.3/commit/988b9b29bcb40a6108d1f68c788dc81893750f0c",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Swords/SAN_marine_officer_sword.rsi/equipped-BELT.png b/Resources/Textures/_EE/Clothing/SolAlliance/Swords/SAN_marine_officer_sword.rsi/equipped-BELT.png
new file mode 100644
index 0000000000..aafe907423
Binary files /dev/null and b/Resources/Textures/_EE/Clothing/SolAlliance/Swords/SAN_marine_officer_sword.rsi/equipped-BELT.png differ
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Swords/SAN_marine_officer_sword.rsi/icon.png b/Resources/Textures/_EE/Clothing/SolAlliance/Swords/SAN_marine_officer_sword.rsi/icon.png
new file mode 100644
index 0000000000..9bd032d0cc
Binary files /dev/null and b/Resources/Textures/_EE/Clothing/SolAlliance/Swords/SAN_marine_officer_sword.rsi/icon.png differ
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Swords/SAN_marine_officer_sword.rsi/inhand-left.png b/Resources/Textures/_EE/Clothing/SolAlliance/Swords/SAN_marine_officer_sword.rsi/inhand-left.png
new file mode 100644
index 0000000000..96a9fddcdc
Binary files /dev/null and b/Resources/Textures/_EE/Clothing/SolAlliance/Swords/SAN_marine_officer_sword.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Swords/SAN_marine_officer_sword.rsi/inhand-right.png b/Resources/Textures/_EE/Clothing/SolAlliance/Swords/SAN_marine_officer_sword.rsi/inhand-right.png
new file mode 100644
index 0000000000..b145b802fe
Binary files /dev/null and b/Resources/Textures/_EE/Clothing/SolAlliance/Swords/SAN_marine_officer_sword.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Swords/SAN_marine_officer_sword.rsi/meta.json b/Resources/Textures/_EE/Clothing/SolAlliance/Swords/SAN_marine_officer_sword.rsi/meta.json
new file mode 100644
index 0000000000..f66b6ce84e
--- /dev/null
+++ b/Resources/Textures/_EE/Clothing/SolAlliance/Swords/SAN_marine_officer_sword.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Aurora.3 at https://github.com/Aurorastation/Aurora.3/commit/988b9b29bcb40a6108d1f68c788dc81893750f0c",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Swords/SAN_officer_sword.rsi/equipped-BELT.png b/Resources/Textures/_EE/Clothing/SolAlliance/Swords/SAN_officer_sword.rsi/equipped-BELT.png
new file mode 100644
index 0000000000..9a3269135c
Binary files /dev/null and b/Resources/Textures/_EE/Clothing/SolAlliance/Swords/SAN_officer_sword.rsi/equipped-BELT.png differ
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Swords/SAN_officer_sword.rsi/icon.png b/Resources/Textures/_EE/Clothing/SolAlliance/Swords/SAN_officer_sword.rsi/icon.png
new file mode 100644
index 0000000000..b860b9f48f
Binary files /dev/null and b/Resources/Textures/_EE/Clothing/SolAlliance/Swords/SAN_officer_sword.rsi/icon.png differ
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Swords/SAN_officer_sword.rsi/inhand-left.png b/Resources/Textures/_EE/Clothing/SolAlliance/Swords/SAN_officer_sword.rsi/inhand-left.png
new file mode 100644
index 0000000000..b50f24e6f6
Binary files /dev/null and b/Resources/Textures/_EE/Clothing/SolAlliance/Swords/SAN_officer_sword.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Swords/SAN_officer_sword.rsi/inhand-right.png b/Resources/Textures/_EE/Clothing/SolAlliance/Swords/SAN_officer_sword.rsi/inhand-right.png
new file mode 100644
index 0000000000..72a84bf88f
Binary files /dev/null and b/Resources/Textures/_EE/Clothing/SolAlliance/Swords/SAN_officer_sword.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Swords/SAN_officer_sword.rsi/meta.json b/Resources/Textures/_EE/Clothing/SolAlliance/Swords/SAN_officer_sword.rsi/meta.json
new file mode 100644
index 0000000000..f66b6ce84e
--- /dev/null
+++ b/Resources/Textures/_EE/Clothing/SolAlliance/Swords/SAN_officer_sword.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Aurora.3 at https://github.com/Aurorastation/Aurora.3/commit/988b9b29bcb40a6108d1f68c788dc81893750f0c",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_army_service.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_army_service.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000..c802e24fcc
Binary files /dev/null and b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_army_service.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_army_service.rsi/icon.png b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_army_service.rsi/icon.png
new file mode 100644
index 0000000000..b0d6dc744c
Binary files /dev/null and b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_army_service.rsi/icon.png differ
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_army_service.rsi/meta.json b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_army_service.rsi/meta.json
new file mode 100644
index 0000000000..76ecad3220
--- /dev/null
+++ b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_army_service.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Aurora.3 at https://github.com/Aurorastation/Aurora.3/commit/988b9b29bcb40a6108d1f68c788dc81893750f0c",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_army_service_general.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_army_service_general.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000..00407c8b26
Binary files /dev/null and b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_army_service_general.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_army_service_general.rsi/icon.png b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_army_service_general.rsi/icon.png
new file mode 100644
index 0000000000..fffac7a3a1
Binary files /dev/null and b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_army_service_general.rsi/icon.png differ
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_army_service_general.rsi/meta.json b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_army_service_general.rsi/meta.json
new file mode 100644
index 0000000000..76ecad3220
--- /dev/null
+++ b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_army_service_general.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Aurora.3 at https://github.com/Aurorastation/Aurora.3/commit/988b9b29bcb40a6108d1f68c788dc81893750f0c",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_army_service_officer.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_army_service_officer.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000..6447555a56
Binary files /dev/null and b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_army_service_officer.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_army_service_officer.rsi/icon.png b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_army_service_officer.rsi/icon.png
new file mode 100644
index 0000000000..ea33764643
Binary files /dev/null and b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_army_service_officer.rsi/icon.png differ
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_army_service_officer.rsi/meta.json b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_army_service_officer.rsi/meta.json
new file mode 100644
index 0000000000..76ecad3220
--- /dev/null
+++ b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_army_service_officer.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Aurora.3 at https://github.com/Aurorastation/Aurora.3/commit/988b9b29bcb40a6108d1f68c788dc81893750f0c",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_fatigue_green.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_fatigue_green.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000..0d7b6f6170
Binary files /dev/null and b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_fatigue_green.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_fatigue_green.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_fatigue_green.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000..aba4a60c6f
Binary files /dev/null and b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_fatigue_green.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_fatigue_green.rsi/icon.png b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_fatigue_green.rsi/icon.png
new file mode 100644
index 0000000000..e1e918a68d
Binary files /dev/null and b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_fatigue_green.rsi/icon.png differ
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_fatigue_green.rsi/meta.json b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_fatigue_green.rsi/meta.json
new file mode 100644
index 0000000000..3c473e3777
--- /dev/null
+++ b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_fatigue_green.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Aurora.3 at https://github.com/Aurorastation/Aurora.3/commit/988b9b29bcb40a6108d1f68c788dc81893750f0c",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "folded-equipped-INNERCLOTHING",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_fatigue_grey.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_fatigue_grey.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000..34f9af1dc4
Binary files /dev/null and b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_fatigue_grey.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_fatigue_grey.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_fatigue_grey.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000..ddbef36480
Binary files /dev/null and b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_fatigue_grey.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_fatigue_grey.rsi/icon.png b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_fatigue_grey.rsi/icon.png
new file mode 100644
index 0000000000..e8e648fa35
Binary files /dev/null and b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_fatigue_grey.rsi/icon.png differ
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_fatigue_grey.rsi/meta.json b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_fatigue_grey.rsi/meta.json
new file mode 100644
index 0000000000..3c473e3777
--- /dev/null
+++ b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_fatigue_grey.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Aurora.3 at https://github.com/Aurorastation/Aurora.3/commit/988b9b29bcb40a6108d1f68c788dc81893750f0c",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "folded-equipped-INNERCLOTHING",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_fatigue_ipc.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_fatigue_ipc.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000..0747da1767
Binary files /dev/null and b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_fatigue_ipc.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_fatigue_ipc.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_fatigue_ipc.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000..aafbb9015c
Binary files /dev/null and b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_fatigue_ipc.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_fatigue_ipc.rsi/icon.png b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_fatigue_ipc.rsi/icon.png
new file mode 100644
index 0000000000..6fb15347a5
Binary files /dev/null and b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_fatigue_ipc.rsi/icon.png differ
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_fatigue_ipc.rsi/meta.json b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_fatigue_ipc.rsi/meta.json
new file mode 100644
index 0000000000..3c473e3777
--- /dev/null
+++ b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_fatigue_ipc.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Aurora.3 at https://github.com/Aurorastation/Aurora.3/commit/988b9b29bcb40a6108d1f68c788dc81893750f0c",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "folded-equipped-INNERCLOTHING",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_fatigue_tan.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_fatigue_tan.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000..da3efb538a
Binary files /dev/null and b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_fatigue_tan.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_fatigue_tan.rsi/icon.png b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_fatigue_tan.rsi/icon.png
new file mode 100644
index 0000000000..9a46eee5c9
Binary files /dev/null and b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_fatigue_tan.rsi/icon.png differ
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_fatigue_tan.rsi/meta.json b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_fatigue_tan.rsi/meta.json
new file mode 100644
index 0000000000..76ecad3220
--- /dev/null
+++ b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_fatigue_tan.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Aurora.3 at https://github.com/Aurorastation/Aurora.3/commit/988b9b29bcb40a6108d1f68c788dc81893750f0c",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_mahreen_dress.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_mahreen_dress.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000..65d00c6317
Binary files /dev/null and b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_mahreen_dress.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_mahreen_dress.rsi/icon.png b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_mahreen_dress.rsi/icon.png
new file mode 100644
index 0000000000..09f21d190d
Binary files /dev/null and b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_mahreen_dress.rsi/icon.png differ
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_mahreen_dress.rsi/meta.json b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_mahreen_dress.rsi/meta.json
new file mode 100644
index 0000000000..76ecad3220
--- /dev/null
+++ b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_mahreen_dress.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Aurora.3 at https://github.com/Aurorastation/Aurora.3/commit/988b9b29bcb40a6108d1f68c788dc81893750f0c",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_navy_coveralls.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_navy_coveralls.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000..81aead781d
Binary files /dev/null and b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_navy_coveralls.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_navy_coveralls.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_navy_coveralls.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000..bce046239e
Binary files /dev/null and b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_navy_coveralls.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_navy_coveralls.rsi/icon.png b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_navy_coveralls.rsi/icon.png
new file mode 100644
index 0000000000..c7a8347ae8
Binary files /dev/null and b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_navy_coveralls.rsi/icon.png differ
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_navy_coveralls.rsi/meta.json b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_navy_coveralls.rsi/meta.json
new file mode 100644
index 0000000000..3c473e3777
--- /dev/null
+++ b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_navy_coveralls.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Aurora.3 at https://github.com/Aurorastation/Aurora.3/commit/988b9b29bcb40a6108d1f68c788dc81893750f0c",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "folded-equipped-INNERCLOTHING",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_navy_dress.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_navy_dress.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000..6af23e916b
Binary files /dev/null and b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_navy_dress.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_navy_dress.rsi/icon.png b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_navy_dress.rsi/icon.png
new file mode 100644
index 0000000000..4126c9482e
Binary files /dev/null and b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_navy_dress.rsi/icon.png differ
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_navy_dress.rsi/meta.json b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_navy_dress.rsi/meta.json
new file mode 100644
index 0000000000..76ecad3220
--- /dev/null
+++ b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_navy_dress.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Aurora.3 at https://github.com/Aurorastation/Aurora.3/commit/988b9b29bcb40a6108d1f68c788dc81893750f0c",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_navy_dress_admiral.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_navy_dress_admiral.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000..f38e26fd71
Binary files /dev/null and b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_navy_dress_admiral.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_navy_dress_admiral.rsi/icon.png b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_navy_dress_admiral.rsi/icon.png
new file mode 100644
index 0000000000..62820d5a19
Binary files /dev/null and b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_navy_dress_admiral.rsi/icon.png differ
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_navy_dress_admiral.rsi/meta.json b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_navy_dress_admiral.rsi/meta.json
new file mode 100644
index 0000000000..76ecad3220
--- /dev/null
+++ b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_navy_dress_admiral.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Aurora.3 at https://github.com/Aurorastation/Aurora.3/commit/988b9b29bcb40a6108d1f68c788dc81893750f0c",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_navy_dress_officer.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_navy_dress_officer.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000..6509cdfb62
Binary files /dev/null and b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_navy_dress_officer.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_navy_dress_officer.rsi/icon.png b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_navy_dress_officer.rsi/icon.png
new file mode 100644
index 0000000000..423bc0b779
Binary files /dev/null and b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_navy_dress_officer.rsi/icon.png differ
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_navy_dress_officer.rsi/meta.json b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_navy_dress_officer.rsi/meta.json
new file mode 100644
index 0000000000..76ecad3220
--- /dev/null
+++ b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_navy_dress_officer.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Aurora.3 at https://github.com/Aurorastation/Aurora.3/commit/988b9b29bcb40a6108d1f68c788dc81893750f0c",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_navy_dress_senior_officer.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_navy_dress_senior_officer.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000..e34062c6e1
Binary files /dev/null and b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_navy_dress_senior_officer.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_navy_dress_senior_officer.rsi/icon.png b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_navy_dress_senior_officer.rsi/icon.png
new file mode 100644
index 0000000000..ca40fe70fb
Binary files /dev/null and b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_navy_dress_senior_officer.rsi/icon.png differ
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_navy_dress_senior_officer.rsi/meta.json b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_navy_dress_senior_officer.rsi/meta.json
new file mode 100644
index 0000000000..76ecad3220
--- /dev/null
+++ b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_navy_dress_senior_officer.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Aurora.3 at https://github.com/Aurorastation/Aurora.3/commit/988b9b29bcb40a6108d1f68c788dc81893750f0c",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_sailor.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_sailor.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000..e65421a52e
Binary files /dev/null and b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_sailor.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_sailor.rsi/icon.png b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_sailor.rsi/icon.png
new file mode 100644
index 0000000000..18ba43708c
Binary files /dev/null and b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_sailor.rsi/icon.png differ
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_sailor.rsi/meta.json b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_sailor.rsi/meta.json
new file mode 100644
index 0000000000..76ecad3220
--- /dev/null
+++ b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_sailor.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Aurora.3 at https://github.com/Aurorastation/Aurora.3/commit/988b9b29bcb40a6108d1f68c788dc81893750f0c",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_service_white.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_service_white.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000..302da0e5c9
Binary files /dev/null and b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_service_white.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_service_white.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_service_white.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000..9b13005485
Binary files /dev/null and b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_service_white.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_service_white.rsi/icon.png b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_service_white.rsi/icon.png
new file mode 100644
index 0000000000..6a74fbe195
Binary files /dev/null and b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_service_white.rsi/icon.png differ
diff --git a/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_service_white.rsi/meta.json b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_service_white.rsi/meta.json
new file mode 100644
index 0000000000..3c473e3777
--- /dev/null
+++ b/Resources/Textures/_EE/Clothing/SolAlliance/Uniforms/SAN_service_white.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Aurora.3 at https://github.com/Aurorastation/Aurora.3/commit/988b9b29bcb40a6108d1f68c788dc81893750f0c",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "folded-equipped-INNERCLOTHING",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/cybersunstealth.rsi/icon-flash.png b/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/cybersunstealth.rsi/icon-flash.png
new file mode 100644
index 0000000000..902c847556
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/cybersunstealth.rsi/icon-flash.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/cybersunstealth.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/cybersunstealth.rsi/icon.png
new file mode 100644
index 0000000000..7e08dc20a8
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/cybersunstealth.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/cybersunstealth.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/cybersunstealth.rsi/meta.json
new file mode 100644
index 0000000000..c7fa1cabe6
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/cybersunstealth.rsi/meta.json
@@ -0,0 +1,25 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprites made by InfinityPandaRed for Goobstation",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon-flash"
+    },
+    {
+      "name": "off-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "on-equipped-HELMET",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/cybersunstealth.rsi/off-equipped-HELMET.png b/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/cybersunstealth.rsi/off-equipped-HELMET.png
new file mode 100644
index 0000000000..53c9cabfcf
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/cybersunstealth.rsi/off-equipped-HELMET.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/cybersunstealth.rsi/on-equipped-HELMET.png b/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/cybersunstealth.rsi/on-equipped-HELMET.png
new file mode 100644
index 0000000000..d1d62fa7ff
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/cybersunstealth.rsi/on-equipped-HELMET.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/cybersunstealth.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/cybersunstealth.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000..311aab9ba8
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/cybersunstealth.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/cybersunstealth.rsi/icon.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/cybersunstealth.rsi/icon.png
new file mode 100644
index 0000000000..474bca0f87
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/cybersunstealth.rsi/icon.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/cybersunstealth.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/cybersunstealth.rsi/inhand-left.png
new file mode 100644
index 0000000000..2eadf95d78
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/cybersunstealth.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/cybersunstealth.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/cybersunstealth.rsi/inhand-right.png
new file mode 100644
index 0000000000..b3d23c6752
Binary files /dev/null and b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/cybersunstealth.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/cybersunstealth.rsi/meta.json b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/cybersunstealth.rsi/meta.json
new file mode 100644
index 0000000000..fdd5058584
--- /dev/null
+++ b/Resources/Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/cybersunstealth.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "made by InfinityPandaRed for goob station",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}